From: Olivier Matz <olivier.matz@6wind.com>
To: dev@dpdk.org, Yuanhan Liu <yliu@fridaylinux.org>,
Maxime Coquelin <maxime.coquelin@redhat.com>,
Tiwei Bie <tiwei.bie@intel.com>
Cc: stable@dpdk.org
Subject: [dpdk-stable] [PATCH v2 1/4] net/virtio: fix queue flushing with vector Rx enabled
Date: Fri, 19 Jan 2018 16:55:53 +0100 [thread overview]
Message-ID: <20180119155556.32597-2-olivier.matz@6wind.com> (raw)
In-Reply-To: <20180119155556.32597-1-olivier.matz@6wind.com>
When using vector Rx mode (use_simple_rx = 1), vq->vq_descx[] is not
kept up to date. To properly detach the mbufs in this case, browse
sw_ring[] instead, as it's done in virtqueue_rxvq_flush().
Since we need virtio_get_queue_type(), also move this function in
virtqueue.h as a static inline.
Fixes: fc3d66212fed ("virtio: add vector Rx")
Cc: stable@dpdk.org
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
Tiwei,
While it passes my test plan, please carefully check that what I did in
virtqueue_detatch_unused() is correct. I tried to reproduce what is done
in virtqueue_rxvq_flush(), but I may be mistaking due to the different
ring layout assumption and mbuf management between standard and vector.
Thanks
Olivier
drivers/net/virtio/virtio_ethdev.c | 11 -----------
drivers/net/virtio/virtqueue.c | 17 +++++++++++++++--
drivers/net/virtio/virtqueue.h | 11 +++++++++++
3 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index ec012c2ac..2c7f902e7 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -268,17 +268,6 @@ virtio_dev_queue_release(void *queue __rte_unused)
/* do nothing */
}
-static int
-virtio_get_queue_type(struct virtio_hw *hw, uint16_t vtpci_queue_idx)
-{
- if (vtpci_queue_idx == hw->max_queue_pairs * 2)
- return VTNET_CQ;
- else if (vtpci_queue_idx % 2 == 0)
- return VTNET_RQ;
- else
- return VTNET_TQ;
-}
-
static uint16_t
virtio_get_nr_vq(struct virtio_hw *hw)
{
diff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c
index 1ada4fe08..43cb51d1b 100644
--- a/drivers/net/virtio/virtqueue.c
+++ b/drivers/net/virtio/virtqueue.c
@@ -18,17 +18,30 @@
struct rte_mbuf *
virtqueue_detatch_unused(struct virtqueue *vq)
{
+ struct virtio_hw *hw = vq->hw;
struct rte_mbuf *cookie;
int idx;
+ int type = virtio_get_queue_type(hw, vq->vq_queue_index);
+
+ if (vq == NULL)
+ return NULL;
- if (vq != NULL)
- for (idx = 0; idx < vq->vq_nentries; idx++) {
+ for (idx = 0; idx < vq->vq_nentries; idx++) {
+ if (hw->use_simple_rx && type == VTNET_RQ) {
+ cookie = vq->sw_ring[idx];
+ if (cookie != NULL) {
+ vq->sw_ring[idx] = NULL;
+ return cookie;
+ }
+ } else {
cookie = vq->vq_descx[idx].cookie;
if (cookie != NULL) {
vq->vq_descx[idx].cookie = NULL;
return cookie;
}
}
+ }
+
return NULL;
}
diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
index fedbaa39c..cae1b318a 100644
--- a/drivers/net/virtio/virtqueue.h
+++ b/drivers/net/virtio/virtqueue.h
@@ -281,6 +281,17 @@ virtqueue_full(const struct virtqueue *vq)
return vq->vq_free_cnt == 0;
}
+static inline int
+virtio_get_queue_type(struct virtio_hw *hw, uint16_t vtpci_queue_idx)
+{
+ if (vtpci_queue_idx == hw->max_queue_pairs * 2)
+ return VTNET_CQ;
+ else if (vtpci_queue_idx % 2 == 0)
+ return VTNET_RQ;
+ else
+ return VTNET_TQ;
+}
+
#define VIRTQUEUE_NUSED(vq) ((uint16_t)((vq)->vq_ring.used->idx - (vq)->vq_used_cons_idx))
void vq_ring_free_chain(struct virtqueue *vq, uint16_t desc_idx);
--
2.11.0
next prev parent reply other threads:[~2018-01-19 15:56 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20180118090733.12728-1-olivier.matz@6wind.com>
2018-01-18 9:07 ` [dpdk-stable] [PATCH 1/3] net/virtio: fix typo in function name Olivier Matz
2018-01-18 13:27 ` Yuanhan Liu
2018-01-18 13:45 ` Olivier Matz
2018-01-18 14:06 ` Yuanhan Liu
2018-01-18 9:07 ` [dpdk-stable] [PATCH 2/3] net/virtio: rationalize queue flushing Olivier Matz
2018-01-18 13:26 ` Yuanhan Liu
2018-01-18 13:55 ` Olivier Matz
2018-01-18 14:04 ` Yuanhan Liu
2018-01-18 14:05 ` Tiwei Bie
2018-01-18 14:55 ` Olivier Matz
2018-01-18 15:48 ` Tiwei Bie
2018-01-18 15:56 ` Olivier Matz
2018-01-18 9:07 ` [dpdk-stable] [PATCH 3/3] net/virtio: fix memory leak when reinitializing device Olivier Matz
[not found] ` <20180119155556.32597-1-olivier.matz@6wind.com>
2018-01-19 15:55 ` Olivier Matz [this message]
2018-01-22 2:56 ` [dpdk-stable] [PATCH v2 1/4] net/virtio: fix queue flushing with vector Rx enabled Tiwei Bie
2018-01-22 10:38 ` Olivier Matz
2018-01-23 2:05 ` Tiwei Bie
2018-01-19 15:55 ` [dpdk-stable] [PATCH v2 2/4] net/virtio: fix memory leak when reinitializing device Olivier Matz
[not found] ` <20180123155443.8883-1-olivier.matz@6wind.com>
2018-01-23 15:54 ` [dpdk-stable] [PATCH v3 1/4] net/virtio: fix queue flushing with vector Rx enabled Olivier Matz
2018-01-23 15:54 ` [dpdk-stable] [PATCH v3 2/4] net/virtio: fix memory leak when reinitializing device Olivier Matz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180119155556.32597-2-olivier.matz@6wind.com \
--to=olivier.matz@6wind.com \
--cc=dev@dpdk.org \
--cc=maxime.coquelin@redhat.com \
--cc=stable@dpdk.org \
--cc=tiwei.bie@intel.com \
--cc=yliu@fridaylinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).