From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3A100A00C2 for ; Thu, 3 Nov 2022 10:28:29 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 368CD41614; Thu, 3 Nov 2022 10:28:29 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id 6620341614 for ; Thu, 3 Nov 2022 10:28:28 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id h9so1779373wrt.0 for ; Thu, 03 Nov 2022 02:28:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xum5K7O0kdwK/5dO1nT0TEJRMceHIsBEzBbf9ZLS3w4=; b=XOMK3HcHdqN5NZvfKMf04hPLC6X9DEJLSillEcPOAfMR5Ghq2O4PHtybIDL/eklnYA DF2U8L4MgsQZXGMSIkEp5vDbZ3pYaXstHuEvE5hLxVDxgX0kN9TZJ5SHb8xq8yz+NBKQ 7R1AcLl/yL+TyXfoysNGO/6Qs6wJ/ifdH9JWIP4F+y6qydTG80E7qnr0KPYlYe4IldOQ Uo5d1TTyyNi+snlb4+zA6Gh2FDUPSmZxBVeiyN40Oilh/BKx96xEa7yz17cENm11xkO/ 2U2X/OvgkoorBwZVB2TSxUxNRu5TGfneVCLAIN7i7yemB04L7BfreGNMoWKEQ/Usb6Z9 k3fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xum5K7O0kdwK/5dO1nT0TEJRMceHIsBEzBbf9ZLS3w4=; b=v4SOwuw9lP3h1SqHvn3p//dF1a5ygIJsRMYQT9BZM4aoSUfUP7vDYIyKRRQ4vQMoxL tJiV3xueA9keAZIjp5hPNmPwBMwlclXLcga13uD7IXUtATlOop99qV28R8F7iAtDwFcs ygBPLBVS4wcgB+nrIehnE+GJL0CRtWxtD2IJsyTM6YBkWejfiGCDnINNrnROyvDcX2Yi HavZGl8uiQk0kgFoekhfLisJ5ALGCOB6aQM7cGDr8rk+UDYHAER4UBSuzFTvt/uIPipS 9Igm6aZlGm2LoM9sDAPrIZ7nyqBmd2X6wzurIHFYZaQ+y4sqNE8zForgUxYZ27tiQzfn CXPQ== X-Gm-Message-State: ACrzQf1k/1Yrq+QPU8glpuRl3skzuD8pweLPZPiZTTjJGQ6iR3WPu70A R9gHu4WlcsXYE/F3ZaoFE0687GxOfAACCw== X-Google-Smtp-Source: AMsMyM5cXqlCTeJjp4uErOHy5lOh+M/W6Vu0p9bIAjg+FdHBd0DHyJ0v531j/5bDSbw93G85ERnkeQ== X-Received: by 2002:adf:f9cf:0:b0:236:6a26:c055 with SMTP id w15-20020adff9cf000000b002366a26c055mr18092206wrr.195.1667467708068; Thu, 03 Nov 2022 02:28:28 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id h1-20020a05600c350100b003c6c182bef9sm5244069wmq.36.2022.11.03.02.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:28:27 -0700 (PDT) From: luca.boccassi@gmail.com To: Bhagyada Modali Cc: Chandubabu Namburu , dpdk stable Subject: patch 'net/axgbe: fix checksum and RSS in scattered Rx' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:26:27 +0000 Message-Id: <20221103092758.1099402-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 20.11.7 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/05/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/437187fe7cba7b75057b8eb3e349b011c46904a0 Thanks. Luca Boccassi --- >From 437187fe7cba7b75057b8eb3e349b011c46904a0 Mon Sep 17 00:00:00 2001 From: Bhagyada Modali Date: Fri, 2 Sep 2022 04:47:54 -0400 Subject: [PATCH] net/axgbe: fix checksum and RSS in scattered Rx [ upstream commit 970d2e22ca48581dcb8ee467a3521e9a22fbf8f4 ] Updated the RSS hash and CSUM checks with first_seg instead of mbufs. Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Signed-off-by: Bhagyada Modali Acked-by: Chandubabu Namburu --- drivers/net/axgbe/axgbe_rxtx.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index b498f94ae2..6696f49a1e 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -407,7 +407,8 @@ next_desc: /* Get the RSS hash */ if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, RSV)) - mbuf->hash.rss = rte_le_to_cpu_32(desc->write.desc1); + first_seg->hash.rss = + rte_le_to_cpu_32(desc->write.desc1); err_set: rxq->cur++; @@ -429,18 +430,24 @@ err_set: first_seg->port = rxq->port_id; if (rxq->pdata->rx_csum_enable) { - mbuf->ol_flags = 0; - mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD; - mbuf->ol_flags |= PKT_RX_L4_CKSUM_GOOD; + first_seg->ol_flags = 0; + first_seg->ol_flags |= PKT_RX_IP_CKSUM_GOOD; + first_seg->ol_flags |= PKT_RX_L4_CKSUM_GOOD; if (unlikely(error_status == AXGBE_L3_CSUM_ERR)) { - mbuf->ol_flags &= ~PKT_RX_IP_CKSUM_GOOD; - mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD; - mbuf->ol_flags &= ~PKT_RX_L4_CKSUM_GOOD; - mbuf->ol_flags |= PKT_RX_L4_CKSUM_UNKNOWN; + first_seg->ol_flags &= + ~PKT_RX_IP_CKSUM_GOOD; + first_seg->ol_flags |= + PKT_RX_IP_CKSUM_BAD; + first_seg->ol_flags &= + ~PKT_RX_L4_CKSUM_GOOD; + first_seg->ol_flags |= + PKT_RX_L4_CKSUM_UNKNOWN; } else if (unlikely(error_status == AXGBE_L4_CSUM_ERR)) { - mbuf->ol_flags &= ~PKT_RX_L4_CKSUM_GOOD; - mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD; + first_seg->ol_flags &= + ~PKT_RX_L4_CKSUM_GOOD; + first_seg->ol_flags |= + PKT_RX_L4_CKSUM_BAD; } } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:26.051985842 +0000 +++ 0009-net-axgbe-fix-checksum-and-RSS-in-scattered-Rx.patch 2022-11-03 09:27:25.309421202 +0000 @@ -1 +1 @@ -From 970d2e22ca48581dcb8ee467a3521e9a22fbf8f4 Mon Sep 17 00:00:00 2001 +From 437187fe7cba7b75057b8eb3e349b011c46904a0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 970d2e22ca48581dcb8ee467a3521e9a22fbf8f4 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -14,2 +15,2 @@ - drivers/net/axgbe/axgbe_rxtx.c | 41 +++++++++++++++++++++------------- - 1 file changed, 25 insertions(+), 16 deletions(-) + drivers/net/axgbe/axgbe_rxtx.c | 27 +++++++++++++++++---------- + 1 file changed, 17 insertions(+), 10 deletions(-) @@ -18 +19 @@ -index 7c07fd90ef..2bad638f79 100644 +index b498f94ae2..6696f49a1e 100644 @@ -21 +22 @@ -@@ -427,24 +427,27 @@ next_desc: +@@ -407,7 +407,8 @@ next_desc: @@ -28,27 +28,0 @@ - etlt = AXGMAC_GET_BITS_LE(desc->write.desc3, - RX_NORMAL_DESC3, ETLT); - offloads = rxq->pdata->eth_dev->data->dev_conf.rxmode.offloads; - if (!err || !etlt) { - if (etlt == RX_CVLAN_TAG_PRESENT) { -- mbuf->ol_flags |= RTE_MBUF_F_RX_VLAN; -- mbuf->vlan_tci = -+ first_seg->ol_flags |= RTE_MBUF_F_RX_VLAN; -+ first_seg->vlan_tci = - AXGMAC_GET_BITS_LE(desc->write.desc0, - RX_NORMAL_DESC0, OVT); - if (offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) -- mbuf->ol_flags |= RTE_MBUF_F_RX_VLAN_STRIPPED; -+ first_seg->ol_flags |= -+ RTE_MBUF_F_RX_VLAN_STRIPPED; - else -- mbuf->ol_flags &= ~RTE_MBUF_F_RX_VLAN_STRIPPED; -+ first_seg->ol_flags &= -+ ~RTE_MBUF_F_RX_VLAN_STRIPPED; - } else { -- mbuf->ol_flags &= -+ first_seg->ol_flags &= - ~(RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED); -- mbuf->vlan_tci = 0; -+ first_seg->vlan_tci = 0; - } - } @@ -56 +30,3 @@ -@@ -468,18 +471,24 @@ err_set: + err_set: + rxq->cur++; +@@ -429,18 +430,24 @@ err_set: @@ -61,2 +37,2 @@ -- mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD; -- mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD; +- mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD; +- mbuf->ol_flags |= PKT_RX_L4_CKSUM_GOOD; @@ -64,2 +40,2 @@ -+ first_seg->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD; -+ first_seg->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD; ++ first_seg->ol_flags |= PKT_RX_IP_CKSUM_GOOD; ++ first_seg->ol_flags |= PKT_RX_L4_CKSUM_GOOD; @@ -67,4 +43,4 @@ -- mbuf->ol_flags &= ~RTE_MBUF_F_RX_IP_CKSUM_GOOD; -- mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD; -- mbuf->ol_flags &= ~RTE_MBUF_F_RX_L4_CKSUM_GOOD; -- mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN; +- mbuf->ol_flags &= ~PKT_RX_IP_CKSUM_GOOD; +- mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD; +- mbuf->ol_flags &= ~PKT_RX_L4_CKSUM_GOOD; +- mbuf->ol_flags |= PKT_RX_L4_CKSUM_UNKNOWN; @@ -72 +48 @@ -+ ~RTE_MBUF_F_RX_IP_CKSUM_GOOD; ++ ~PKT_RX_IP_CKSUM_GOOD; @@ -74 +50 @@ -+ RTE_MBUF_F_RX_IP_CKSUM_BAD; ++ PKT_RX_IP_CKSUM_BAD; @@ -76 +52 @@ -+ ~RTE_MBUF_F_RX_L4_CKSUM_GOOD; ++ ~PKT_RX_L4_CKSUM_GOOD; @@ -78 +54 @@ -+ RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN; ++ PKT_RX_L4_CKSUM_UNKNOWN; @@ -81,2 +57,2 @@ -- mbuf->ol_flags &= ~RTE_MBUF_F_RX_L4_CKSUM_GOOD; -- mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_BAD; +- mbuf->ol_flags &= ~PKT_RX_L4_CKSUM_GOOD; +- mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD; @@ -84 +60 @@ -+ ~RTE_MBUF_F_RX_L4_CKSUM_GOOD; ++ ~PKT_RX_L4_CKSUM_GOOD; @@ -86 +62 @@ -+ RTE_MBUF_F_RX_L4_CKSUM_BAD; ++ PKT_RX_L4_CKSUM_BAD;