patch 'net/virtio: fix missing next flag in Tx packed ring' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.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/21/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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/0c91efd3313447e75d1d0c9abf76a1798c8451c8

Thanks.

Kevin

---
>From 0c91efd3313447e75d1d0c9abf76a1798c8451c8 Mon Sep 17 00:00:00 2001
From: Fengjiang Liu <liufengjiang.0426 at bytedance.com>
Date: Tue, 17 Oct 2023 15:26:23 +0800
Subject: [PATCH] net/virtio: fix missing next flag in Tx packed ring

[ upstream commit f923636411c557782f4718de8bee856d60afa74c ]

When the packets is sent in packed mode, and the packets data and
virtio-header are divided into two desc, set the next flag of
virtio-header desc

Bugzilla ID: 1295
Fixes: 892dc798fa9c ("net/virtio: implement Tx path for packed queues")

Signed-off-by: Fengjiang Liu <liufengjiang.0426 at bytedance.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 .mailmap                       | 1 +
 drivers/net/virtio/virtqueue.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index f0aac43189..1111c386e2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -377,4 +377,5 @@ Fei Chen <chenwei.0515 at bytedance.com>
 Feifei Wang <feifei.wang2 at arm.com> <feifei.wang at arm.com>
 Fei Qin <fei.qin at corigine.com>
+Fengjiang Liu <liufengjiang.0426 at bytedance.com>
 Fengnan Chang <changfengnan at bytedance.com>
 Fengtian Guo <fengtian.guo at 6wind.com>
diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h
index 99c68cf622..9a77e7d701 100644
--- a/drivers/net/virtio/virtqueue.h
+++ b/drivers/net/virtio/virtqueue.h
@@ -776,4 +776,5 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie,
 			RTE_PTR_DIFF(&txr[idx].tx_hdr, txr);
 		start_dp[idx].len   = vq->hw->vtnet_hdr_size;
+		head_flags |= VRING_DESC_F_NEXT;
 		hdr = (struct virtio_net_hdr *)&txr[idx].tx_hdr;
 		idx++;
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-16 13:21:52.667948162 +0000
+++ 0003-net-virtio-fix-missing-next-flag-in-Tx-packed-ring.patch	2023-11-16 13:21:52.392946206 +0000
@@ -1 +1 @@
-From f923636411c557782f4718de8bee856d60afa74c Mon Sep 17 00:00:00 2001
+From 0c91efd3313447e75d1d0c9abf76a1798c8451c8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f923636411c557782f4718de8bee856d60afa74c ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 3f5bab26a8..5273df74cb 100644
+index f0aac43189..1111c386e2 100644
@@ -25 +26 @@
-@@ -395,4 +395,5 @@ Fei Chen <chenwei.0515 at bytedance.com>
+@@ -377,4 +377,5 @@ Fei Chen <chenwei.0515 at bytedance.com>
@@ -32 +33 @@
-index c1cb941c43..5d0c0399a8 100644
+index 99c68cf622..9a77e7d701 100644
@@ -35,3 +36,3 @@
-@@ -683,4 +683,5 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie,
- 		start_dp[idx].addr = txvq->hdr_mem + RTE_PTR_DIFF(&txr[idx].tx_hdr, txr);
- 		start_dp[idx].len = vq->hw->vtnet_hdr_size;
+@@ -776,4 +776,5 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie,
+ 			RTE_PTR_DIFF(&txr[idx].tx_hdr, txr);
+ 		start_dp[idx].len   = vq->hw->vtnet_hdr_size;