numam-dpdk/drivers/net/tap/tap_intr.c
Yunjian Wang 13b698d11f net/tap: fix queues fd check before close
The fd is possibly a negative value while it is passed as an
argument to function "close". Fix the check to the fd.

Fixes: ed8132e7c9 ("net/tap: move fds of queues to be in process private")
Cc: stable@dpdk.org

Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
2020-04-21 13:57:09 +02:00

111 lines
2.7 KiB
C

/* SPDX-License-Identifier: BSD-3-Clause
* Copyright 2018 Mellanox Technologies, Ltd
*/
/**
* @file
* Interrupts handling for tap driver.
*/
#include <errno.h>
#include <fcntl.h>
#include <signal.h>
#include <stdint.h>
#include <stdlib.h>
#include <unistd.h>
#include <rte_eth_tap.h>
#include <rte_errno.h>
#include <rte_interrupts.h>
/**
* Unregister Rx interrupts free the queue interrupt vector.
*
* @param dev
* Pointer to the tap rte_eth_dev structure.
*/
static void
tap_rx_intr_vec_uninstall(struct rte_eth_dev *dev)
{
struct pmd_internals *pmd = dev->data->dev_private;
struct rte_intr_handle *intr_handle = &pmd->intr_handle;
rte_intr_free_epoll_fd(intr_handle);
free(intr_handle->intr_vec);
intr_handle->intr_vec = NULL;
intr_handle->nb_efd = 0;
}
/**
* Allocate Rx queue interrupt vector and register Rx interrupts.
*
* @param dev
* Pointer to the tap rte_eth_dev device structure.
*
* @return
* 0 on success, negative errno value otherwise and rte_errno is set.
*/
static int
tap_rx_intr_vec_install(struct rte_eth_dev *dev)
{
struct pmd_internals *pmd = dev->data->dev_private;
struct pmd_process_private *process_private = dev->process_private;
unsigned int rxqs_n = pmd->dev->data->nb_rx_queues;
struct rte_intr_handle *intr_handle = &pmd->intr_handle;
unsigned int n = RTE_MIN(rxqs_n, (uint32_t)RTE_MAX_RXTX_INTR_VEC_ID);
unsigned int i;
unsigned int count = 0;
if (!dev->data->dev_conf.intr_conf.rxq)
return 0;
intr_handle->intr_vec = malloc(sizeof(intr_handle->intr_vec[rxqs_n]));
if (intr_handle->intr_vec == NULL) {
rte_errno = ENOMEM;
TAP_LOG(ERR,
"failed to allocate memory for interrupt vector,"
" Rx interrupts will not be supported");
return -rte_errno;
}
for (i = 0; i < n; i++) {
struct rx_queue *rxq = pmd->dev->data->rx_queues[i];
/* Skip queues that cannot request interrupts. */
if (!rxq || process_private->rxq_fds[i] == -1) {
/* Use invalid intr_vec[] index to disable entry. */
intr_handle->intr_vec[i] =
RTE_INTR_VEC_RXTX_OFFSET +
RTE_MAX_RXTX_INTR_VEC_ID;
continue;
}
intr_handle->intr_vec[i] = RTE_INTR_VEC_RXTX_OFFSET + count;
intr_handle->efds[count] = process_private->rxq_fds[i];
count++;
}
if (!count)
tap_rx_intr_vec_uninstall(dev);
else
intr_handle->nb_efd = count;
return 0;
}
/**
* Register or unregister the Rx interrupts.
*
* @param dev
* Pointer to the tap rte_eth_dev device structure.
* @param set
* should the operation be register or unregister the interrupts.
*
* @return
* 0 on success, negative errno value otherwise and rte_errno is set.
*/
int
tap_rx_intr_vec_set(struct rte_eth_dev *dev, int set)
{
tap_rx_intr_vec_uninstall(dev);
if (set)
return tap_rx_intr_vec_install(dev);
return 0;
}