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 A2F2C1B10D for ; Wed, 21 Nov 2018 17:51:05 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0CC8681F13; Wed, 21 Nov 2018 16:51:05 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA9B35C21E; Wed, 21 Nov 2018 16:51:03 +0000 (UTC) From: Kevin Traynor To: Ivan Malov Cc: Andrew Rybchenko , dpdk stable Date: Wed, 21 Nov 2018 16:48:19 +0000 Message-Id: <20181121164828.32249-65-ktraynor@redhat.com> In-Reply-To: <20181121164828.32249-1-ktraynor@redhat.com> References: <20181121164828.32249-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 21 Nov 2018 16:51:05 +0000 (UTC) Subject: [dpdk-stable] patch 'net/sfc: do not skip RSS configuration step on reconfigure' 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: Wed, 21 Nov 2018 16:51:06 -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/27/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 102a51be1eb07480c5629654bc7560ffebaeafc4 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Thu, 11 Oct 2018 15:49:30 +0100 Subject: [PATCH] net/sfc: do not skip RSS configuration step on reconfigure [ upstream commit 5205c436a33e060d06f7f230e051b94be31d6d91 ] Earlier a patch was made to support change of Rx queue number. That patch added goto label in wrong place because reconfiguration with the same number of queues results in skipping not only queue init but also RSS settings. If a user configures device with RSS multiqueue mode and then wants to stop it and reconfigure without RSS, this change will be ignored and RSS will continue working. Move the label in the right place and rename it to describe it. Fixes: 55a539003f1a ("net/sfc: support changing the number of receive queues") Signed-off-by: Ivan Malov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc_rx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c index 311b8d9df..f92eacacb 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -1513,5 +1513,5 @@ sfc_rx_configure(struct sfc_adapter *sa) if (nb_rx_queues == sa->rxq_count) - goto done; + goto configure_rss; if (sa->rxq_info == NULL) { @@ -1550,4 +1550,5 @@ sfc_rx_configure(struct sfc_adapter *sa) } +configure_rss: rss->channels = (dev_conf->rxmode.mq_mode == ETH_MQ_RX_RSS) ? MIN(sa->rxq_count, EFX_MAXRSS) : 0; @@ -1566,5 +1567,4 @@ sfc_rx_configure(struct sfc_adapter *sa) } -done: return 0; -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-21 16:44:32.719325517 +0000 +++ 0065-net-sfc-do-not-skip-RSS-configuration-step-on-reconf.patch 2018-11-21 16:44:30.000000000 +0000 @@ -1,8 +1,10 @@ -From 5205c436a33e060d06f7f230e051b94be31d6d91 Mon Sep 17 00:00:00 2001 +From 102a51be1eb07480c5629654bc7560ffebaeafc4 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Thu, 11 Oct 2018 15:49:30 +0100 Subject: [PATCH] net/sfc: do not skip RSS configuration step on reconfigure +[ upstream commit 5205c436a33e060d06f7f230e051b94be31d6d91 ] + Earlier a patch was made to support change of Rx queue number. That patch added goto label in wrong place because reconfiguration with the same number of queues @@ -14,7 +16,6 @@ Move the label in the right place and rename it to describe it. Fixes: 55a539003f1a ("net/sfc: support changing the number of receive queues") -Cc: stable@dpdk.org Signed-off-by: Ivan Malov Signed-off-by: Andrew Rybchenko @@ -23,23 +24,23 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c -index 000cd0b20..553576485 100644 +index 311b8d9df..f92eacacb 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c -@@ -1505,5 +1505,5 @@ sfc_rx_configure(struct sfc_adapter *sa) +@@ -1513,5 +1513,5 @@ sfc_rx_configure(struct sfc_adapter *sa) if (nb_rx_queues == sa->rxq_count) - goto done; + goto configure_rss; if (sa->rxq_info == NULL) { -@@ -1542,4 +1542,5 @@ sfc_rx_configure(struct sfc_adapter *sa) +@@ -1550,4 +1550,5 @@ sfc_rx_configure(struct sfc_adapter *sa) } +configure_rss: rss->channels = (dev_conf->rxmode.mq_mode == ETH_MQ_RX_RSS) ? MIN(sa->rxq_count, EFX_MAXRSS) : 0; -@@ -1558,5 +1559,4 @@ sfc_rx_configure(struct sfc_adapter *sa) +@@ -1566,5 +1567,4 @@ sfc_rx_configure(struct sfc_adapter *sa) } -done: