From: Wei Hu <weh@linux.microsoft.com>
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 09/13] net: mana: do not bail out of mana_detach on dealloc failure
Date: Fri, 16 Oct 2026 15:38:42 +0000 [thread overview]
Message-ID: <743b6f30faf788fcbf663ba6bde90fbfc51ad0e8.1791710735.git.weh@linux.microsoft.com> (raw)
In-Reply-To: <cover.1791710735.git.weh@linux.microsoft.com>
From: Dipayaan Roy <dipayanroy@linux.microsoft.com>
Remove the early return after mana_dealloc_queues() so detach continues
its device and port-context cleanup.
The return is currently unreachable: mana_dealloc_queues() only rejects
an up port, and mana_detach() clears port_is_up before calling it. This
is a robustness cleanup, not a fix for a reachable reset failure.
Make mana_detach() return void and remove the now-unreachable
error branches from reset and removal callers. Keep ndo_stop's
required integer return and the internal deallocation error log.
Signed-off-by: Dipayaan Roy <dipayanroy@linux.microsoft.com>
Signed-off-by: Long Li <longli@microsoft.com>
Signed-off-by: Wei Hu <weh@microsoft.com>
---
drivers/net/ethernet/microsoft/mana/mana_en.c | 27 ++++++-------------
include/net/mana/mana.h | 2 +-
2 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index 9e952843de14..80f16c96f16c 100644
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -114,7 +114,9 @@ static int mana_close(struct net_device *ndev)
if (!apc->port_is_up)
return 0;
- return mana_detach(ndev, true);
+ mana_detach(ndev, true);
+
+ return 0;
}
static void mana_link_state_handle(struct work_struct *w)
@@ -345,17 +347,12 @@ static void mana_per_port_queue_reset_work_handler(struct work_struct *work)
goto clear_flag;
}
- err = mana_detach(ndev, false);
- if (err) {
- netdev_err(ndev, "mana_detach failed: %d\n", err);
- goto dealloc_pre_rxbufs;
- }
+ mana_detach(ndev, false);
err = mana_attach(ndev);
if (err)
netdev_err(ndev, "mana_attach failed: %d\n", err);
-dealloc_pre_rxbufs:
mana_pre_dealloc_rxbufs(apc);
clear_flag:
mutex_lock(&apc->vport_mutex);
@@ -4542,7 +4539,7 @@ void mana_free_qset(struct mana_port_context *scratch, struct mana_qset *qset)
mana_qset_debugfs_publish(apc);
}
-int mana_detach(struct net_device *ndev, bool from_close)
+void mana_detach(struct net_device *ndev, bool from_close)
{
struct mana_port_context *apc = netdev_priv(ndev);
int err;
@@ -4553,7 +4550,7 @@ int mana_detach(struct net_device *ndev, bool from_close)
* previously). Now skip mana detach and just retry mana_attach.
*/
if (!from_close && !netif_device_present(ndev))
- return 0;
+ return;
apc->port_st_save = apc->port_is_up;
apc->port_is_up = false;
@@ -4565,18 +4562,14 @@ int mana_detach(struct net_device *ndev, bool from_close)
if (apc->port_st_save) {
err = mana_dealloc_queues(ndev);
- if (err) {
+ if (err)
netdev_err(ndev, "%s failed to deallocate queues: %d\n", __func__, err);
- return err;
- }
}
if (!from_close) {
netif_device_detach(ndev);
mana_cleanup_port_context(apc);
}
-
- return 0;
}
static int mana_probe_port(struct mana_context *ac, int port_idx,
@@ -4988,7 +4981,6 @@ void mana_remove(struct gdma_dev *gd, bool suspending)
struct mana_port_context *apc;
struct device *dev;
struct net_device *ndev;
- int err;
int i;
if (!gc || !ac)
@@ -5019,10 +5011,7 @@ void mana_remove(struct gdma_dev *gd, bool suspending)
*/
rtnl_lock();
- err = mana_detach(ndev, false);
- if (err)
- netdev_err(ndev, "Failed to detach vPort %d: %d\n",
- i, err);
+ mana_detach(ndev, false);
if (suspending) {
/* No need to unregister the ndev. */
diff --git a/include/net/mana/mana.h b/include/net/mana/mana.h
index e64aa6ae7a4d..fcb66029e51c 100644
--- a/include/net/mana/mana.h
+++ b/include/net/mana/mana.h
@@ -729,7 +729,7 @@ int mana_disable_vport_rx(struct mana_port_context *apc);
int mana_alloc_queues(struct net_device *ndev);
int mana_attach(struct net_device *ndev);
-int mana_detach(struct net_device *ndev, bool from_close);
+void mana_detach(struct net_device *ndev, bool from_close);
struct mana_port_context *
mana_qset_scratch_alloc(struct mana_port_context *apc);
--
2.43.0
next prev parent reply other threads:[~2026-10-16 15:39 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-16 15:38 [PATCH net-next v7 00/13] net: mana: reconfigure by replacing the queue set Wei Hu
2026-10-16 15:38 ` [PATCH net-next v7 01/13] net: mana: add queue-set allocation and teardown helpers Wei Hu
2026-10-16 15:38 ` [PATCH net-next v7 02/13] net: mana: share the EQ pool across a queue-set swap Wei Hu
2026-10-16 15:38 ` [PATCH net-next v7 03/13] net: mana: keep per-queue statistics in the port context Wei Hu
2026-10-16 15:38 ` [PATCH net-next v7 04/13] net: mana: swap queue sets in mana_set_channels Wei Hu
2026-10-16 15:38 ` [PATCH net-next v7 05/13] net: mana: swap queue sets in mana_set_ringparam Wei Hu
2026-10-16 15:38 ` [PATCH net-next v7 06/13] net: mana: swap queue sets in mana_set_priv_flags Wei Hu
2026-10-16 15:38 ` [PATCH net-next v7 07/13] net: mana: swap queue sets in mana_change_mtu Wei Hu
2026-10-16 15:38 ` [PATCH net-next v7 08/13] net: mana: swap queue sets in mana_xdp_set Wei Hu
2026-10-16 15:38 ` Wei Hu [this message]
2026-10-16 15:38 ` [PATCH net-next v7 10/13] net: mana: release EQs left idle by a channel-count reduction Wei Hu
2026-10-16 15:38 ` [PATCH net-next v7 11/13] net: mana: keep a user-configured RSS table across a queue rebuild Wei Hu
2026-10-16 15:38 ` [PATCH net-next v7 12/13] net: mana: keep the surviving queues when the channel count is reduced Wei Hu
2026-10-16 15:38 ` [PATCH net-next v7 13/13] net: mana: keep the existing queues when the channel count is raised Wei Hu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=743b6f30faf788fcbf663ba6bde90fbfc51ad0e8.1791710735.git.weh@linux.microsoft.com \
--to=weh@linux.microsoft.com \
--cc=andrew+netdev@lunn.ch \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=decui@microsoft.com \
--cc=edumazet@google.com \
--cc=edumazet@kernel.org \
--cc=ernis@linux.microsoft.com \
--cc=haiyangz@microsoft.com \
--cc=hawk@kernel.org \
--cc=horms@kernel.org \
--cc=jgg@ziepe.ca \
--cc=john.fastabend@gmail.com \
--cc=kotaranov@microsoft.com \
--cc=kuba@kernel.org \
--cc=leon@kernel.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=longli@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sdf@fomichev.me \
--cc=shradhagupta@linux.microsoft.com \
--cc=stephen@networkplumber.org \
--cc=weh@microsoft.com \
--cc=wei.liu@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®