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

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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/27/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/cd0bd99f0105a4a63780645b36ecb722db020f51

Thanks.

Kevin.

---
From cd0bd99f0105a4a63780645b36ecb722db020f51 Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin@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@intel.com>
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Tested-by: Yu Jiang <yux.jiang@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 61754833c2..394def1f85 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -549,5 +549,5 @@ 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;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.186351373 +0000
+++ 0008-vhost-fix-virtqueue-initialization.patch	2020-11-23 17:10:13.974061563 +0000
@@ -1 +1 @@
-From 7804bbd13aa583e3a28b08557f7a98fcbe7fc8a8 Mon Sep 17 00:00:00 2001
+From cd0bd99f0105a4a63780645b36ecb722db020f51 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7804bbd13aa583e3a28b08557f7a98fcbe7fc8a8 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index 8a151a9c1d..b83cf639eb 100644
+index 61754833c2..394def1f85 100644
@@ -28 +29 @@
-@@ -606,5 +606,5 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
+@@ -549,5 +549,5 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)