From: guohongzhi <guohongzhi1@huawei.com>
To: <dev@dpdk.org>
Cc: <olivier.matz@6wind.com>, <mb@smartsharesystems.com>,
<konstantin.ananyev@intel.com>, <jiayu.hu@intel.com>,
<ferruh.yigit@intel.com>, <nicolas.chautru@intel.com>,
<cristian.dumitrescu@intel.com>, <zhoujingbin@huawei.com>,
<chenchanghu@huawei.com>, <jerry.lilijun@huawei.com>,
<haifeng.lin@huawei.com>, <guohongzhi1@huawei.com>
Subject: [dpdk-dev] [PATCH] lib/librte_net: fix bug for checksum calculating
Date: Fri, 15 May 2020 21:08:50 +0800 [thread overview]
Message-ID: <20200515130850.12760-1-guohongzhi1@huawei.com> (raw)
1.rte_ipv4_cksum will return invalid checksum value like 0xffff.(rfc1624)
2.__rte_raw_cksum should consider Big Endian.
3.checksum 0x0000 is invalid for udp, but valid for tcp.(rfc768)
Signed-off-by: guohongzhi <guohongzhi1@huawei.com>
---
lib/librte_net/rte_ip.h | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
index 1ceb7b7..4177ea7 100644
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h
@@ -140,7 +140,11 @@ __rte_raw_cksum(const void *buf, size_t len, uint32_t sum)
/* if length is in odd bytes */
if (len == 1)
+#if (RTE_BYTE_ORDER == RTE_BIG_ENDIAN)
+ sum += *((const uint8_t *)u16_buf) << 8;
+#else
sum += *((const uint8_t *)u16_buf);
+#endif
return sum;
}
@@ -267,7 +271,7 @@ rte_ipv4_cksum(const struct rte_ipv4_hdr *ipv4_hdr)
{
uint16_t cksum;
cksum = rte_raw_cksum(ipv4_hdr, sizeof(struct rte_ipv4_hdr));
- return (cksum == 0xffff) ? cksum : (uint16_t)~cksum;
+ return (uint16_t)~cksum;
}
/**
@@ -324,8 +328,7 @@ rte_ipv4_phdr_cksum(const struct rte_ipv4_hdr *ipv4_hdr, uint64_t ol_flags)
* @param l4_hdr
* The pointer to the beginning of the L4 header.
* @return
- * The complemented checksum to set in the IP packet
- * or 0 on error
+ * The complemented checksum to set in the IP packet.
*/
static inline uint16_t
rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr)
@@ -344,7 +347,8 @@ rte_ipv4_udptcp_cksum(const struct rte_ipv4_hdr *ipv4_hdr, const void *l4_hdr)
cksum = ((cksum & 0xffff0000) >> 16) + (cksum & 0xffff);
cksum = (~cksum) & 0xffff;
- if (cksum == 0)
+ /* 0x0000 is invalid for udp, but valid for tcp. rfc768 */
+ if (cksum == 0 && ipv4_hdr->next_proto_id == IPPROTO_UDP)
cksum = 0xffff;
return (uint16_t)cksum;
@@ -436,7 +440,8 @@ rte_ipv6_udptcp_cksum(const struct rte_ipv6_hdr *ipv6_hdr, const void *l4_hdr)
cksum = ((cksum & 0xffff0000) >> 16) + (cksum & 0xffff);
cksum = (~cksum) & 0xffff;
- if (cksum == 0)
+ /* 0x0000 is invalid for udp, but valid for tcp. rfc768 */
+ if (cksum == 0 && ipv6_hdr->proto == IPPROTO_UDP)
cksum = 0xffff;
return (uint16_t)cksum;
--
2.21.0.windows.1
next reply other threads:[~2020-05-15 13:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-15 13:08 guohongzhi [this message]
2020-05-15 13:48 ` Morten Brørup
2020-05-24 15:12 ` Thomas Monjalon
2020-05-24 15:31 ` Morten Brørup
2020-05-24 15:39 ` Thomas Monjalon
2020-05-24 16:25 ` [dpdk-dev] [PATCH] lib/librte_net: fix bug for checksumcalculating Morten Brørup
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=20200515130850.12760-1-guohongzhi1@huawei.com \
--to=guohongzhi1@huawei.com \
--cc=chenchanghu@huawei.com \
--cc=cristian.dumitrescu@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=haifeng.lin@huawei.com \
--cc=jerry.lilijun@huawei.com \
--cc=jiayu.hu@intel.com \
--cc=konstantin.ananyev@intel.com \
--cc=mb@smartsharesystems.com \
--cc=nicolas.chautru@intel.com \
--cc=olivier.matz@6wind.com \
--cc=zhoujingbin@huawei.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).