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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.7

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/20/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/b4cb3953daab620904b38b980f6a0911334bcd5b

Thanks.

Kevin.

---
>From b4cb3953daab620904b38b980f6a0911334bcd5b 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 23a6bf8922..b9ecec5ba7 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -1271,5 +1271,6 @@ vq_is_ready(struct virtio_net *dev, struct vhost_virtqueue *vq)
 
 	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.21.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-14 17:02:38.957538912 +0000
+++ 0034-vhost-fix-packed-virtqueue-ready-condition.patch	2020-02-14 17:02:37.046405956 +0000
@@ -1 +1 @@
-From c5a910dd92ecbad24f86b4c59b4ff8105b5149fd Mon Sep 17 00:00:00 2001
+From b4cb3953daab620904b38b980f6a0911334bcd5b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c5a910dd92ecbad24f86b4c59b4ff8105b5149fd ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 69b84a8820..c9cc4d6489 100644
+index 23a6bf8922..b9ecec5ba7 100644
@@ -22 +23 @@
-@@ -1299,5 +1299,6 @@ vq_is_ready(struct virtio_net *dev, struct vhost_virtqueue *vq)
+@@ -1271,5 +1271,6 @@ vq_is_ready(struct virtio_net *dev, struct vhost_virtqueue *vq)