From patchwork Thu Oct 11 14:49:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 46635 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BC54A1B574; Thu, 11 Oct 2018 16:50:21 +0200 (CEST) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 182061B547; Thu, 11 Oct 2018 16:50:21 +0200 (CEST) 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-us4.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTPS id 43F654C0071; Thu, 11 Oct 2018 14:50:19 +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; Thu, 11 Oct 2018 07:49:39 -0700 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; Thu, 11 Oct 2018 07:49:39 -0700 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 w9BEnbQ3016480; Thu, 11 Oct 2018 15:49:37 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 88FDF1616EF; Thu, 11 Oct 2018 15:49:37 +0100 (BST) From: Andrew Rybchenko To: CC: Ivan Malov , Date: Thu, 11 Oct 2018 15:49:30 +0100 Message-ID: <1539269370-19132-1-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.5.1010-24148.005 X-TM-AS-Result: No-0.623200-4.000000-10 X-TMASE-MatchedRID: jwcsoUSVK5s2jeY+Udg/Ip7tR0mnRAg1pfVcx39Kq+4A6s2mIXI3kMpd +EI8aHfVBlJlASoPYUlHYMJ3qKXsGM9tfSEZlKTRHPYwOJi6PLnVy4hHC3/gyNilG/maIsZ8gK6 qCGa1Z9elJdMF+vT5Bj92Syca4aYVavi5Lq9+Ha3hG1IOMb7PsJYcYQ11P5U/JLfQYoCQHFZiFL a4NLzxYeLzNWBegCW2wgn7iDBesS1YF3qW3Je6+3DvHO8GQfDGCAK5OWwbikNULrvjBeAyzGvGp CWAXakaGOw7geYLy1DDu3H768vqvPpkLqVka5OKADIuPOjkKhAbXyVpo9EcS71NuKS30BZnQIFI ZLtsgG0DUH+nVLNyiCsqIP9TxvtJo1s8kG68tot+3BndfXUhXQ== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10-0.623200-4.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1010-24148.005 X-MDID: 1539269420-EZaB6YgQsxXq Subject: [dpdk-dev] [PATCH] net/sfc: don't skip RSS configuration step on reconfigure X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Ivan Malov 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") Cc: stable@dpdk.org 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 000cd0b20..553576485 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -1504,7 +1504,7 @@ sfc_rx_configure(struct sfc_adapter *sa) goto fail_check_mode; if (nb_rx_queues == sa->rxq_count) - goto done; + goto configure_rss; if (sa->rxq_info == NULL) { rc = ENOMEM; @@ -1541,6 +1541,7 @@ sfc_rx_configure(struct sfc_adapter *sa) sa->rxq_count++; } +configure_rss: rss->channels = (dev_conf->rxmode.mq_mode == ETH_MQ_RX_RSS) ? MIN(sa->rxq_count, EFX_MAXRSS) : 0; @@ -1557,7 +1558,6 @@ sfc_rx_configure(struct sfc_adapter *sa) goto fail_rx_process_adv_conf_rss; } -done: return 0; fail_rx_process_adv_conf_rss: