* [dpdk-dev] [PATCH] net/tap: fix invalid queue file descriptor
@ 2017-10-26 9:51 Pengzhen Liu
2017-10-30 22:55 ` Ferruh Yigit
0 siblings, 1 reply; 2+ messages in thread
From: Pengzhen Liu @ 2017-10-26 9:51 UTC (permalink / raw)
To: thomas; +Cc: dev, liupengzhen3, Keith Wiles, Ferruh Yigit
From: Keith Wiles <keith.wiles@intel.com>
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>
---
drivers/net/tap/rte_eth_tap.c | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index c0afc2d..91f63f5 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -428,8 +428,6 @@ struct pmd_internals {
}
}
}
- dev->data->rx_queues[qid] = rx;
- dev->data->tx_queues[qid] = tx;
rx->fd = fd;
tx->fd = fd;
@@ -438,6 +436,26 @@ struct pmd_internals {
}
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,
uint16_t nb_rx_desc __rte_unused,
@@ -469,7 +487,7 @@ struct pmd_internals {
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 @@ struct pmd_internals {
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;
--
1.7.12.4
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [dpdk-dev] [PATCH] net/tap: fix invalid queue file descriptor
2017-10-26 9:51 [dpdk-dev] [PATCH] net/tap: fix invalid queue file descriptor Pengzhen Liu
@ 2017-10-30 22:55 ` Ferruh Yigit
0 siblings, 0 replies; 2+ messages in thread
From: Ferruh Yigit @ 2017-10-30 22:55 UTC (permalink / raw)
To: Pengzhen Liu, thomas; +Cc: dev, Keith Wiles
On 10/26/2017 2:51 AM, Pengzhen Liu wrote:
> From: Keith Wiles <keith.wiles@intel.com>
>
> 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>
Hi Pengzhen,
This is a commit from repo :) [1] from beginning of the year.
I assume this has been sent instead of another patch by mistake, please double
check if intended patch sent to mail list.
[1]
http://dpdk.org/commit/0002ca58
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-10-30 22:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-26 9:51 [dpdk-dev] [PATCH] net/tap: fix invalid queue file descriptor Pengzhen Liu
2017-10-30 22:55 ` Ferruh Yigit
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).