From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 9A9EFA00C3;
Fri, 15 May 2020 15:09:06 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 0F8401DAEC;
Fri, 15 May 2020 15:09:06 +0200 (CEST)
Received: from huawei.com (szxga05-in.huawei.com [45.249.212.191])
by dpdk.org (Postfix) with ESMTP id 2B2E11DAE3
for <dev@dpdk.org>; Fri, 15 May 2020 15:09:04 +0200 (CEST)
Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.58])
by Forcepoint Email with ESMTP id 957A4204AFCF410020E1;
Fri, 15 May 2020 21:09:02 +0800 (CST)
Received: from DESKTOP-ORJPOMD.china.huawei.com (10.173.251.143) by
DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id
14.3.487.0; Fri, 15 May 2020 21:08:54 +0800
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>
Date: Fri, 15 May 2020 21:08:50 +0800
Message-ID: <20200515130850.12760-1-guohongzhi1@huawei.com>
X-Mailer: git-send-email 2.21.0.windows.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Originating-IP: [10.173.251.143]
X-CFilter-Loop: Reflected
Subject: [dpdk-dev] [PATCH] lib/librte_net: fix bug for checksum calculating
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
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