From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 7F55F5688 for ; Tue, 20 Nov 2018 20:16:12 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E154B5AFF5; Tue, 20 Nov 2018 19:16:11 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE785600C3; Tue, 20 Nov 2018 19:16:10 +0000 (UTC) From: Kevin Traynor To: Didier Pallard Cc: Konstantin Ananyev , dpdk stable Date: Tue, 20 Nov 2018 19:12:52 +0000 Message-Id: <20181120191252.30277-62-ktraynor@redhat.com> In-Reply-To: <20181120191252.30277-1-ktraynor@redhat.com> References: <20181120191252.30277-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 20 Nov 2018 19:16:11 +0000 (UTC) Subject: [dpdk-stable] patch 'net: fix Intel prepare function for IP checksum offload' has been queued to stable release 18.08.1 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: Tue, 20 Nov 2018 19:16:12 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/23/18. 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. Kevin Traynor --- >>From 1f1265e78ee179831a0d34c5afb5498cc1987064 Mon Sep 17 00:00:00 2001 From: Didier Pallard Date: Wed, 19 Sep 2018 16:42:08 +0200 Subject: [PATCH] net: fix Intel prepare function for IP checksum offload [ upstream commit ae0207d4b5048a6af9bc30e0956d30461b813148 ] Current Intel tx prepare function does not properly handle the case where only IP checksum is requested, without requesting any L4 checksum or TSO: IP checksum is not properly reset to 0 and output packet may contain invalid IP checksum. Fixes: 4fb7e803eb1a ("ethdev: add Tx preparation") Signed-off-by: Didier Pallard Acked-by: Konstantin Ananyev --- lib/librte_net/rte_net.h | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/lib/librte_net/rte_net.h b/lib/librte_net/rte_net.h index b6ab6e1d5..e59760a0a 100644 --- a/lib/librte_net/rte_net.h +++ b/lib/librte_net/rte_net.h @@ -123,12 +123,14 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags) inner_l3_offset += m->outer_l2_len + m->outer_l3_len; + if (ol_flags & PKT_TX_IPV4) { + ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *, + inner_l3_offset); + + if (ol_flags & PKT_TX_IP_CKSUM) + ipv4_hdr->hdr_checksum = 0; + } + if ((ol_flags & PKT_TX_UDP_CKSUM) == PKT_TX_UDP_CKSUM) { if (ol_flags & PKT_TX_IPV4) { - ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *, - inner_l3_offset); - - if (ol_flags & PKT_TX_IP_CKSUM) - ipv4_hdr->hdr_checksum = 0; - udp_hdr = (struct udp_hdr *)((char *)ipv4_hdr + m->l3_len); @@ -147,10 +149,4 @@ rte_net_intel_cksum_flags_prepare(struct rte_mbuf *m, uint64_t ol_flags) (ol_flags & PKT_TX_TCP_SEG)) { if (ol_flags & PKT_TX_IPV4) { - ipv4_hdr = rte_pktmbuf_mtod_offset(m, struct ipv4_hdr *, - inner_l3_offset); - - if (ol_flags & PKT_TX_IP_CKSUM) - ipv4_hdr->hdr_checksum = 0; - /* non-TSO tcp or TSO */ tcp_hdr = (struct tcp_hdr *)((char *)ipv4_hdr + -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-20 17:53:08.946846359 +0000 +++ 0062-net-fix-Intel-prepare-function-for-IP-checksum-offlo.patch 2018-11-20 17:53:07.000000000 +0000 @@ -1,15 +1,16 @@ -From ae0207d4b5048a6af9bc30e0956d30461b813148 Mon Sep 17 00:00:00 2001 +From 1f1265e78ee179831a0d34c5afb5498cc1987064 Mon Sep 17 00:00:00 2001 From: Didier Pallard Date: Wed, 19 Sep 2018 16:42:08 +0200 Subject: [PATCH] net: fix Intel prepare function for IP checksum offload +[ upstream commit ae0207d4b5048a6af9bc30e0956d30461b813148 ] + Current Intel tx prepare function does not properly handle the case where only IP checksum is requested, without requesting any L4 checksum or TSO: IP checksum is not properly reset to 0 and output packet may contain invalid IP checksum. Fixes: 4fb7e803eb1a ("ethdev: add Tx preparation") -Cc: stable@dpdk.org Signed-off-by: Didier Pallard Acked-by: Konstantin Ananyev