From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id BE0FF1B1FE for ; Thu, 3 Jan 2019 09:15:11 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 3 Jan 2019 10:15:10 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x038EJfu008603; Thu, 3 Jan 2019 10:15:08 +0200 From: Yongseok Koh To: Andy Green Cc: dpdk stable Date: Thu, 3 Jan 2019 00:13:50 -0800 Message-Id: <20190103081400.14191-27-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190103081400.14191-1-yskoh@mellanox.com> References: <20190103081400.14191-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'net: explicit cast of IP checksum to 16-bit' has been queued to LTS release 17.11.5 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jan 2019 08:15:12 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 01/04/19. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Yongseok --- >>From bdc221571cebe6eda8d9d08f933ad85ae08ab1c2 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Thu, 17 May 2018 21:49:57 +0800 Subject: [PATCH] net: explicit cast of IP checksum to 16-bit [ upstream commit 466de6d5d8648f6a2c6cfc90c2d1bf217dd06e90 ] GCC 8.1 warned: In function 'rte_raw_cksum_mbuf': rte_ip.h:225:22: warning: conversion from 'uint32_t' {aka 'unsigned int'} to 'uint16_t' {aka 'short unsigned int'} may change value [-Wconversion] tmp = rte_bswap16(tmp); ^~~ In function 'rte_ipv4_cksum': rte_ip.h:256:35: warning: conversion from 'int' to 'uint16_t' {aka 'short unsigned int'} may change value [-Wconversion] return (cksum == 0xffff) ? cksum : ~cksum; ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~ rte_ip.h:332:9: warning: conversion from 'uint32_t' {aka 'unsigned int'} to 'uint16_t' {aka 'short unsigned int'} may change value [-Wconversion] return cksum; ^~~~~ In function 'rte_ipv6_udptcp_cksum': rte_ip.h:421:9: warning: conversion from 'uint32_t' {aka 'unsigned int'} to 'uint16_t' {aka 'short unsigned int'} may change value [-Wconversion] return cksum; ^~~~~ Fixes: 6006818cfb26 ("net: new checksum functions") Fixes: 4199fdea60c3 ("mbuf: generic support for TCP segmentation offload") Signed-off-by: Andy Green --- lib/librte_net/rte_ip.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h index 23468cb99..332ac1414 100644 --- a/lib/librte_net/rte_ip.h +++ b/lib/librte_net/rte_ip.h @@ -284,7 +284,7 @@ rte_raw_cksum_mbuf(const struct rte_mbuf *m, uint32_t off, uint32_t len, for (;;) { tmp = __rte_raw_cksum(buf, seglen, 0); if (done & 1) - tmp = rte_bswap16(tmp); + tmp = rte_bswap16((uint16_t)tmp); sum += tmp; done += seglen; if (done == len) @@ -315,7 +315,7 @@ rte_ipv4_cksum(const struct ipv4_hdr *ipv4_hdr) { uint16_t cksum; cksum = rte_raw_cksum(ipv4_hdr, sizeof(struct ipv4_hdr)); - return (cksum == 0xffff) ? cksum : ~cksum; + return (cksum == 0xffff) ? cksum : (uint16_t)~cksum; } /** @@ -391,7 +391,7 @@ rte_ipv4_udptcp_cksum(const struct ipv4_hdr *ipv4_hdr, const void *l4_hdr) if (cksum == 0) cksum = 0xffff; - return cksum; + return (uint16_t)cksum; } /** @@ -480,7 +480,7 @@ rte_ipv6_udptcp_cksum(const struct ipv6_hdr *ipv6_hdr, const void *l4_hdr) if (cksum == 0) cksum = 0xffff; - return cksum; + return (uint16_t)cksum; } #ifdef __cplusplus -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-02 23:59:13.516582795 -0800 +++ 0027-net-explicit-cast-of-IP-checksum-to-16-bit.patch 2019-01-02 23:59:12.086815000 -0800 @@ -1,8 +1,10 @@ -From 466de6d5d8648f6a2c6cfc90c2d1bf217dd06e90 Mon Sep 17 00:00:00 2001 +From bdc221571cebe6eda8d9d08f933ad85ae08ab1c2 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Thu, 17 May 2018 21:49:57 +0800 Subject: [PATCH] net: explicit cast of IP checksum to 16-bit +[ upstream commit 466de6d5d8648f6a2c6cfc90c2d1bf217dd06e90 ] + GCC 8.1 warned: In function 'rte_raw_cksum_mbuf': @@ -32,7 +34,6 @@ Fixes: 6006818cfb26 ("net: new checksum functions") Fixes: 4199fdea60c3 ("mbuf: generic support for TCP segmentation offload") -Cc: stable@dpdk.org Signed-off-by: Andy Green --- @@ -40,10 +41,10 @@ 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h -index f32684c66..edbe4335c 100644 +index 23468cb99..332ac1414 100644 --- a/lib/librte_net/rte_ip.h +++ b/lib/librte_net/rte_ip.h -@@ -222,7 +222,7 @@ rte_raw_cksum_mbuf(const struct rte_mbuf *m, uint32_t off, uint32_t len, +@@ -284,7 +284,7 @@ rte_raw_cksum_mbuf(const struct rte_mbuf *m, uint32_t off, uint32_t len, for (;;) { tmp = __rte_raw_cksum(buf, seglen, 0); if (done & 1) @@ -52,7 +53,7 @@ sum += tmp; done += seglen; if (done == len) -@@ -253,7 +253,7 @@ rte_ipv4_cksum(const struct ipv4_hdr *ipv4_hdr) +@@ -315,7 +315,7 @@ rte_ipv4_cksum(const struct ipv4_hdr *ipv4_hdr) { uint16_t cksum; cksum = rte_raw_cksum(ipv4_hdr, sizeof(struct ipv4_hdr)); @@ -61,7 +62,7 @@ } /** -@@ -329,7 +329,7 @@ rte_ipv4_udptcp_cksum(const struct ipv4_hdr *ipv4_hdr, const void *l4_hdr) +@@ -391,7 +391,7 @@ rte_ipv4_udptcp_cksum(const struct ipv4_hdr *ipv4_hdr, const void *l4_hdr) if (cksum == 0) cksum = 0xffff; @@ -70,7 +71,7 @@ } /** -@@ -418,7 +418,7 @@ rte_ipv6_udptcp_cksum(const struct ipv6_hdr *ipv6_hdr, const void *l4_hdr) +@@ -480,7 +480,7 @@ rte_ipv6_udptcp_cksum(const struct ipv6_hdr *ipv6_hdr, const void *l4_hdr) if (cksum == 0) cksum = 0xffff;