From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 88BB0A046B for ; Fri, 28 Jun 2019 05:13:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3B21237B4; Fri, 28 Jun 2019 05:13:27 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [84.52.114.115]) by dpdk.org (Postfix) with ESMTP id C8B3D37B4; Fri, 28 Jun 2019 05:13:25 +0200 (CEST) Received: from olwe.oktetlabs.ru (olwe.oktetlabs.ru [192.168.37.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by shelob.oktetlabs.ru (Postfix) with ESMTPSA id 16DBA7F6DE; Fri, 28 Jun 2019 06:13:24 +0300 (MSK) From: Ivan Malov To: Olivier Matz Cc: dev@dpdk.org, "Ananyev, Konstantin" , Andrew Rybchenko , Stephen Hemminger , Tomasz Kulasek , stable@dpdk.org Date: Fri, 28 Jun 2019 06:13:09 +0300 Message-Id: <20190628031309.24215-1-ivan.malov@oktetlabs.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190529173337.31157-1-ivan.malov@oktetlabs.ru> References: <20190529173337.31157-1-ivan.malov@oktetlabs.ru> Subject: [dpdk-stable] [PATCH v3] net: fix the way how L4 checksum choice is tested 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" The API to prepare checksum offloads mistreats L4 checksum type enum values as self-contained flags. Turning these flag checks into enum checks causes warnings by GCC about possibly uninitialised IPv4 header pointer. The issue was found to show up in the case of GCC versions 4.8.5 and 5.4.0, however, it might be the case for a wider variety of other versions. Initialise the pointer upon declaration. and explain the reason behind this in the comment. Fixes: 4fb7e803eb1a ("ethdev: add Tx preparation") Cc: Tomasz Kulasek Cc: stable@dpdk.org Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko --- lib/librte_net/rte_net.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/librte_net/rte_net.h b/lib/librte_net/rte_net.h index 7be69f8..d240206 100644 --- a/lib/librte_net/rte_net.h +++ b/lib/librte_net/rte_net.h @@ -112,7 +112,8 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m, static inline int rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags) { - struct rte_ipv4_hdr *ipv4_hdr; + /* Initialise ipv4_hdr to avoid false positive compiler warnings. */ + struct rte_ipv4_hdr *ipv4_hdr = NULL; struct rte_ipv6_hdr *ipv6_hdr; struct rte_tcp_hdr *tcp_hdr; struct rte_udp_hdr *udp_hdr; @@ -150,7 +151,7 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m, ipv4_hdr->hdr_checksum = 0; } - if ((ol_flags & PKT_TX_UDP_CKSUM) == PKT_TX_UDP_CKSUM) { + if ((ol_flags & PKT_TX_L4_MASK) == PKT_TX_UDP_CKSUM) { if (ol_flags & PKT_TX_IPV4) { udp_hdr = (struct rte_udp_hdr *)((char *)ipv4_hdr + m->l3_len); @@ -166,7 +167,7 @@ uint32_t rte_net_get_ptype(const struct rte_mbuf *m, udp_hdr->dgram_cksum = rte_ipv6_phdr_cksum(ipv6_hdr, ol_flags); } - } else if ((ol_flags & PKT_TX_TCP_CKSUM) || + } else if ((ol_flags & PKT_TX_L4_MASK) == PKT_TX_TCP_CKSUM || (ol_flags & PKT_TX_TCP_SEG)) { if (ol_flags & PKT_TX_IPV4) { /* non-TSO tcp or TSO */ -- 1.8.3.1