2023-06-06 12:33:56

by Daniel Wagner

Subject: [PATCH v4 1/1] nvmet-fcloop: Do not wait on completion when unregister fails

The nvme_fc_unregister_localport() returns an error code in case that
the locaport pointer is NULL or has already been unegisterd. localport is
is either in the ONLINE state (all resources allocated) or has already
been put into DELETED state.

In this case we will never receive an wakeup call and thus any caller
will hang, e.g. module unload.

Signed-off-by: Daniel Wagner <[email protected]>
---
drivers/nvme/target/fcloop.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/nvme/target/fcloop.c b/drivers/nvme/target/fcloop.c
index 1ab3d900f2bf..c65a73433c05 100644
--- a/drivers/nvme/target/fcloop.c
+++ b/drivers/nvme/target/fcloop.c
@@ -1166,7 +1166,8 @@ __wait_localport_unreg(struct fcloop_lport *lport)

ret = nvme_fc_unregister_localport(lport->localport);

- wait_for_completion(&lport->unreg_done);
+ if (!ret)
+ wait_for_completion(&lport->unreg_done);

kfree(lport);

--
2.40.1

2023-06-07 07:58:24

by Christoph Hellwig

Subject: Re: [PATCH v4 1/1] nvmet-fcloop: Do not wait on completion when unregister fails

Looks good:

Reviewed-by: Christoph Hellwig <[email protected]>

2023-06-07 15:15:15

by Sagi Grimberg

Subject: Re: [PATCH v4 1/1] nvmet-fcloop: Do not wait on completion when unregister fails

Reviewed-by: Sagi Grimberg <[email protected]>

2023-06-09 16:04:09

by Keith Busch

Subject: Re: [PATCH v4 1/1] nvmet-fcloop: Do not wait on completion when unregister fails

Thanks, applied for nvme-6.5.