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 A5775A04F5 for ; Wed, 11 Dec 2019 22:27:49 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9DE5C1BC25; Wed, 11 Dec 2019 22:27:49 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id A5A471BC25 for ; Wed, 11 Dec 2019 22:27:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576099668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2zXDt/56PAvyz1ieySjTMNC5ARG/VbcHV8AQdhHW5Gg=; b=U4QCRIwdRUa/CHVQdL6ewygkqCALbv5Yd050xU2dpKiRXap/+wk1DUaNG5Eq7y/Rse92TC U5lEitbF02H2yeCfxP4gw9N68tNOzhjIPUqUAtZCslhzjS4PdIymeWEUEl6tBuhDa1Eh9J WPCzUEhLjfxPtK+KsDJuL2DMtX7s0gE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-102-2MlDII3KP2yGwTuR3xcRlg-1; Wed, 11 Dec 2019 16:27:45 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E771B107ACC4; Wed, 11 Dec 2019 21:27:43 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9E1910013A1; Wed, 11 Dec 2019 21:27:42 +0000 (UTC) From: Kevin Traynor To: Kalesh AP Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Date: Wed, 11 Dec 2019 21:26:00 +0000 Message-Id: <20191211212702.27851-8-ktraynor@redhat.com> In-Reply-To: <20191211212702.27851-1-ktraynor@redhat.com> References: <20191211212702.27851-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: 2MlDII3KP2yGwTuR3xcRlg-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/bnxt: fix L4 checksum indication in non-vector Rx' has been queued to LTS release 18.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/17/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 rebasi= ng (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/1ff0885e9f3cb255ff= 14bbd24400228a042ab487 Thanks. Kevin. --- >From 1ff0885e9f3cb255ff14bbd24400228a042ab487 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Mon, 4 Nov 2019 15:32:36 +0530 Subject: [PATCH] net/bnxt: fix L4 checksum indication in non-vector Rx [ upstream commit b875339622a3765a27b73065ac783bc463cd5bce ] Update "mbuf->ol_flags" correctly for inner and ourter ip checksum errors in case of tunnel and non-tunnel packets. Fixes: 65ee636872eb ("net/bnxt: fix Rx checksum flags") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_rxr.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index 918a7ae87..8dd7cc09e 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -448,13 +448,17 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt, =09flags2_f =3D flags2_0xf(rxcmp1); =09/* IP Checksum */ -=09if (unlikely(((IS_IP_NONTUNNEL_PKT(flags2_f)) && -=09=09 (RX_CMP_IP_CS_ERROR(rxcmp1))) || -=09=09 (IS_IP_TUNNEL_PKT(flags2_f) && -=09=09 (RX_CMP_IP_OUTER_CS_ERROR(rxcmp1))))) { -=09=09mbuf->ol_flags |=3D PKT_RX_IP_CKSUM_BAD; +=09if (likely(IS_IP_NONTUNNEL_PKT(flags2_f))) { +=09=09if (unlikely(RX_CMP_IP_CS_ERROR(rxcmp1))) +=09=09=09mbuf->ol_flags |=3D PKT_RX_IP_CKSUM_BAD; +=09=09else +=09=09=09mbuf->ol_flags |=3D PKT_RX_IP_CKSUM_GOOD; +=09} else if (IS_IP_TUNNEL_PKT(flags2_f)) { +=09=09if (unlikely(RX_CMP_IP_OUTER_CS_ERROR(rxcmp1) || +=09=09=09 RX_CMP_IP_CS_ERROR(rxcmp1))) +=09=09=09mbuf->ol_flags |=3D PKT_RX_IP_CKSUM_BAD; +=09=09else +=09=09=09mbuf->ol_flags |=3D PKT_RX_IP_CKSUM_GOOD; =09} else if (unlikely(RX_CMP_IP_CS_UNKNOWN(rxcmp1))) { =09=09mbuf->ol_flags |=3D PKT_RX_IP_CKSUM_UNKNOWN; -=09} else { -=09=09mbuf->ol_flags |=3D PKT_RX_IP_CKSUM_GOOD; =09} =20 --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-11 21:24:13.423216012 +0000 +++ 0008-net-bnxt-fix-L4-checksum-indication-in-non-vector-Rx.patch=092019-= 12-11 21:24:12.583652953 +0000 @@ -1 +1 @@ -From b875339622a3765a27b73065ac783bc463cd5bce Mon Sep 17 00:00:00 2001 +From 1ff0885e9f3cb255ff14bbd24400228a042ab487 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b875339622a3765a27b73065ac783bc463cd5bce ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index ee1444c1d..c35bc1afd 100644 +index 918a7ae87..8dd7cc09e 100644 @@ -23 +24 @@ -@@ -513,13 +513,17 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt, +@@ -448,13 +448,17 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,