[dpdk-stable] patch 'net/virtio: fix avail descriptor ID' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

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/12/21. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/96a4bd11ebd659a4ba78a3b724fa8793b59d679c

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 96a4bd11ebd659a4ba78a3b724fa8793b59d679c Mon Sep 17 00:00:00 2001
From: Xuan Ding <xuan.ding at intel.com>
Date: Thu, 21 Oct 2021 14:25:40 +0000
Subject: [PATCH] net/virtio: fix avail descriptor ID
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit ad6f01945a75dbdcacf26579d1bdf07d1f4b1e3d ]

Vhost will update desc’s Buffer ID advance to next used descriptor when
VIRTIO_F_IN_ORDER feature negotiated. When virtio reuses the descriptor,
the Buffer ID should be restored even VIRTQ_DESC_F_INDIRECT
feature negotiated.

Fixes: b473061b0e1d ("net/virtio: fix indirect descriptors in packed datapaths")

Signed-off-by: Xuan Ding <xuan.ding at intel.com>
Signed-off-by: Yong Liu <yong.liu at intel.com>
Signed-off-by: Miao Li <miao.li at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtqueue.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
index c169518ec8..b812c28829 100644
--- a/drivers/net/virtio/virtqueue.h
+++ b/drivers/net/virtio/virtqueue.h
@@ -735,6 +735,9 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie,
 			RTE_PTR_DIFF(&txr[idx].tx_packed_indir, txr);
 		start_dp[idx].len   = (seg_num + 1) *
 			sizeof(struct vring_packed_desc);
+		/* Packed descriptor id needs to be restored when inorder. */
+		if (in_order)
+			start_dp[idx].id = idx;
 		/* reset flags for indirect desc */
 		head_flags = VRING_DESC_F_INDIRECT;
 		head_flags |= vq->vq_packed.cached_flags;
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:10.006482310 +0800
+++ 0182-net-virtio-fix-avail-descriptor-ID.patch	2021-11-10 14:17:01.990745109 +0800
@@ -1 +1 @@
-From ad6f01945a75dbdcacf26579d1bdf07d1f4b1e3d Mon Sep 17 00:00:00 2001
+From 96a4bd11ebd659a4ba78a3b724fa8793b59d679c Mon Sep 17 00:00:00 2001
@@ -7,0 +8,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit ad6f01945a75dbdcacf26579d1bdf07d1f4b1e3d ]
@@ -15 +17,0 @@
-Cc: stable at dpdk.org
@@ -26 +28 @@
-index 4182939272..4f3dd31c10 100644
+index c169518ec8..b812c28829 100644
@@ -29 +31 @@
-@@ -732,6 +732,9 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie,
+@@ -735,6 +735,9 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie,