[dpdk-stable] patch 'net/virtio-user: fix used ring in cvq handling' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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/14/19. 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.

Kevin Traynor

---
>From a3634e471cef6188d35ad349e03c66e899e2412a Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie at intel.com>
Date: Wed, 23 Jan 2019 01:01:43 +0800
Subject: [PATCH] net/virtio-user: fix used ring in cvq handling

[ upstream commit 0403e37a468df59707ed938cca4a507276a0befb ]

When updating used ring, the id in used element should be the
index of the first desc in the desc chain.

Fixes: f9b9d1a55775 ("net/virtio-user: add multiple queues in device emulation")

Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtio_user/virtio_user_dev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 20816c936..9c8bcd2c6 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -625,5 +625,5 @@ virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_t queue_idx)
 		/* Update used ring */
 		uep = &vring->used->ring[avail_idx];
-		uep->id = avail_idx;
+		uep->id = desc_idx;
 		uep->len = n_descs;
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-02-07 13:19:56.897290049 +0000
+++ 0056-net-virtio-user-fix-used-ring-in-cvq-handling.patch	2019-02-07 13:19:55.000000000 +0000
@@ -1,13 +1,14 @@
-From 0403e37a468df59707ed938cca4a507276a0befb Mon Sep 17 00:00:00 2001
+From a3634e471cef6188d35ad349e03c66e899e2412a Mon Sep 17 00:00:00 2001
 From: Tiwei Bie <tiwei.bie at intel.com>
 Date: Wed, 23 Jan 2019 01:01:43 +0800
 Subject: [PATCH] net/virtio-user: fix used ring in cvq handling
 
+[ upstream commit 0403e37a468df59707ed938cca4a507276a0befb ]
+
 When updating used ring, the id in used element should be the
 index of the first desc in the desc chain.
 
 Fixes: f9b9d1a55775 ("net/virtio-user: add multiple queues in device emulation")
-Cc: stable at dpdk.org
 
 Signed-off-by: Tiwei Bie <tiwei.bie at intel.com>
 Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
@@ -16,10 +17,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
-index 89d287a74..d1157378d 100644
+index 20816c936..9c8bcd2c6 100644
 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
 +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
-@@ -723,5 +723,5 @@ virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_t queue_idx)
+@@ -625,5 +625,5 @@ virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_t queue_idx)
  		/* Update used ring */
  		uep = &vring->used->ring[avail_idx];
 -		uep->id = avail_idx;