patch 'net/tap: fix L4 checksum offloading' has been queued to stable release 20.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.10

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/10/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/3c5688e78a52578d1e27d68dd126ee3fe5a61b31

Thanks.

Luca Boccassi

---
>From 3c5688e78a52578d1e27d68dd126ee3fe5a61b31 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Thu, 24 Aug 2023 09:18:20 +0200
Subject: [PATCH] net/tap: fix L4 checksum offloading

[ upstream commit 0bbafe48ae0a35e306b1cd91b0e7726ae4451f9a ]

The L4 checksum offloading API does not require l4_len to be set.
Make the driver discover the L4 headers size by itself.

Fixes: 6546e76056e3 ("net/tap: calculate checksums of multi segs packets")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Tested-by: Ales Musil <amusil at redhat.com>
Acked-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
 drivers/net/tap/rte_eth_tap.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index e6dc870594..2a7006c7b2 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -656,13 +656,22 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs,
 		    ((mbuf->ol_flags & (PKT_TX_IP_CKSUM | PKT_TX_IPV4) ||
 		     (mbuf->ol_flags & PKT_TX_L4_MASK) == PKT_TX_UDP_CKSUM ||
 		     (mbuf->ol_flags & PKT_TX_L4_MASK) == PKT_TX_TCP_CKSUM))) {
+			unsigned int l4_len = 0;
+
 			is_cksum = 1;
 
+			if ((mbuf->ol_flags & PKT_TX_L4_MASK) ==
+					PKT_TX_UDP_CKSUM)
+				l4_len = sizeof(struct rte_udp_hdr);
+			else if ((mbuf->ol_flags & PKT_TX_L4_MASK) ==
+					PKT_TX_TCP_CKSUM)
+				l4_len = sizeof(struct rte_tcp_hdr);
+
 			/* Support only packets with at least layer 4
 			 * header included in the first segment
 			 */
 			seg_len = rte_pktmbuf_data_len(mbuf);
-			l234_hlen = mbuf->l2_len + mbuf->l3_len + mbuf->l4_len;
+			l234_hlen = mbuf->l2_len + mbuf->l3_len + l4_len;
 			if (seg_len < l234_hlen)
 				return -1;
 
@@ -672,7 +681,7 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs,
 			rte_memcpy(m_copy, rte_pktmbuf_mtod(mbuf, void *),
 					l234_hlen);
 			tap_tx_l3_cksum(m_copy, mbuf->ol_flags,
-				       mbuf->l2_len, mbuf->l3_len, mbuf->l4_len,
+				       mbuf->l2_len, mbuf->l3_len, l4_len,
 				       &l4_cksum, &l4_phdr_cksum,
 				       &l4_raw_cksum);
 			iovecs[k].iov_base = m_copy;
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-08 19:23:53.203624041 +0000
+++ 0025-net-tap-fix-L4-checksum-offloading.patch	2023-11-08 19:23:51.805396955 +0000
@@ -1 +1 @@
-From 0bbafe48ae0a35e306b1cd91b0e7726ae4451f9a Mon Sep 17 00:00:00 2001
+From 3c5688e78a52578d1e27d68dd126ee3fe5a61b31 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0bbafe48ae0a35e306b1cd91b0e7726ae4451f9a ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -16 +16,0 @@
- .mailmap                      |  1 +
@@ -18 +18 @@
- 2 files changed, 12 insertions(+), 2 deletions(-)
+ 1 file changed, 11 insertions(+), 2 deletions(-)
@@ -20,12 +19,0 @@
-diff --git a/.mailmap b/.mailmap
-index c384d97a1a..c0ab6d090b 100644
---- a/.mailmap
-+++ b/.mailmap
-@@ -41,6 +41,7 @@ Aleksandr Loktionov <aleksandr.loktionov at intel.com>
- Aleksandr Miloshenko <a.miloshenko at f5.com>
- Aleksey Baulin <aleksey.baulin at gmail.com>
- Aleksey Katargin <gureedo at gmail.com>
-+Ales Musil <amusil at redhat.com>
- Alexander Bechikov <asb.tyum at gmail.com>
- Alexander Belyakov <abelyako at gmail.com>
- Alexander Chernavin <achernavin at netgate.com>
@@ -33 +21 @@
-index b25a52655f..66335d2755 100644
+index e6dc870594..2a7006c7b2 100644
@@ -36,4 +24,4 @@
-@@ -645,13 +645,22 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs,
- 		    ((mbuf->ol_flags & (RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_IPV4) ||
- 		      (mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) == RTE_MBUF_F_TX_UDP_CKSUM ||
- 		      (mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) == RTE_MBUF_F_TX_TCP_CKSUM))) {
+@@ -656,13 +656,22 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs,
+ 		    ((mbuf->ol_flags & (PKT_TX_IP_CKSUM | PKT_TX_IPV4) ||
+ 		     (mbuf->ol_flags & PKT_TX_L4_MASK) == PKT_TX_UDP_CKSUM ||
+ 		     (mbuf->ol_flags & PKT_TX_L4_MASK) == PKT_TX_TCP_CKSUM))) {
@@ -44,2 +32,2 @@
-+			if ((mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) ==
-+					RTE_MBUF_F_TX_UDP_CKSUM)
++			if ((mbuf->ol_flags & PKT_TX_L4_MASK) ==
++					PKT_TX_UDP_CKSUM)
@@ -47,2 +35,2 @@
-+			else if ((mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) ==
-+					RTE_MBUF_F_TX_TCP_CKSUM)
++			else if ((mbuf->ol_flags & PKT_TX_L4_MASK) ==
++					PKT_TX_TCP_CKSUM)
@@ -60 +48 @@
-@@ -661,7 +670,7 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs,
+@@ -672,7 +681,7 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs,