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 CB116A046B for ; Fri, 23 Aug 2019 11:44:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BF9BB1BF4C; Fri, 23 Aug 2019 11:44:54 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 4B2581BFA5 for ; Fri, 23 Aug 2019 11:44:53 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BB2533083392; Fri, 23 Aug 2019 09:44:51 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 429FA5F9D3; Fri, 23 Aug 2019 09:44:49 +0000 (UTC) From: Kevin Traynor To: Ivan Malov Cc: Andrew Rybchenko , Stephen Hemminger , Konstantin Ananyev , dpdk stable Date: Fri, 23 Aug 2019 10:43:15 +0100 Message-Id: <20190823094336.12078-25-ktraynor@redhat.com> In-Reply-To: <20190823094336.12078-1-ktraynor@redhat.com> References: <20190823094336.12078-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Fri, 23 Aug 2019 09:44:51 +0000 (UTC) Subject: [dpdk-stable] patch 'net: fix how L4 checksum choice is tested' has been queued to LTS release 18.11.3 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" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/28/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. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/3ad4739521ccae17e04135938b55c27a4988faf0 Thanks. Kevin Traynor --- >From 3ad4739521ccae17e04135938b55c27a4988faf0 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Fri, 28 Jun 2019 06:13:09 +0300 Subject: [PATCH] net: fix how L4 checksum choice is tested [ upstream commit 39a94299195f3329a28a3556e2431b9d6b83b222 ] 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") Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko Acked-by: Stephen Hemminger Acked-by: Konstantin Ananyev --- 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 a8eafa146..025acba7f 100644 --- a/lib/librte_net/rte_net.h +++ b/lib/librte_net/rte_net.h @@ -113,5 +113,6 @@ static inline int rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags) { - struct ipv4_hdr *ipv4_hdr; + /* Initialise ipv4_hdr to avoid false positive compiler warnings. */ + struct ipv4_hdr *ipv4_hdr = NULL; struct ipv6_hdr *ipv6_hdr; struct tcp_hdr *tcp_hdr; @@ -130,5 +131,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags) } - 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 udp_hdr *)((char *)ipv4_hdr + @@ -145,5 +146,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags) 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) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-22 19:38:22.094524402 +0100 +++ 0025-net-fix-how-L4-checksum-choice-is-tested.patch 2019-08-22 19:38:20.445026689 +0100 @@ -1 +1 @@ -From 39a94299195f3329a28a3556e2431b9d6b83b222 Mon Sep 17 00:00:00 2001 +From 3ad4739521ccae17e04135938b55c27a4988faf0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 39a94299195f3329a28a3556e2431b9d6b83b222 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index 461f2c81d..1560ecfa4 100644 +index a8eafa146..025acba7f 100644 @@ -32 +33 @@ -@@ -114,5 +114,6 @@ static inline int +@@ -113,5 +113,6 @@ static inline int @@ -35 +36 @@ -- struct rte_ipv4_hdr *ipv4_hdr; +- struct ipv4_hdr *ipv4_hdr; @@ -37,4 +38,4 @@ -+ struct rte_ipv4_hdr *ipv4_hdr = NULL; - struct rte_ipv6_hdr *ipv6_hdr; - struct rte_tcp_hdr *tcp_hdr; -@@ -152,5 +153,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags) ++ struct ipv4_hdr *ipv4_hdr = NULL; + struct ipv6_hdr *ipv6_hdr; + struct tcp_hdr *tcp_hdr; +@@ -130,5 +131,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags) @@ -46,2 +47,2 @@ - udp_hdr = (struct rte_udp_hdr *)((char *)ipv4_hdr + -@@ -168,5 +169,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags) + udp_hdr = (struct udp_hdr *)((char *)ipv4_hdr + +@@ -145,5 +146,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags)