[dpdk-stable] patch 'vhost: fix virtqueue initialization' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/19/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/18b6f15777b951d359a04d4470e81b99fd44af20

Thanks.

Luca Boccassi

---
>From 18b6f15777b951d359a04d4470e81b99fd44af20 Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin at redhat.com>
Date: Fri, 6 Nov 2020 15:47:44 +0100
Subject: [PATCH] vhost: fix virtqueue initialization

[ upstream commit 7804bbd13aa583e3a28b08557f7a98fcbe7fc8a8 ]

This patches fixes virtqueue initialization issue causing
segfault or file descriptor being closed unexpectedly.

The wrong index was passed to init_vring_queue() by
alloc_vring_queue() when a hole in the virtqueue array was
met.

Fixes: 8acd7c213353 ("vhost: fix virtqueues metadata allocation")

Reported-by: Yu Jiang <yux.jiang at intel.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin at redhat.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
Tested-by: Yu Jiang <yux.jiang at intel.com>
---
 lib/librte_vhost/vhost.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index 9f3eadeba6..3dd278f8f8 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -575,7 +575,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
 		}
 
 		dev->virtqueue[i] = vq;
-		init_vring_queue(dev, vring_idx);
+		init_vring_queue(dev, i);
 		rte_spinlock_init(&vq->access_lock);
 		vq->avail_wrap_counter = 1;
 		vq->used_wrap_counter = 1;
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-17 11:13:13.738213425 +0000
+++ 0018-vhost-fix-virtqueue-initialization.patch	2020-11-17 11:13:12.897116126 +0000
@@ -1 +1 @@
-From 7804bbd13aa583e3a28b08557f7a98fcbe7fc8a8 Mon Sep 17 00:00:00 2001
+From 18b6f15777b951d359a04d4470e81b99fd44af20 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7804bbd13aa583e3a28b08557f7a98fcbe7fc8a8 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -25 +26 @@
-index 8a151a9c1d..b83cf639eb 100644
+index 9f3eadeba6..3dd278f8f8 100644
@@ -28 +29 @@
-@@ -605,7 +605,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
+@@ -575,7 +575,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)