From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1A7764F30C1; Fri, 16 Oct 2026 15:39:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792165146; cv=none; b=kvxjW51jUqE76ZADkF9oxnvT6t9lW43EX0Wy0LFdXFYDPN4AVMP99yjkMkRJSvMVttUxY9yWSXM6T3uRzaAKbkIQgtJYrKy7bfIjDiu2hvbj/Ip616mJJ8XKBjAdhiK7SJevtYI85LBz7/rHm/ymCkTC1aO9bdvbGE2ZNtMa6p0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792165146; c=relaxed/simple; bh=6yi6NqAKXKPdWZGBDw3Vtr7tV0+5l8kPamoGzXDwS4Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uIDMRTKzSTcitSnIj3OY52GqxuVPlJDUN/ZOEKkMwEnTxNpi8oaU3Gh5GyaRU+VCTaIgHx85VhyJnz+D0HRAunRCUfbGCFzvVnpRxaYBEe6ZvwDMwpQ9lOlgvmhBkqOViq8Y748f4IYXacVEjqnrFgeZxEjh9WutXcw9H02vYEI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=SPymus64; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="SPymus64" Received: from weh-cvm-dev-vm.y50bckvjo0hefgfnzfztsfttff.phxx.internal.cloudapp.net (unknown [20.169.55.37]) by linux.microsoft.com (Postfix) with ESMTPSA id 7099120B7170; Fri, 16 Oct 2026 08:38:58 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 7099120B7170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1792165139; bh=x3O2amA4TtQzjIhlDkOW8GwsNReipWbShUwj07Gc7EA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SPymus64H6pFSQlFaTM35BR3/WR25NQ9Mvf4fcRkq3HHlbtbeJMJtv44YCPINtIZM e1AWE/RNGQMCvCE9fWZ54TjdpA+KA4zSyCLUdeVr5pRidf0YRvixugIWW8Wcl9G6CO PXGnR6YUwROv6J5rCvpSNvhhnBit9NMJZq09It1Y= From: Wei Hu To: longli@kernel.org, kotaranov@microsoft.com, kuba@kernel.org, davem@davemloft.net, pabeni@redhat.com, edumazet@google.com, andrew+netdev@lunn.ch, jgg@ziepe.ca, leon@kernel.org, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, shradhagupta@linux.microsoft.com, horms@kernel.org, ernis@linux.microsoft.com, stephen@networkplumber.org Cc: netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, sdf@fomichev.me, daniel@iogearbox.net, hawk@kernel.org, ast@kernel.org, john.fastabend@gmail.com, weh@microsoft.com, edumazet@kernel.org Subject: [PATCH net-next v7 06/13] net: mana: swap queue sets in mana_set_priv_flags Date: Fri, 16 Oct 2026 15:38:39 +0000 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Long Li Rebuild queues through the swap path when USE_FULL_PAGE_RXBUF changes the RX layout. Carry priv_flags with the queue set so allocation failure leaves the live configuration unchanged and rollback restores the flags. Retain shortcuts for an unchanged RX buffer flag, a down port, or a configuration whose MTU or XDP already requires full-page RX. A failed rollback closes the port. This full rebuild temporarily keeps both sets of SQ/RQ/CQ objects, RX buffers and page pools live. The port-owned EQ pool is shared, not doubled. Device resource limits may reject this temporary peak; allocation failure preserves the live queues and configuration. Signed-off-by: Long Li Signed-off-by: Wei Hu --- .../ethernet/microsoft/mana/mana_ethtool.c | 73 +++++++++---------- 1 file changed, 35 insertions(+), 38 deletions(-) diff --git a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c index a643a8cc81e0..9c7c9879d0aa 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_ethtool.c +++ b/drivers/net/ethernet/microsoft/mana/mana_ethtool.c @@ -881,7 +881,8 @@ static int mana_set_priv_flags(struct net_device *ndev, u32 priv_flags) { struct mana_port_context *apc = netdev_priv(ndev); u32 changed = apc->priv_flags ^ priv_flags; - u32 old_priv_flags = apc->priv_flags; + struct mana_port_context *scratch; + struct mana_qset newq, oldq; int err = 0; if (!changed) @@ -891,54 +892,50 @@ static int mana_set_priv_flags(struct net_device *ndev, u32 priv_flags) if (priv_flags & ~GENMASK(MANA_PRIV_FLAG_MAX - 1, 0)) return -EINVAL; - apc->priv_flags = priv_flags; - - if (changed & BIT(MANA_PRIV_FLAG_USE_FULL_PAGE_RXBUF)) { - if (!apc->port_is_up) - return 0; - - /* If XDP is attached or the MTU already forces one buffer per - * page, single-buffer-per-page is used regardless of this - * flag. Skip the expensive detach/attach cycle since nothing - * changes. - */ - if (mana_single_rxbuf_per_page_forced(apc, ndev->mtu)) - return 0; + /* No rebuild is needed if the RX buffer flag is unchanged, the port is + * down, or full-page RX buffers are already required by MTU or XDP. + */ + if (!(changed & BIT(MANA_PRIV_FLAG_USE_FULL_PAGE_RXBUF)) || + !apc->port_is_up || + mana_single_rxbuf_per_page_forced(apc, ndev->mtu)) { + apc->priv_flags = priv_flags; + return 0; + } - /* Block RDMA from grabbing the vport during detach/attach */ - mutex_lock(&apc->vport_mutex); - apc->channel_changing = true; + mutex_lock(&apc->vport_mutex); + if (apc->channel_changing) { mutex_unlock(&apc->vport_mutex); + return -EBUSY; + } + apc->channel_changing = true; + mutex_unlock(&apc->vport_mutex); - err = mana_pre_alloc_rxbufs(apc, ndev->mtu, apc->num_queues); - if (err) { - netdev_err(ndev, - "Insufficient memory for new allocations\n"); - apc->priv_flags = old_priv_flags; - goto clear_flag; - } + scratch = mana_qset_scratch_alloc(apc); + if (!scratch) { + err = -ENOMEM; + goto clear_flag; + } - err = mana_detach(ndev, false); - if (err) { - netdev_err(ndev, "mana_detach failed: %d\n", err); - apc->priv_flags = old_priv_flags; - goto out; - } + err = mana_alloc_qset(apc, scratch, apc->num_queues, apc->rx_queue_size, + apc->tx_queue_size, priv_flags, &newq); + if (err) + goto free_scratch; - err = mana_attach(ndev); - if (err) { - netdev_err(ndev, "mana_attach failed: %d\n", err); - apc->priv_flags = old_priv_flags; - } + err = mana_publish_qset(apc, &newq, &oldq); + if (err) { + mana_free_qset(scratch, &newq); + goto free_scratch; } -out: - mana_pre_dealloc_rxbufs(apc); + mana_free_qset(scratch, &oldq); + +free_scratch: + mana_publish_close_if_needed(apc); + mana_qset_scratch_free(scratch); clear_flag: mutex_lock(&apc->vport_mutex); apc->channel_changing = false; mutex_unlock(&apc->vport_mutex); - return err; } -- 2.43.0