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 14506A0524 for ; Thu, 4 Feb 2021 12:35:04 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0EBBE240731; Thu, 4 Feb 2021 12:35:04 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 8CD1C24072B for ; Thu, 4 Feb 2021 12:35:03 +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 1l7cud-0005NI-Bd; Thu, 04 Feb 2021 11:35:03 +0000 From: Christian Ehrhardt To: Alvin Zhang Cc: Wei Xie , Qi Zhang , dpdk stable Date: Thu, 4 Feb 2021 12:28:13 +0100 Message-Id: <20210204112954.2488123-38-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/ice: fix RSS lookup table initialization' 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/f624f2e7a4c403023d9b17acff9e660ec2fdfde4 Thanks. Christian Ehrhardt --- >From f624f2e7a4c403023d9b17acff9e660ec2fdfde4 Mon Sep 17 00:00:00 2001 From: Alvin Zhang Date: Fri, 8 Jan 2021 15:29:10 +0800 Subject: [PATCH] net/ice: fix RSS lookup table initialization [ upstream commit 7fe2fde05ac8766afaed4344659e39e8fc6b2514 ] RSS look-up table initialization is done incorrectly due to divide-by-zero error. Add a check to rx-queue count. Fixes: 50370662b727 ("net/ice: support device and queue ops") Signed-off-by: Alvin Zhang Tested-by: Wei Xie Acked-by: Qi Zhang --- drivers/net/ice/ice_ethdev.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 833a3ceac3..6723a21a7a 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -2612,10 +2612,12 @@ ice_dev_configure(struct rte_eth_dev *dev) if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH; - ret = ice_init_rss(pf); - if (ret) { - PMD_DRV_LOG(ERR, "Failed to enable rss for PF"); - return ret; + if (dev->data->nb_rx_queues) { + ret = ice_init_rss(pf); + if (ret) { + PMD_DRV_LOG(ERR, "Failed to enable rss for PF"); + return ret; + } } return 0; -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:29.709710734 +0100 +++ 0038-net-ice-fix-RSS-lookup-table-initialization.patch 2021-02-04 12:04:27.950789652 +0100 @@ -1 +1 @@ -From 7fe2fde05ac8766afaed4344659e39e8fc6b2514 Mon Sep 17 00:00:00 2001 +From f624f2e7a4c403023d9b17acff9e660ec2fdfde4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7fe2fde05ac8766afaed4344659e39e8fc6b2514 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 587f485ee3..e2799a8eb2 100644 +index 833a3ceac3..6723a21a7a 100644 @@ -24 +25 @@ -@@ -3274,10 +3274,12 @@ ice_dev_configure(struct rte_eth_dev *dev) +@@ -2612,10 +2612,12 @@ ice_dev_configure(struct rte_eth_dev *dev)