From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: dev@dpdk.org, chenbo.xia@intel.com, matan@mellanox.com,
tomasz.zawadzki@intel.com, changpeng.liu@intel.com
Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
Subject: [dpdk-dev] [PATCH] vhost: fix external backends readiness
Date: Wed, 23 Sep 2020 11:49:02 +0200 [thread overview]
Message-ID: <20200923094902.216856-1-maxime.coquelin@redhat.com> (raw)
Commit d0fcc38f5fa4 ("vhost: improve device readiness notifications")
makes the assumption that every Virtio devices are considered
ready for preocessing as soon as first queue pair is configured
and enabled.
While this is true for Virtio-net, it isn't for Virtio-scsi
and Virtio-blk.
This patch fixes this by only making this assumption for
the builtin Virtio-net backend, and restores back to previous
behaviour for other backends.
Fixes: d0fcc38f5fa4 ("vhost: improve device readiness notifications")
Reported-by: Changpeng Liu <changpeng.liu@intel.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
---
lib/librte_vhost/vhost_user.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 501218e192..b00e1f91dc 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1343,21 +1343,28 @@ vq_is_ready(struct virtio_net *dev, struct vhost_virtqueue *vq)
vq->enabled;
}
-#define VIRTIO_DEV_NUM_VQS_TO_BE_READY 2u
+#define VIRTIO_BUILTIN_NUM_VQS_TO_BE_READY 2u
static int
virtio_is_ready(struct virtio_net *dev)
{
struct vhost_virtqueue *vq;
- uint32_t i;
+ uint32_t i, nr_vring = dev->nr_vring;
if (dev->flags & VIRTIO_DEV_READY)
return 1;
- if (dev->nr_vring < VIRTIO_DEV_NUM_VQS_TO_BE_READY)
+ if (!dev->nr_vring)
return 0;
- for (i = 0; i < VIRTIO_DEV_NUM_VQS_TO_BE_READY; i++) {
+ if (dev->flags & VIRTIO_DEV_BUILTIN_VIRTIO_NET) {
+ nr_vring = VIRTIO_BUILTIN_NUM_VQS_TO_BE_READY;
+
+ if (dev->nr_vring < nr_vring)
+ return 0;
+ }
+
+ for (i = 0; i < nr_vring; i++) {
vq = dev->virtqueue[i];
if (!vq_is_ready(dev, vq))
--
2.26.2
next reply other threads:[~2020-09-23 9:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-23 9:49 Maxime Coquelin [this message]
2020-09-28 10:55 ` Xia, Chenbo
2020-09-28 15:19 ` Thomas Monjalon
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=20200923094902.216856-1-maxime.coquelin@redhat.com \
--to=maxime.coquelin@redhat.com \
--cc=changpeng.liu@intel.com \
--cc=chenbo.xia@intel.com \
--cc=dev@dpdk.org \
--cc=matan@mellanox.com \
--cc=tomasz.zawadzki@intel.com \
/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).