[PATCH] nvme: fix admin queue leak on controller reset

[PATCH] nvme: fix admin queue leak on controller reset

[Ming Lei]

When nvme_alloc_admin_tag_set() is called during a controller reset,
a previous admin queue may still exist. Release it properly before
allocating a new one to avoid orphaning the old queue.

This fixes a regression introduced by commit 03b3bcd319b3 ("nvme: fix
admin request_queue lifetime").

Cc: Keith Busch <kbusch@kernel.org>
Fixes: 03b3bcd319b3 ("nvme: fix admin request_queue lifetime").
Reported-and-tested-by: Yi Zhang <yi.zhang@redhat.com>
Closes: https://lore.kernel.org/linux-block/CAHj4cs9wv3SdPo+N01Fw2SHBYDs9tj2M_e1-GdQOkRy=DsBB1w@mail.gmail.com/
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
 drivers/nvme/host/core.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 19b67cf5d550..4f1f460a6c11 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -4865,6 +4865,15 @@ int nvme_alloc_admin_tag_set(struct nvme_ctrl *ctrl, struct blk_mq_tag_set *set,
 	if (ret)
 		return ret;
 
+	/*
+	 * If a previous admin queue exists (e.g., from before a reset),
+	 * put it now before allocating a new one to avoid orphaning it.
+	 */
+	if (ctrl->admin_q) {
+		blk_put_queue(ctrl->admin_q);
+		ctrl->admin_q = NULL;
+	}
+
 	ctrl->admin_q = blk_mq_alloc_queue(set, &lim, NULL);
 	if (IS_ERR(ctrl->admin_q)) {
 		ret = PTR_ERR(ctrl->admin_q);
-- 
2.47.1

Re: [PATCH] nvme: fix admin queue leak on controller reset

[Christoph Hellwig]

On Sat, Jan 31, 2026 at 10:48:08PM +0800, Ming Lei wrote:
> When nvme_alloc_admin_tag_set() is called during a controller reset,
> a previous admin queue may still exist. Release it properly before
> allocating a new one to avoid orphaning the old queue.
> 
> This fixes a regression introduced by commit 03b3bcd319b3 ("nvme: fix
> admin request_queue lifetime").
> 
> Cc: Keith Busch <kbusch@kernel.org>
> Fixes: 03b3bcd319b3 ("nvme: fix admin request_queue lifetime").
> Reported-and-tested-by: Yi Zhang <yi.zhang@redhat.com>
> Closes: https://lore.kernel.org/linux-block/CAHj4cs9wv3SdPo+N01Fw2SHBYDs9tj2M_e1-GdQOkRy=DsBB1w@mail.gmail.com/
> Signed-off-by: Ming Lei <ming.lei@redhat.com>
> ---
>  drivers/nvme/host/core.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index 19b67cf5d550..4f1f460a6c11 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -4865,6 +4865,15 @@ int nvme_alloc_admin_tag_set(struct nvme_ctrl *ctrl, struct blk_mq_tag_set *set,
>  	if (ret)
>  		return ret;
>  
> +	/*
> +	 * If a previous admin queue exists (e.g., from before a reset),
> +	 * put it now before allocating a new one to avoid orphaning it.
> +	 */
> +	if (ctrl->admin_q) {
> +		blk_put_queue(ctrl->admin_q);
> +		ctrl->admin_q = NULL;
> +	}
> +
>  	ctrl->admin_q = blk_mq_alloc_queue(set, &lim, NULL);

Clearing the admin_q to zero above is pointless given that it instantly
gets overriden here.  Otherwise this looks good.

Re: [PATCH] nvme: fix admin queue leak on controller reset

[Keith Busch]

On Sat, Jan 31, 2026 at 10:48:08PM +0800, Ming Lei wrote:
> When nvme_alloc_admin_tag_set() is called during a controller reset,
> a previous admin queue may still exist. Release it properly before
> allocating a new one to avoid orphaning the old queue.
> 
> This fixes a regression introduced by commit 03b3bcd319b3 ("nvme: fix
> admin request_queue lifetime").

Thanks, applied to nvme-7.0.