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 368DEA046B for ; Fri, 23 Aug 2019 11:44:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2D3481BF9B; Fri, 23 Aug 2019 11:44:45 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 7900F1BF9E for ; Fri, 23 Aug 2019 11:44:43 +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 EA58A1801590; Fri, 23 Aug 2019 09:44:42 +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 9FA285C226; Fri, 23 Aug 2019 09:44:41 +0000 (UTC) From: Kevin Traynor To: Ivan Malov Cc: Andrew Rybchenko , Konstantin Ananyev , dpdk stable Date: Fri, 23 Aug 2019 10:43:09 +0100 Message-Id: <20190823094336.12078-19-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.6.2 (mx1.redhat.com [10.5.110.63]); Fri, 23 Aug 2019 09:44:43 +0000 (UTC) Subject: [dpdk-stable] patch 'net: fix encapsulation markers for inner L3 offset' 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/88cf98fe893f1bfaaba6aa0e66e07a5a9a612e44 Thanks. Kevin Traynor --- >From 88cf98fe893f1bfaaba6aa0e66e07a5a9a612e44 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Fri, 24 May 2019 17:57:14 +0300 Subject: [PATCH] net: fix encapsulation markers for inner L3 offset [ upstream commit 6bf0912011eed76285a6acf2ddb9b126008b6339 ] The API to prepare checksum offloads employs outer IP checksum flag to tell regular IPv4 packets from tunnel packets with outer IPv4 encapsulation. This flag cannot serve as a marker for the said purpose because a packet can have outer IPv4 encapsulation and may not have outer IP checksum offload request. Fix the API by changing the said criterion to test outer IPv4 flag rather than outer IP checksum flag. Use simpler spelling of the conditional expression. Fixes: 4fb7e803eb1a ("ethdev: add Tx preparation") Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko Acked-by: Konstantin Ananyev --- lib/librte_net/rte_net.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/librte_net/rte_net.h b/lib/librte_net/rte_net.h index e59760a0a..a8eafa146 100644 --- a/lib/librte_net/rte_net.h +++ b/lib/librte_net/rte_net.h @@ -119,6 +119,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags) uint64_t inner_l3_offset = m->l2_len; - if ((ol_flags & PKT_TX_OUTER_IP_CKSUM) || - (ol_flags & PKT_TX_OUTER_IPV6)) + if (ol_flags & (PKT_TX_OUTER_IPV4 | PKT_TX_OUTER_IPV6)) inner_l3_offset += m->outer_l2_len + m->outer_l3_len; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-22 19:38:21.713661170 +0100 +++ 0019-net-fix-encapsulation-markers-for-inner-L3-offset.patch 2019-08-22 19:38:20.438026856 +0100 @@ -1 +1 @@ -From 6bf0912011eed76285a6acf2ddb9b126008b6339 Mon Sep 17 00:00:00 2001 +From 88cf98fe893f1bfaaba6aa0e66e07a5a9a612e44 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6bf0912011eed76285a6acf2ddb9b126008b6339 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index b83f8c13a..461f2c81d 100644 +index e59760a0a..a8eafa146 100644 @@ -31,2 +32,2 @@ -@@ -130,6 +130,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags) - #endif +@@ -119,6 +119,5 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags) + uint64_t inner_l3_offset = m->l2_len;