From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4E745365A13; Fri, 13 Mar 2026 07:13:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773386018; cv=none; b=huf4jvptfg/y8D7vknrnc1hNuA6M0pfnW+IcNQceoCEuXTnaN27cJZx5VF7d+IpO97Lepja+DnMxFNB2dHGICpcECUcGZ/13v8LszyvThtwgX0Xv6RjCctbupElV3W7jultZNuEO+ll3RRm3/8E6dHvd3NWeBtVUQNmnJ/8k9ls= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773386018; c=relaxed/simple; bh=SuqHY/eWdvIJyNbcJVbyDvQJ5PoyV/ve5aMlGjBvPbk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FWFLbiMI6Dt//84E1WitaZHOZ4b9c8iun0tvxNgXPaL729sUQ3d9qvyL9VEWTYdYqsU46oy7mKhiahzKStZuKE1P10WEWbXhGFduXSBbi8t5qrDkUCGqXWKFLtyZE6UwGMbvA0TblNIYsBDdu4JvFnv8Gf93Z3Ox9I/tIvaDyq0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WedrsexB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WedrsexB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43067C19424; Fri, 13 Mar 2026 07:13:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773386018; bh=SuqHY/eWdvIJyNbcJVbyDvQJ5PoyV/ve5aMlGjBvPbk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WedrsexB8L/2XhH9vRTIvC5IZPft5g2v+7GQb1IMoP3dUXkHhHRLD8yiTyYKhtqBe x4130Bfet5MbOxaMWA+K9cUQC8sXLDMfRzsjXz1KkpV18VcIL6XOskKniyVo3Vqa7m sLpdhEstBs0k/IZJsVuNrechP0c8Hdaj43QrADXCzfoxihjVTAb04yol2xnd4s2Fcj Fbr3zmkcBTUbdOwclPkhkek8R+mPTK/2nFtho5BWsNLXeNw7wtzWjy+d1WaI7592kU hYsmtVCWkIQde7OUXSKrAXUwFK5PaQmMDJJhgUtTcsbibsk04DScahODHBXNdlFFBz +yM8dXrg5PpgQ== From: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= To: Michael Chan , Pavan Chebbi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Cc: =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Willem de Bruijn , Shuah Khan , Maxime Chevallier , Andrew Lunn Subject: [PATCH net-next v4 2/3] bnxt_en: Resize RSS contexts on channel count change Date: Fri, 13 Mar 2026 08:13:14 +0100 Message-ID: <20260313071322.3489243-3-bjorn@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260313071322.3489243-1-bjorn@kernel.org> References: <20260313071322.3489243-1-bjorn@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bnxt_set_channels() rejects channel changes that alter the RSS table size when IFF_RXFH_CONFIGURED is set, because non-default context sizes were locked at creation. Replace the rejection with the new resize helpers. All validation runs before the device is closed; actual resize is deferred until after bnxt_close_nic(): 1. ethtool_rxfh_can_resize() checks context 0. 2. ethtool_rxfh_ctxs_can_resize() validates all non-default contexts. 3. After bnxt_close_nic(), ethtool_rxfh_resize() applies context 0 changes, and ethtool_rxfh_ctxs_resize() resizes non-default contexts. RSS table size only changes on P5 chips with older firmware; newer firmware always uses the largest table size. When context 0 uses defaults (!IFF_RXFH_CONFIGURED), steps 1 and 3 are skipped; the driver regenerates the table via bnxt_set_dflt_rss_indir_tbl(). Tested-by: Pavan Chebbi Reviewed-by: Michael Chan Signed-off-by: Björn Töpel --- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 36 +++++++++++++++---- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c index 48e8e3be70d3..dc3eb24c9c0b 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c @@ -942,6 +942,7 @@ static int bnxt_set_channels(struct net_device *dev, { struct bnxt *bp = netdev_priv(dev); int req_tx_rings, req_rx_rings, tcs; + u32 new_tbl_size = 0, old_tbl_size; bool sh = false; int tx_xdp = 0; int rc = 0; @@ -977,19 +978,33 @@ static int bnxt_set_channels(struct net_device *dev, tx_xdp = req_rx_rings; } - if (bnxt_get_nr_rss_ctxs(bp, req_rx_rings) != - bnxt_get_nr_rss_ctxs(bp, bp->rx_nr_rings) && - (netif_is_rxfh_configured(dev) || bp->num_rss_ctx)) { - netdev_warn(dev, "RSS table size change required, RSS table entries must be default (with no additional RSS contexts present) to proceed\n"); - return -EINVAL; - } - rc = bnxt_check_rings(bp, req_tx_rings, req_rx_rings, sh, tcs, tx_xdp); if (rc) { netdev_warn(dev, "Unable to allocate the requested rings\n"); return rc; } + /* RSS table size only changes on P5 chips with older firmware; + * newer firmware always uses the largest table size. + */ + if (bnxt_get_nr_rss_ctxs(bp, req_rx_rings) != + bnxt_get_nr_rss_ctxs(bp, bp->rx_nr_rings)) { + new_tbl_size = bnxt_get_nr_rss_ctxs(bp, req_rx_rings) * + BNXT_RSS_TABLE_ENTRIES_P5; + old_tbl_size = bnxt_get_rxfh_indir_size(dev); + + if (netif_is_rxfh_configured(dev) && + !ethtool_rxfh_can_resize(bp->rss_indir_tbl, + old_tbl_size, new_tbl_size)) { + netdev_warn(dev, "RSS table resize not possible\n"); + return -EINVAL; + } + + rc = ethtool_rxfh_ctxs_can_resize(dev, new_tbl_size); + if (rc) + return rc; + } + if (netif_running(dev)) { if (BNXT_PF(bp)) { /* TODO CHIMP_FW: Send message to all VF's @@ -999,6 +1014,13 @@ static int bnxt_set_channels(struct net_device *dev, bnxt_close_nic(bp, true, false); } + if (new_tbl_size) { + if (netif_is_rxfh_configured(dev)) + ethtool_rxfh_resize(bp->rss_indir_tbl, + old_tbl_size, new_tbl_size); + ethtool_rxfh_ctxs_resize(dev, new_tbl_size); + } + if (sh) { bp->flags |= BNXT_FLAG_SHARED_RINGS; bp->rx_nr_rings = channel->combined_count; -- 2.53.0