[dpdk-stable] patch 'vhost: fix packed virtqueue ready condition' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 8e1c060d3fe59027f40cc00f78fe4043b62bb1fa Mon Sep 17 00:00:00 2001
From: Adrian Moreno <amorenoz at redhat.com>
Date: Sat, 25 Jan 2020 09:52:16 +0100
Subject: [PATCH] vhost: fix packed virtqueue ready condition

[ upstream commit c5a910dd92ecbad24f86b4c59b4ff8105b5149fd ]

Consider a virtqueue ready when, apart from the descriptor area,
both event suppression areas have been mapped.

Fixes: 2d1541e2b6b3 ("vhost: add vring address setup for packed queues")

Signed-off-by: Adrian Moreno <amorenoz at redhat.com>
Reviewed-by: Tiwei Bie <tiwei.bie at intel.com>
---
 lib/librte_vhost/vhost_user.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index 0cfb8b792b..1c3a1a89fc 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1298,7 +1298,8 @@ vq_is_ready(struct virtio_net *dev, struct vhost_virtqueue *vq)
 		return false;
 
 	if (vq_is_packed(dev))
-		rings_ok = !!vq->desc_packed;
+		rings_ok = vq->desc_packed && vq->driver_event &&
+			vq->device_event;
 	else
 		rings_ok = vq->desc && vq->avail && vq->used;
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:44.800365311 +0000
+++ 0180-vhost-fix-packed-virtqueue-ready-condition.patch	2020-02-11 11:17:38.828009350 +0000
@@ -1,13 +1,14 @@
-From c5a910dd92ecbad24f86b4c59b4ff8105b5149fd Mon Sep 17 00:00:00 2001
+From 8e1c060d3fe59027f40cc00f78fe4043b62bb1fa Mon Sep 17 00:00:00 2001
 From: Adrian Moreno <amorenoz at redhat.com>
 Date: Sat, 25 Jan 2020 09:52:16 +0100
 Subject: [PATCH] vhost: fix packed virtqueue ready condition
 
+[ upstream commit c5a910dd92ecbad24f86b4c59b4ff8105b5149fd ]
+
 Consider a virtqueue ready when, apart from the descriptor area,
 both event suppression areas have been mapped.
 
 Fixes: 2d1541e2b6b3 ("vhost: add vring address setup for packed queues")
-Cc: stable at dpdk.org
 
 Signed-off-by: Adrian Moreno <amorenoz at redhat.com>
 Reviewed-by: Tiwei Bie <tiwei.bie at intel.com>
@@ -16,7 +17,7 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
-index 69b84a8820..c9cc4d6489 100644
+index 0cfb8b792b..1c3a1a89fc 100644
 --- a/lib/librte_vhost/vhost_user.c
 +++ b/lib/librte_vhost/vhost_user.c
 @@ -1298,7 +1298,8 @@ vq_is_ready(struct virtio_net *dev, struct vhost_virtqueue *vq)