d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/tap: fix invalid queue file descriptor

Browse Source 
Rx and Tx queues share the common tap file descriptor, but save this
value separately.

Setting up Rx/Tx queue sets up both queues, release_queue close the
tap file but update file descriptor only for that queue.

This makes other queue's file descriptor invalid.

As a workaround, prevent release_queue callback to be called by default.

This is done by separating Rx/Tx setup functions, so that each only
setup its own queue, this prevents rte_eth_rx/tx_queue_setup() calling
release_queue before setup_queue.

Fixes: 02f96a0a82d1 ("net/tap: add TUN/TAP device PMD")

Signed-off-by: Keith Wiles <keith.wiles@intel.com>
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
Keith Wiles 2017-01-28 20:12:05 -06:00 committed by Ferruh Yigit
parent f2462150ec
commit 0002ca582d
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/tap/rte_eth_tap.c
View File

@ -428,8 +428,6 @@ tap_setup_queue(struct rte_eth_dev *dev,
}
}
}
dev->data->rx_queues[qid] = rx;
dev->data->tx_queues[qid] = tx;
rx->fd = fd;
tx->fd = fd;
@ -437,6 +435,26 @@ tap_setup_queue(struct rte_eth_dev *dev,
return fd;
}
static int
rx_setup_queue(struct rte_eth_dev *dev,
struct pmd_internals *internals,
uint16_t qid)
{
dev->data->rx_queues[qid] = &internals->rxq[qid];
return tap_setup_queue(dev, internals, qid);
}
static int
tx_setup_queue(struct rte_eth_dev *dev,
struct pmd_internals *internals,
uint16_t qid)
{
dev->data->tx_queues[qid] = &internals->txq[qid];
return tap_setup_queue(dev, internals, qid);
}
static int
tap_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
@ -469,7 +487,7 @@ tap_rx_queue_setup(struct rte_eth_dev *dev,
return -ENOMEM;
}
fd = tap_setup_queue(dev, internals, rx_queue_id);
fd = rx_setup_queue(dev, internals, rx_queue_id);
if (fd == -1)
return -1;
@ -493,7 +511,7 @@ tap_tx_queue_setup(struct rte_eth_dev *dev,
if (tx_queue_id >= internals->nb_queues)
return -1;
ret = tap_setup_queue(dev, internals, tx_queue_id);
ret = tx_setup_queue(dev, internals, tx_queue_id);
if (ret == -1)
return -1;