patch 'doc: fix mbuf flags' has been queued to stable release 22.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.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 08/01/24. 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/b9c8076d92f67cf300f707d3e7fa3f30b207b221

Thanks.

Luca Boccassi

---
>From b9c8076d92f67cf300f707d3e7fa3f30b207b221 Mon Sep 17 00:00:00 2001
From: Yingming Mao <maoyingming at baidu.com>
Date: Thu, 18 Apr 2024 14:20:25 +0800
Subject: [PATCH] doc: fix mbuf flags

[ upstream commit 1d9077d101b5c9ac2f841a82187ef5ced0fc7f43 ]

Fixes: 2542ad53d867 ("doc: add description of the offload API")
Fixes: ae2c2cb60635 ("net/cnxk: avoid command copy from Tx queue")

Signed-off-by: Yingming Mao <maoyingming at baidu.com>
Reviewed-by: Shuo Li <lishuo02 at baidu.com>
---
 .mailmap                           | 3 ++-
 doc/guides/prog_guide/mbuf_lib.rst | 8 ++++----
 drivers/net/cnxk/cn10k_tx.h        | 2 +-
 drivers/net/cnxk/cn9k_tx.h         | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.mailmap b/.mailmap
index 0398b858fb..b0d505e36d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -830,7 +830,6 @@ Mandeep Rohilla <mrohilla at brocade.com>
 Manish Chopra <manishc at marvell.com>
 Manish Tomar <manish.tomar at nxp.com>
 Mao Jiang <maox.jiang at intel.com>
-Mao YingMing <maoyingming at baidu.com>
 Marcel Apfelbaum <marcel at redhat.com>
 Marcel Cornu <marcel.d.cornu at intel.com>
 Marcelo Ricardo Leitner <marcelo.leitner at gmail.com>
@@ -1271,6 +1270,7 @@ Shuanglin Wang <shuanglin.wang at broadcom.com>
 Shuki Katzenelson <shuki at lightbitslabs.com>
 Shun Hao <shunh at nvidia.com>
 Shu Shen <shu.shen at radisys.com>
+Shuo Li <lishuo02 at baidu.com>
 Shweta Choudaha <shweta.choudaha at att.com>
 Shyam Kumar Shrivastav <shrivastav.shyam at gmail.com>
 Shy Shyman <shys at nvidia.com> <shys at mellanox.com>
@@ -1567,6 +1567,7 @@ Yi Lu <luyi68 at live.com>
 Yilun Xu <yilun.xu at intel.com>
 Yinan Wang <yinan.wang at intel.com>
 Ying A Wang <ying.a.wang at intel.com>
+Yingming Mao <maoyingming at baidu.com>
 Yingya Han <yingyax.han at intel.com>
 Yinjun Zhang <yinjun.zhang at corigine.com>
 Yipeng Wang <yipeng1.wang at intel.com>
diff --git a/doc/guides/prog_guide/mbuf_lib.rst b/doc/guides/prog_guide/mbuf_lib.rst
index 049357c755..749f9c97a8 100644
--- a/doc/guides/prog_guide/mbuf_lib.rst
+++ b/doc/guides/prog_guide/mbuf_lib.rst
@@ -134,7 +134,7 @@ a vxlan-encapsulated tcp packet:
 
     mb->l2_len = len(out_eth)
     mb->l3_len = len(out_ip)
-    mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CSUM
+    mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM
     set out_ip checksum to 0 in the packet
 
   This is supported on hardware advertising RTE_ETH_TX_OFFLOAD_IPV4_CKSUM.
@@ -143,7 +143,7 @@ a vxlan-encapsulated tcp packet:
 
     mb->l2_len = len(out_eth)
     mb->l3_len = len(out_ip)
-    mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CSUM | RTE_MBUF_F_TX_UDP_CKSUM
+    mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_UDP_CKSUM
     set out_ip checksum to 0 in the packet
     set out_udp checksum to pseudo header using rte_ipv4_phdr_cksum()
 
@@ -154,7 +154,7 @@ a vxlan-encapsulated tcp packet:
 
     mb->l2_len = len(out_eth + out_ip + out_udp + vxlan + in_eth)
     mb->l3_len = len(in_ip)
-    mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CSUM
+    mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM
     set in_ip checksum to 0 in the packet
 
   This is similar to case 1), but l2_len is different. It is supported
@@ -165,7 +165,7 @@ a vxlan-encapsulated tcp packet:
 
     mb->l2_len = len(out_eth + out_ip + out_udp + vxlan + in_eth)
     mb->l3_len = len(in_ip)
-    mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CSUM | RTE_MBUF_F_TX_TCP_CKSUM
+    mb->ol_flags |= RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_TCP_CKSUM
     set in_ip checksum to 0 in the packet
     set in_tcp checksum to pseudo header using rte_ipv4_phdr_cksum()
 
diff --git a/drivers/net/cnxk/cn10k_tx.h b/drivers/net/cnxk/cn10k_tx.h
index e96030621b..cd9b1f225e 100644
--- a/drivers/net/cnxk/cn10k_tx.h
+++ b/drivers/net/cnxk/cn10k_tx.h
@@ -898,7 +898,7 @@ cn10k_nix_xmit_prepare_tstamp(struct cn10k_eth_txq *txq, uintptr_t lmt_addr,
 		struct nix_send_mem_s *send_mem;
 
 		send_mem = (struct nix_send_mem_s *)(lmt + off);
-		/* Packets for which PKT_TX_IEEE1588_TMST is not set, tx tstamp
+		/* Packets for which RTE_MBUF_F_TX_IEEE1588_TMST is not set, Tx tstamp
 		 * should not be recorded, hence changing the alg type to
 		 * NIX_SENDMEMALG_SUB and also changing send mem addr field to
 		 * next 8 bytes as it corrupts the actual Tx tstamp registered
diff --git a/drivers/net/cnxk/cn9k_tx.h b/drivers/net/cnxk/cn9k_tx.h
index 257f1ce1aa..33db781abe 100644
--- a/drivers/net/cnxk/cn9k_tx.h
+++ b/drivers/net/cnxk/cn9k_tx.h
@@ -355,7 +355,7 @@ cn9k_nix_xmit_prepare_tstamp(struct cn9k_eth_txq *txq, uint64_t *cmd,
 
 		send_mem = (struct nix_send_mem_s *)(cmd + off);
 
-		/* Packets for which PKT_TX_IEEE1588_TMST is not set, tx tstamp
+		/* Packets for which RTE_MBUF_F_TX_IEEE1588_TMST is not set, Tx tstamp
 		 * should not be recorded, hence changing the alg type to
 		 * NIX_SENDMEMALG_SUB and also changing send mem addr field to
 		 * next 8 bytes as it corrupts the actual Tx tstamp registered
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-07-30 00:33:03.408914046 +0100
+++ 0002-doc-fix-mbuf-flags.patch	2024-07-30 00:33:03.317030472 +0100
@@ -1 +1 @@
-From 1d9077d101b5c9ac2f841a82187ef5ced0fc7f43 Mon Sep 17 00:00:00 2001
+From b9c8076d92f67cf300f707d3e7fa3f30b207b221 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 1d9077d101b5c9ac2f841a82187ef5ced0fc7f43 ]
+
@@ -8 +9,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 8aef1c59a4..4a508bafad 100644
+index 0398b858fb..b0d505e36d 100644
@@ -23,2 +24,2 @@
-@@ -893,7 +893,6 @@ Manish Chopra <manishc at marvell.com>
- Manish Kurup <manish.kurup at broadcom.com>
+@@ -830,7 +830,6 @@ Mandeep Rohilla <mrohilla at brocade.com>
+ Manish Chopra <manishc at marvell.com>
@@ -31 +32,2 @@
-@@ -1371,6 +1370,7 @@ Shuki Katzenelson <shuki at lightbitslabs.com>
+@@ -1271,6 +1270,7 @@ Shuanglin Wang <shuanglin.wang at broadcom.com>
+ Shuki Katzenelson <shuki at lightbitslabs.com>
@@ -34 +35,0 @@
- Shujing Dong <shujing.dong at corigine.com>
@@ -39 +40 @@
-@@ -1684,6 +1684,7 @@ Yi Lu <luyi68 at live.com>
+@@ -1567,6 +1567,7 @@ Yi Lu <luyi68 at live.com>
@@ -88 +89 @@
-index 84b08403c0..7d9b259a5f 100644
+index e96030621b..cd9b1f225e 100644
@@ -91 +92 @@
-@@ -1242,7 +1242,7 @@ cn10k_nix_xmit_prepare_tstamp(struct cn10k_eth_txq *txq, uintptr_t lmt_addr,
+@@ -898,7 +898,7 @@ cn10k_nix_xmit_prepare_tstamp(struct cn10k_eth_txq *txq, uintptr_t lmt_addr,
@@ -101 +102 @@
-index b56881c561..9370985864 100644
+index 257f1ce1aa..33db781abe 100644
@@ -104 +105 @@
-@@ -560,7 +560,7 @@ cn9k_nix_xmit_prepare_tstamp(struct cn9k_eth_txq *txq, uint64_t *cmd,
+@@ -355,7 +355,7 @@ cn9k_nix_xmit_prepare_tstamp(struct cn9k_eth_txq *txq, uint64_t *cmd,