DPDK patches and discussions
 help / color / mirror / Atom feed
* [dpdk-dev] [PATCH] vhost: fix external backends readiness
@ 2020-09-23  9:49 Maxime Coquelin
  2020-09-28 10:55 ` Xia, Chenbo
  0 siblings, 1 reply; 3+ messages in thread
From: Maxime Coquelin @ 2020-09-23  9:49 UTC (permalink / raw)
  To: dev, chenbo.xia, matan, tomasz.zawadzki, changpeng.liu; +Cc: Maxime Coquelin

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


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-dev] [PATCH] vhost: fix external backends readiness
  2020-09-23  9:49 [dpdk-dev] [PATCH] vhost: fix external backends readiness Maxime Coquelin
@ 2020-09-28 10:55 ` Xia, Chenbo
  2020-09-28 15:19   ` Thomas Monjalon
  0 siblings, 1 reply; 3+ messages in thread
From: Xia, Chenbo @ 2020-09-28 10:55 UTC (permalink / raw)
  To: Maxime Coquelin, dev, matan, Zawadzki, Tomasz, Liu, Changpeng


> -----Original Message-----
> From: Maxime Coquelin <maxime.coquelin@redhat.com>
> Sent: Wednesday, September 23, 2020 5:49 PM
> To: dev@dpdk.org; Xia, Chenbo <chenbo.xia@intel.com>; matan@mellanox.com;
> Zawadzki, Tomasz <tomasz.zawadzki@intel.com>; Liu, Changpeng
> <changpeng.liu@intel.com>
> Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
> Subject: [PATCH] vhost: fix external backends readiness
> 
> 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

Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-dev] [PATCH] vhost: fix external backends readiness
  2020-09-28 10:55 ` Xia, Chenbo
@ 2020-09-28 15:19   ` Thomas Monjalon
  0 siblings, 0 replies; 3+ messages in thread
From: Thomas Monjalon @ 2020-09-28 15:19 UTC (permalink / raw)
  To: Maxime Coquelin; +Cc: dev, matan, Zawadzki, Tomasz, Liu, Changpeng, Xia, Chenbo

28/09/2020 12:55, Xia, Chenbo:
> > 
> > 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>
> 
> Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>

Applied in the main repository, thanks.




^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-09-28 15:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-23  9:49 [dpdk-dev] [PATCH] vhost: fix external backends readiness Maxime Coquelin
2020-09-28 10:55 ` Xia, Chenbo
2020-09-28 15:19   ` Thomas Monjalon

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git