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 20925A0524 for ; Thu, 4 Feb 2021 12:37:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B521240784; Thu, 4 Feb 2021 12:37:47 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 8183E240757 for ; Thu, 4 Feb 2021 12:37:46 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cxG-0005gl-Ac; Thu, 04 Feb 2021 11:37:46 +0000 From: Christian Ehrhardt To: Dapeng Yu Cc: Jeff Guo , dpdk stable Date: Thu, 4 Feb 2021 12:29:25 +0100 Message-Id: <20210204112954.2488123-110-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe: disable NFS filtering' has been queued to stable release 19.11.7 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 02/06/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/79680bf831327270a301e518c895799f27dbf81b Thanks. Christian Ehrhardt --- >From 79680bf831327270a301e518c895799f27dbf81b Mon Sep 17 00:00:00 2001 From: Dapeng Yu Date: Tue, 26 Jan 2021 11:03:08 +0800 Subject: [PATCH] net/ixgbe: disable NFS filtering [ upstream commit 68643843e79d2df54e8a6c148a29fd314a5e7897 ] Disable NFS header filtering whether NFS packets coalescing are required or not, in order to make RSS can work on NFS packets. The code without the patch does follow datasheet, but not consistent with the ixgbe kernel driver. It causes NFS packets to be filtered and make them flow into queue 0, before RSS can work on them. Fixes: b826efba6de4 ("net/ixgbe: align register setting when RSC is disabled") Fixes: 8eecb3295aed ("ixgbe: add LRO support") Signed-off-by: Dapeng Yu Acked-by: Jeff Guo --- drivers/net/ixgbe/ixgbe_rxtx.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index 8c78cc0589..7777dc17f1 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -4786,15 +4786,11 @@ ixgbe_set_rsc(struct rte_eth_dev *dev) /* RFCTL configuration */ rfctl = IXGBE_READ_REG(hw, IXGBE_RFCTL); if ((rsc_capable) && (rx_conf->offloads & DEV_RX_OFFLOAD_TCP_LRO)) - /* - * Since NFS packets coalescing is not supported - clear - * RFCTL.NFSW_DIS and RFCTL.NFSR_DIS when RSC is - * enabled. - */ - rfctl &= ~(IXGBE_RFCTL_RSC_DIS | IXGBE_RFCTL_NFSW_DIS | - IXGBE_RFCTL_NFSR_DIS); + rfctl &= ~IXGBE_RFCTL_RSC_DIS; else rfctl |= IXGBE_RFCTL_RSC_DIS; + /* disable NFS filtering */ + rfctl |= IXGBE_RFCTL_NFSW_DIS | IXGBE_RFCTL_NFSR_DIS; IXGBE_WRITE_REG(hw, IXGBE_RFCTL, rfctl); /* If LRO hasn't been requested - we are done here. */ -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:32.543814708 +0100 +++ 0110-net-ixgbe-disable-NFS-filtering.patch 2021-02-04 12:04:28.138789833 +0100 @@ -1 +1 @@ -From 68643843e79d2df54e8a6c148a29fd314a5e7897 Mon Sep 17 00:00:00 2001 +From 79680bf831327270a301e518c895799f27dbf81b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 68643843e79d2df54e8a6c148a29fd314a5e7897 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 36e6ca9010..72d27f35ca 100644 +index 8c78cc0589..7777dc17f1 100644 @@ -27 +28 @@ -@@ -4923,15 +4923,11 @@ ixgbe_set_rsc(struct rte_eth_dev *dev) +@@ -4786,15 +4786,11 @@ ixgbe_set_rsc(struct rte_eth_dev *dev)