[BUG FIX PATCH COMPILE TESTED ONLY] nvme-fc: release admin tagset if init fails

[BUG FIX PATCH COMPILE TESTED ONLY] nvme-fc: release admin tagset if init fails

[Chaitanya Kulkarni]

nvme_fabrics creates an NVMe/FC controller in following path:

    nvmf_dev_write()
      -> nvmf_create_ctrl()
        -> nvme_fc_create_ctrl()
          -> nvme_fc_init_ctrl()

nvme_fc_init_ctrl() allocates the admin blk-mq resources right after
nvme_add_ctrl() succeeds.  If any of the subsequent steps fail (changing
the controller state, scheduling connect work, etc.), we jump to the
fail_ctrl path, which tears down the controller references but never
frees the admin queue/tag set.  The leaked blk-mq allocations match the
kmemleak report seen during blktests nvme/fc.

Check ctrl->ctrl.admin_tagset in the fail_ctrl path and call
nvme_remove_admin_tag_set() when it is set so that all admin queue
allocations are reclaimed whenever controller setup aborts.

Reported-by: Yi Zhang <yi.zhang@redhat.com>
Signed-off-by: Chaitanya Kulkarni <ckulkarnilinux@gmail.com>
---
 drivers/nvme/host/fc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index bc455fa98246..6948de3f438a 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -3587,6 +3587,8 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts,
 
 	ctrl->ctrl.opts = NULL;
 
+	if (ctrl->ctrl.admin_tagset)
+		nvme_remove_admin_tag_set(&ctrl->ctrl);
 	/* initiate nvme ctrl ref counting teardown */
 	nvme_uninit_ctrl(&ctrl->ctrl);
 
-- 
2.40.0

Re: [BUG FIX PATCH COMPILE TESTED ONLY] nvme-fc: release admin tagset if init fails

[Chaitanya Kulkarni]

On 12/19/25 16:18, Chaitanya Kulkarni wrote:
> nvme_fabrics creates an NVMe/FC controller in following path:
>
>      nvmf_dev_write()
>        -> nvmf_create_ctrl()
>          -> nvme_fc_create_ctrl()
>            -> nvme_fc_init_ctrl()
>
> nvme_fc_init_ctrl() allocates the admin blk-mq resources right after
> nvme_add_ctrl() succeeds.  If any of the subsequent steps fail (changing
> the controller state, scheduling connect work, etc.), we jump to the
> fail_ctrl path, which tears down the controller references but never
> frees the admin queue/tag set.  The leaked blk-mq allocations match the
> kmemleak report seen during blktests nvme/fc.
>
> Check ctrl->ctrl.admin_tagset in the fail_ctrl path and call
> nvme_remove_admin_tag_set() when it is set so that all admin queue
> allocations are reclaimed whenever controller setup aborts.
>
> Reported-by: Yi Zhang <yi.zhang@redhat.com>
> Signed-off-by: Chaitanya Kulkarni <ckulkarnilinux@gmail.com>
> ---

Gentle ping on this before it gets lost ...

-ck

Re: [BUG FIX PATCH COMPILE TESTED ONLY] nvme-fc: release admin tagset if init fails

[Justin Tee]

Hi Yi,

Was there a specific nvme/fc blktest case that triggered this call 
trace?  Or, was this observed after stress running all nvme/fc blktests 
in a loop?

Regards,
Justin Tee

Re: [BUG FIX PATCH COMPILE TESTED ONLY] nvme-fc: release admin tagset if init fails

[Chaitanya Kulkarni]

On 1/6/26 17:37, Justin Tee wrote:
> Hi Yi,
>
> Was there a specific nvme/fc blktest case that triggered this call 
> trace?  Or, was this observed after stress running all nvme/fc 
> blktests in a loop?
>
> Regards,
> Justin Tee
>
thanks for looking into this, it was observed when Yi reported the issue.

Irrespective of whether it is repro issue, it's still a bug ?

Can you please provide review comments ?

-ck

  

Re: [BUG FIX PATCH COMPILE TESTED ONLY] nvme-fc: release admin tagset if init fails

[Justin Tee]

 > thanks for looking into this, it was observed when Yi reported the issue.
 >
 > Irrespective of whether it is repro issue, it's still a bug ?
 >
 > Can you please provide review comments ?

Yes, agreed after reviewing the current goto fail_ctrl path that there 
is a missing nvme_remove_admin_tag_set.  I can provide the Reviewed-by 
stamp.

I guess I’d prefer if we can prove this resolves the issue Yi reported.  
If Yi could re-rerun nvme-fc blktests on the original failing setup with 
this patch, that would be great to confirm.

Thanks,
Justin

Re: [BUG FIX PATCH COMPILE TESTED ONLY] nvme-fc: release admin tagset if init fails

[Justin Tee]

Reviewed-by: Justin Tee <justin.tee@broadcom.com>

Regards,
Justin

Re: [BUG FIX PATCH COMPILE TESTED ONLY] nvme-fc: release admin tagset if init fails

[Keith Busch]

On Fri, Dec 19, 2025 at 04:18:42PM -0800, Chaitanya Kulkarni wrote:
> nvme_fabrics creates an NVMe/FC controller in following path:
> 
>     nvmf_dev_write()
>       -> nvmf_create_ctrl()
>         -> nvme_fc_create_ctrl()
>           -> nvme_fc_init_ctrl()
> 
> nvme_fc_init_ctrl() allocates the admin blk-mq resources right after
> nvme_add_ctrl() succeeds.  If any of the subsequent steps fail (changing
> the controller state, scheduling connect work, etc.), we jump to the
> fail_ctrl path, which tears down the controller references but never
> frees the admin queue/tag set.  The leaked blk-mq allocations match the
> kmemleak report seen during blktests nvme/fc.
> 
> Check ctrl->ctrl.admin_tagset in the fail_ctrl path and call
> nvme_remove_admin_tag_set() when it is set so that all admin queue
> allocations are reclaimed whenever controller setup aborts.

Thanks, applied.