patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kaiwen Deng <kaiwenx.deng@intel.com>
To: dev@dpdk.org
Cc: stable@dpdk.org, qiming.yang@intel.com, yidingx.zhou@intel.com,
	Kaiwen Deng <kaiwenx.deng@intel.com>,
	Aman Singh <aman.deep.singh@intel.com>,
	Yuying Zhang <yuying.zhang@intel.com>,
	Olivier Matz <olivier.matz@6wind.com>,
	Pablo de Lara <pablo.de.lara.guarch@intel.com>
Subject: [PATCH] app/test-pmd: fix L4 checksum with padding data
Date: Fri,  4 Aug 2023 16:28:48 +0800	[thread overview]
Message-ID: <20230804082849.533059-1-kaiwenx.deng@intel.com> (raw)

IEEE 802 packets may have a minimum size limit. The data fields
should be padded when necessary. In some cases, the padding data
is not zero. Testpmd does not trim these IP packets to the true
length of the frame, so errors will occur when calculating TCP
or UDP checksum.

This commit fixes this issue by triming IP packets to the true
length of the frame in testpmd.

Fixes: 03d17e4d0179 ("app/testpmd: do not change IP addrs in checksum engine")
Cc: stable@dpdk.org

Signed-off-by: Kaiwen Deng <kaiwenx.deng@intel.com>
---
 app/test-pmd/csumonly.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 7af635e3f7..58b72b714a 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -853,12 +853,14 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
 	uint16_t nb_rx;
 	uint16_t nb_prep;
 	uint16_t i;
+	uint16_t pad_len;
 	uint64_t rx_ol_flags, tx_ol_flags;
 	uint64_t tx_offloads;
 	uint32_t rx_bad_ip_csum;
 	uint32_t rx_bad_l4_csum;
 	uint32_t rx_bad_outer_l4_csum;
 	uint32_t rx_bad_outer_ip_csum;
+	uint32_t l3_off;
 	struct testpmd_offload_info info;
 
 	/* receive a burst of packet */
@@ -980,6 +982,36 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
 			l3_hdr = (char *)l3_hdr + info.outer_l3_len + info.l2_len;
 		}
 
+		if (info.is_tunnel) {
+			l3_off = info.outer_l2_len +
+					info.outer_l3_len +
+					info.l2_len;
+		} else {
+			l3_off = info.l2_len;
+		}
+		switch (info.ethertype) {
+		case _htons(RTE_ETHER_TYPE_IPV4):
+			pad_len = rte_pktmbuf_data_len(m) -
+					(l3_off +
+					rte_be_to_cpu_16(
+					((struct rte_ipv4_hdr *)l3_hdr)->total_length));
+			break;
+		case _htons(RTE_ETHER_TYPE_IPV6):
+			pad_len = rte_pktmbuf_data_len(m) -
+					(l3_off +
+					rte_be_to_cpu_16(
+					((struct rte_ipv6_hdr *)l3_hdr)->payload_len));
+			break;
+		default:
+			pad_len = 0;
+			break;
+		}
+
+		if (pad_len) {
+			rte_pktmbuf_data_len(m) = rte_pktmbuf_data_len(m) - pad_len;
+			rte_pktmbuf_pkt_len(m) = rte_pktmbuf_data_len(m);
+		}
+
 		/* step 2: depending on user command line configuration,
 		 * recompute checksum either in software or flag the
 		 * mbuf to offload the calculation to the NIC. If TSO
-- 
2.34.1


             reply	other threads:[~2023-08-04  9:07 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-04  8:28 Kaiwen Deng [this message]
2023-11-02 19:20 ` Ferruh Yigit
2023-11-03  2:49   ` Deng, KaiwenX
2023-11-03  4:03     ` Ferruh Yigit
2023-11-14  2:19       ` Deng, KaiwenX
2023-11-14 19:09         ` Ferruh Yigit
2023-11-16  7:02           ` Deng, KaiwenX
2023-11-16 22:58   ` Stephen Hemminger
2023-11-17  0:50     ` Ferruh Yigit
2023-11-17  3:28       ` Stephen Hemminger
2023-11-17  9:29         ` Ferruh Yigit
2023-11-17 12:11           ` Morten Brørup
2023-11-17 16:23             ` Stephen Hemminger
2023-11-17 16:22           ` Stephen Hemminger
2023-11-20 10:47             ` Ferruh Yigit
2023-11-20  9:21       ` Deng, KaiwenX
2023-11-20 10:46         ` Ferruh Yigit
2023-11-22  3:04           ` Deng, KaiwenX
2023-11-17  1:13 ` Ferruh Yigit
2023-11-20  9:52   ` Deng, KaiwenX
2023-12-07  8:53 ` [PATCH v2] app/test-pmd: fix tcp/udp cksum " Kaiwen Deng
2023-12-07 14:35   ` Ferruh Yigit
2023-12-12  2:16   ` [PATCH v3] lib/net: " Kaiwen Deng
2023-12-12  8:10     ` Morten Brørup
2023-12-13  4:37     ` [PATCH v4] " Kaiwen Deng
2023-12-13  7:36       ` Morten Brørup
2023-12-14  9:22       ` [PATCH v5] " Kaiwen Deng
2023-12-14 11:20         ` Morten Brørup
2024-02-19  1:10           ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230804082849.533059-1-kaiwenx.deng@intel.com \
    --to=kaiwenx.deng@intel.com \
    --cc=aman.deep.singh@intel.com \
    --cc=dev@dpdk.org \
    --cc=olivier.matz@6wind.com \
    --cc=pablo.de.lara.guarch@intel.com \
    --cc=qiming.yang@intel.com \
    --cc=stable@dpdk.org \
    --cc=yidingx.zhou@intel.com \
    --cc=yuying.zhang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).