From: Michael Pfeiffer <michael.pfeiffer@tu-ilmenau.de>
To: Olivier Matz <olivier.matz@6wind.com>
Cc: Andrew Rybchenko <arybchenko@solarflare.com>,
dev@dpdk.org, Michael Pfeiffer <michael.pfeiffer@tu-ilmenau.de>
Subject: [dpdk-dev] [PATCH v2] net: calculate checksums for packets with IPv4 options
Date: Tue, 1 Sep 2020 11:47:55 +0200 [thread overview]
Message-ID: <20200901094755.561661-1-michael.pfeiffer@tu-ilmenau.de> (raw)
In-Reply-To: <20200821113210.307175-1-michael.pfeiffer@tu-ilmenau.de>
Currently, rte_ipv4_cksum() and rte_ipv4_udptcp_cksum() assume all IPv4
headers have sizeof(struct rte_ipv4_hdr) bytes. This is not true for
those (rare) packets with IPv4 options. Thus, both IPv4 and TCP/UDP
checksums are calculated wrong.
This patch fixes the issue by using the actual IPv4 header length from
the packet's IHL field.
Signed-off-by: Michael Pfeiffer <michael.pfeiffer@tu-ilmenau.de>
---
v2:
* Use actual header length for sanity check as well.
* Introduce ip_hdr_len variable to increase readability.
lib/librte_net/rte_ip.h | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
index fcd1eb342..bb55ebb6f 100644
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h
@@ -269,7 +269,7 @@ static inline uint16_t
rte_ipv4_cksum(const struct rte_ipv4_hdr *ipv4_hdr)
{
uint16_t cksum;
- cksum = rte_raw_cksum(ipv4_hdr, sizeof(struct rte_ipv4_hdr));
+ cksum = rte_raw_cksum(ipv4_hdr, (ipv4_hdr->version_ihl & 0xf) * 4);
return (uint16_t)~cksum;
}
@@ -302,6 +302,9 @@ rte_ipv4_phdr_cksum(const struct rte_ipv4_hdr *ipv4_hdr, uint64_t ol_flags)
uint16_t len; /* L4 length. */
} psd_hdr;
+ uint32_t l3_len;
+ uint8_t ip_hdr_len;
+
psd_hdr.src_addr = ipv4_hdr->src_addr;
psd_hdr.dst_addr = ipv4_hdr->dst_addr;
psd_hdr.zero = 0;
@@ -309,9 +312,9 @@ rte_ipv4_phdr_cksum(const struct rte_ipv4_hdr *ipv4_hdr, uint64_t ol_flags)
if (ol_flags & PKT_TX_TCP_SEG) {
psd_hdr.len = 0;
} else {
- psd_hdr.len = rte_cpu_to_be_16(
- (uint16_t)(rte_be_to_cpu_16(ipv4_hdr->total_length)
- - sizeof(struct rte_ipv4_hdr)));
+ l3_len = rte_be_to_cpu_16(ipv4_hdr->total_length);
+ ip_hdr_len = (ipv4_hdr->version_ihl & 0xf) * 4;
+ psd_hdr.len = rte_cpu_to_be_16((uint16_t)(l3_len - ip_hdr_len));
}
return rte_raw_cksum(&psd_hdr, sizeof(psd_hdr));
}
@@ -319,8 +322,8 @@ rte_ipv4_phdr_cksum(const struct rte_ipv4_hdr *ipv4_hdr, uint64_t ol_flags)
/**
* Process the IPv4 UDP or TCP checksum.
*
- * The IPv4 header should not contains options. The IP and layer 4
- * checksum must be set to 0 in the packet by the caller.
+ * The IP and layer 4 checksum must be set to 0 in the packet by
+ * the caller.
*
* @param ipv4_hdr
* The pointer to the contiguous IPv4 header.
@@ -334,12 +337,14 @@ rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr)
{
uint32_t cksum;
uint32_t l3_len, l4_len;
+ uint8_t ip_hdr_len;
+ ip_hdr_len = (ipv4_hdr->version_ihl & 0xf) * 4;
l3_len = rte_be_to_cpu_16(ipv4_hdr->total_length);
- if (l3_len < sizeof(struct rte_ipv4_hdr))
+ if (l3_len < ip_hdr_len)
return 0;
- l4_len = l3_len - sizeof(struct rte_ipv4_hdr);
+ l4_len = l3_len - ip_hdr_len;
cksum = rte_raw_cksum(l4_hdr, l4_len);
cksum += rte_ipv4_phdr_cksum(ipv4_hdr, 0);
--
2.28.0
next prev parent reply other threads:[~2020-09-01 9:48 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-21 11:32 [dpdk-dev] [PATCH] " Michael Pfeiffer
2020-08-29 11:43 ` Andrew Rybchenko
2020-09-01 9:47 ` Michael Pfeiffer [this message]
2020-09-07 7:48 ` [dpdk-dev] [PATCH v2] " Andrew Rybchenko
2020-10-05 22:55 ` Thomas Monjalon
2020-10-06 2:39 ` Stephen Hemminger
2020-10-06 8:10 ` Olivier Matz
2020-10-06 9:51 ` Michael Pfeiffer
2020-10-06 15: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=20200901094755.561661-1-michael.pfeiffer@tu-ilmenau.de \
--to=michael.pfeiffer@tu-ilmenau.de \
--cc=arybchenko@solarflare.com \
--cc=dev@dpdk.org \
--cc=olivier.matz@6wind.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).