From patchwork Tue Aug 3 13:05:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 12416325 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3FE9C432BE for ; Tue, 3 Aug 2021 13:05:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 96F0C60F8F for ; Tue, 3 Aug 2021 13:05:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236039AbhHCNFs (ORCPT ); Tue, 3 Aug 2021 09:05:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:60106 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235909AbhHCNFr (ORCPT ); Tue, 3 Aug 2021 09:05:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 00EAC60FA0; Tue, 3 Aug 2021 13:05:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627995936; bh=/E40Y8jFSgY4NLV4RFGk9JQAcxFQfFEv8b1C1XDaMfk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rj7TJatxeMNsNGeC6MKMTpBl2/yAPXmvid8ON6HCh9O3E0KpFH3Q+l1kl620MtBVo LE8FsqebSEK9IwIeOTgZAiDx0FGxmzKQbY6bh99VrWz4V9Eh79Y2laOUJnmZPNfpNa 1UhuZBf06U8VFcmzEgIj3eEBtooPuoG3I+xOM/2iLWM/lEgczJj5VBgFtz6DYkN9Ny +Rr5fDaByB/WOMOvE4OeH7ep91PKR834ZvFQ/GWx1qc4itGBpUUu6BVohNQT9Jv940 2JHT9r6skdFxGCsdvqM03VzeX6Yb8w95UB3VLtN56jNrFdLL31VPguBoriEI8wXu5L 8fEH+RrzFJkfA== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, simon.horman@corigine.com, alexanderduyck@fb.com, oss-drivers@corigine.com, Jakub Kicinski Subject: [PATCH net-next 1/2] net: add netif_set_real_num_queues() for device reconfig Date: Tue, 3 Aug 2021 06:05:26 -0700 Message-Id: <20210803130527.2411250-2-kuba@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210803130527.2411250-1-kuba@kernel.org> References: <20210803130527.2411250-1-kuba@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org netif_set_real_num_rx_queues() and netif_set_real_num_tx_queues() can fail which breaks drivers trying to implement reconfiguration in a way that can't leave the device half-broken. In other words those functions are incompatible with prepare/commit approach. Luckily setting real number of queues can fail only if the number is increased, meaning that if we order operations correctly we can guarantee ending up with either new config (success), or the old one (on error). Provide a helper implementing such logic so that drivers don't have to duplicate it. Signed-off-by: Jakub Kicinski --- include/linux/netdevice.h | 2 ++ net/core/dev.c | 44 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index cd136499ec59..1b4d4509d04b 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3916,6 +3916,8 @@ static inline int netif_set_real_num_rx_queues(struct net_device *dev, return 0; } #endif +int netif_set_real_num_queues(struct net_device *dev, + unsigned int txq, unsigned int rxq); static inline struct netdev_rx_queue * __netif_get_rx_queue(struct net_device *dev, unsigned int rxq) diff --git a/net/core/dev.c b/net/core/dev.c index 4a1401008db9..360cb2f1b1e9 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2973,6 +2973,50 @@ int netif_set_real_num_rx_queues(struct net_device *dev, unsigned int rxq) EXPORT_SYMBOL(netif_set_real_num_rx_queues); #endif +/** + * netif_set_real_num_queues - set actual number of RX and TX queues used + * @dev: Network device + * @txq: Actual number of TX queues + * @rxq: Actual number of RX queues + * + * Set the real number of both TX and RX queues. + * Does nothing if the number of queues is already correct. + */ +int netif_set_real_num_queues(struct net_device *dev, + unsigned int txq, unsigned int rxq) +{ + unsigned int old_rxq = dev->real_num_rx_queues; + int err; + + if (txq < 1 || txq > dev->num_tx_queues || + rxq < 1 || rxq > dev->num_rx_queues) + return -EINVAL; + + /* Start from increases, so the error path only does decreases - + * decreases can't fail. + */ + if (rxq > dev->real_num_rx_queues) { + err = netif_set_real_num_rx_queues(dev, rxq); + if (err) + return err; + } + if (txq > dev->real_num_tx_queues) { + err = netif_set_real_num_tx_queues(dev, txq); + if (err) + goto undo_rx; + } + if (rxq < dev->real_num_rx_queues) + WARN_ON(netif_set_real_num_rx_queues(dev, rxq)); + if (txq < dev->real_num_tx_queues) + WARN_ON(netif_set_real_num_tx_queues(dev, txq)); + + return 0; +undo_rx: + WARN_ON(netif_set_real_num_rx_queues(dev, old_rxq)); + return err; +} +EXPORT_SYMBOL(netif_set_real_num_queues); + /** * netif_get_num_default_rss_queues - default number of RSS queues * From patchwork Tue Aug 3 13:05:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 12416327 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9A0DCC4338F for ; Tue, 3 Aug 2021 13:05:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B23560F8F for ; Tue, 3 Aug 2021 13:05:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236075AbhHCNFv (ORCPT ); Tue, 3 Aug 2021 09:05:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:60110 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235975AbhHCNFr (ORCPT ); Tue, 3 Aug 2021 09:05:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5A3A560FC2; Tue, 3 Aug 2021 13:05:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627995936; bh=NGAJNeM/mqhj9ZJSxeWUnRZrs6SfmuBgq/fZ6D0LlVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M7ybBoYngYmPWl5Nsbe/aBDY8tQfrUOxhA8BZ4KBHyxWbBIIm0k7kPD7QngkGRlh7 WyZDSf7yaglGvcNqoM+iwlcBPkn2N3dz3EjoHLkzQ4mcMQIDPEetAJ6cATT0Et3Fnt zhvnSj9t5HwCye7O+f1ZgZdNHCjx1lN4tvy/EU4fWvRTSjK5GQVZ+SnIkAWn/buMbH U4E5cVWfj/98wSOqMnXbzJ08VNjtsvSNac0NKOuDLqlZ2sdxEXTGuYhPhSXAbfwlMZ xfq1no4oEbzCQnHrHPYYXe8vousi70ItCXwjzvA0cVBWEO0QDKZDa/7lVVVrZUbRyf r+IOWR5YLFeEQ== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, simon.horman@corigine.com, alexanderduyck@fb.com, oss-drivers@corigine.com, Jakub Kicinski Subject: [PATCH net-next 2/2] nfp: use netif_set_real_num_queues() Date: Tue, 3 Aug 2021 06:05:27 -0700 Message-Id: <20210803130527.2411250-3-kuba@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210803130527.2411250-1-kuba@kernel.org> References: <20210803130527.2411250-1-kuba@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Avoid reconfig problems due to failures in netif_set_real_num_tx_queues() by using netif_set_real_num_queues(). Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 15078f9dc9f1..5bfa22accf2c 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -3281,17 +3281,12 @@ static int nfp_net_dp_swap_enable(struct nfp_net *nn, struct nfp_net_dp *dp) for (r = 0; r < nn->max_r_vecs; r++) nfp_net_vector_assign_rings(&nn->dp, &nn->r_vecs[r], r); - err = netif_set_real_num_rx_queues(nn->dp.netdev, nn->dp.num_rx_rings); + err = netif_set_real_num_queues(nn->dp.netdev, + nn->dp.num_stack_tx_rings, + nn->dp.num_rx_rings); if (err) return err; - if (nn->dp.netdev->real_num_tx_queues != nn->dp.num_stack_tx_rings) { - err = netif_set_real_num_tx_queues(nn->dp.netdev, - nn->dp.num_stack_tx_rings); - if (err) - return err; - } - return nfp_net_set_config_and_enable(nn); }