From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id B8E401B14D for ; Mon, 10 Dec 2018 16:11:21 +0100 (CET) X-Virus-Scanned: Proofpoint Essentials engine Received: from webmail.solarflare.com (webmail.solarflare.com [12.187.104.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us1.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTPS id 3403010009E; Mon, 10 Dec 2018 15:11:20 +0000 (UTC) Received: from ocex03.SolarFlarecom.com (10.20.40.36) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 10 Dec 2018 07:11:17 -0800 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1395.4 via Frontend Transport; Mon, 10 Dec 2018 07:11:17 -0800 Received: from ukv-loginhost.uk.solarflarecom.com (ukv-loginhost.uk.solarflarecom.com [10.17.10.39]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id wBAFBFJl014762; Mon, 10 Dec 2018 15:11:15 GMT Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id C9FA01616F0; Mon, 10 Dec 2018 15:11:15 +0000 (GMT) From: Andrew Rybchenko To: CC: Ivan Malov Date: Mon, 10 Dec 2018 15:10:54 +0000 Message-ID: <1544454656-5339-4-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1544454656-5339-1-git-send-email-arybchenko@solarflare.com> References: <1544454656-5339-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.5.1010-24274.006 X-TM-AS-Result: No-0.075100-4.000000-10 X-TMASE-MatchedRID: jwcsoUSVK5s2jeY+Udg/Ip7tR0mnRAg1pfVcx39Kq+4A6s2mIXI3kMpd +EI8aHfVBlJlASoPYUlHYMJ3qKXsGM9tfSEZlKTRHPYwOJi6PLnVy4hHC3/gyNilG/maIsZ8dyG 0kjowQuOqpZpyS5HAaO1cajDGSKHUrbh5lywtukPJ5W6OZe5hhX607foZgOWyOu8B7pM3AuViFL a4NLzxYeLzNWBegCW2wgn7iDBesS0nRE+fI6etkiIfpHOMPc3gX67TZ1C0Dknxe4aahfYIxyS1G mYq4p+geW8SuG52Hj75mHPffeSGzeyC7XzmNvZVAkEi7tQRvN2BfYjUd9ZXSr1NuKS30BZnQIFI ZLtsgG0DUH+nVLNyiCsqIP9TxvtJMb6p570ilnc= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--0.075100-4.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1010-24274.006 X-MDID: 1544454680-WT-lGo6b_kNr Subject: [dpdk-stable] [PATCH 17.11 4/6] net/sfc: do not skip RSS configuration step on reconfigure 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: Mon, 10 Dec 2018 15:11:22 -0000 From: Ivan Malov [ backported from 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 4497d5f..238aa5e 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -1341,7 +1341,7 @@ struct sfc_dp_rx sfc_efx_rx = { goto fail_check_mode; if (nb_rx_queues == sa->rxq_count) - goto done; + goto configure_rss; if (sa->rxq_info == NULL) { rc = ENOMEM; @@ -1378,6 +1378,7 @@ struct sfc_dp_rx sfc_efx_rx = { sa->rxq_count++; } +configure_rss: #if EFSYS_OPT_RX_SCALE sa->rss_channels = (dev_conf->rxmode.mq_mode == ETH_MQ_RX_RSS) ? MIN(sa->rxq_count, EFX_MAXRSS) : 0; @@ -1396,7 +1397,6 @@ struct sfc_dp_rx sfc_efx_rx = { } #endif -done: return 0; fail_rx_process_adv_conf_rss: -- 1.8.3.1