patch 'vhost: fix net header settings in datapath' has been queued to stable release 20.11.8

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.8

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/25/23. 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/81d653f7233bd18d6dfa6dda19436669f1e69455

Thanks.

Luca Boccassi

---
>From 81d653f7233bd18d6dfa6dda19436669f1e69455 Mon Sep 17 00:00:00 2001
From: Wenwu Ma <wenwux.ma at intel.com>
Date: Wed, 4 Jan 2023 10:39:45 +0800
Subject: [PATCH] vhost: fix net header settings in datapath

[ upstream commit b9c1ec8577936419c8801dfad61e848b3535295f ]

In vhost sync batch enqueue, the "num_buffers" of
virtio net header is not be set, but it should be
set to 1 if the mrg_rxbuf feature is turned on,
This patch fix the issue.

Fixes: ef861692c398 ("vhost: add packed ring batch enqueue")

Signed-off-by: Wenwu Ma <wenwux.ma at intel.com>
Tested-by: Wei Ling <weix.ling at intel.com>
Acked-by: Cheng Jiang <cheng1.jiang at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 lib/librte_vhost/virtio_net.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
index dd571b60a0..3792f82c3f 100644
--- a/lib/librte_vhost/virtio_net.c
+++ b/lib/librte_vhost/virtio_net.c
@@ -1329,6 +1329,12 @@ virtio_dev_rx_batch_packed(struct virtio_net *dev,
 			sizeof(struct virtio_net_hdr_mrg_rxbuf);
 	}
 
+	if (rxvq_is_mergeable(dev)) {
+		vhost_for_each_try_unroll(i, 0, PACKED_BATCH_SIZE) {
+			ASSIGN_UNLESS_EQUAL(hdrs[i]->num_buffers, 1);
+		}
+	}
+
 	vhost_for_each_try_unroll(i, 0, PACKED_BATCH_SIZE)
 		virtio_enqueue_offload(pkts[i], &hdrs[i]->hdr);
 
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 09:36:28.929128827 +0000
+++ 0016-vhost-fix-net-header-settings-in-datapath.patch	2023-02-23 09:36:28.190169277 +0000
@@ -1 +1 @@
-From b9c1ec8577936419c8801dfad61e848b3535295f Mon Sep 17 00:00:00 2001
+From 81d653f7233bd18d6dfa6dda19436669f1e69455 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b9c1ec8577936419c8801dfad61e848b3535295f ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
- lib/vhost/virtio_net.c | 6 ++++++
+ lib/librte_vhost/virtio_net.c | 6 ++++++
@@ -22,5 +23,5 @@
-diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c
-index 9abf752f30..a3dbf8cb10 100644
---- a/lib/vhost/virtio_net.c
-+++ b/lib/vhost/virtio_net.c
-@@ -1453,6 +1453,12 @@ virtio_dev_rx_batch_packed_copy(struct virtio_net *dev,
+diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
+index dd571b60a0..3792f82c3f 100644
+--- a/lib/librte_vhost/virtio_net.c
++++ b/lib/librte_vhost/virtio_net.c
+@@ -1329,6 +1329,12 @@ virtio_dev_rx_batch_packed(struct virtio_net *dev,