Skip to content

Commit dd677d0

Browse files
Justin Teekeithbusch
authored andcommitted
nvmet-fcloop: Check remoteport port_state before calling done callback
In nvme_fc_handle_ls_rqst_work, the lsrsp->done callback is only set when remoteport->port_state is FC_OBJSTATE_ONLINE. Otherwise, the nvme_fc_xmt_ls_rsp's LLDD call to lport->ops->xmt_ls_rsp is expected to fail and the nvme-fc transport layer itself will directly call nvme_fc_xmt_ls_rsp_free instead of relying on LLDD's done callback to free the lsrsp resources. Update the fcloop_t2h_xmt_ls_rsp routine to check remoteport->port_state. If online, then lsrsp->done callback will free the lsrsp. Else, return -ENODEV to signal the nvme-fc transport to handle freeing lsrsp. Cc: Ewan D. Milne <emilne@redhat.com> Tested-by: Aristeu Rozanski <aris@redhat.com> Acked-by: Aristeu Rozanski <aris@redhat.com> Reviewed-by: Daniel Wagner <dwagner@suse.de> Closes: https://lore.kernel.org/linux-nvme/21255200-a271-4fa0-b099-97755c8acd4c@work/ Fixes: 10c165a ("nvmet-fcloop: call done callback even when remote port is gone") Signed-off-by: Justin Tee <justintee8345@gmail.com> Signed-off-by: Keith Busch <kbusch@kernel.org>
1 parent baa47c4 commit dd677d0

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

drivers/nvme/target/fcloop.c

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,7 @@ fcloop_t2h_xmt_ls_rsp(struct nvme_fc_local_port *localport,
491491
struct fcloop_rport *rport = remoteport->private;
492492
struct nvmet_fc_target_port *targetport = rport->targetport;
493493
struct fcloop_tport *tport;
494+
int ret = 0;
494495

495496
if (!targetport) {
496497
/*
@@ -500,12 +501,18 @@ fcloop_t2h_xmt_ls_rsp(struct nvme_fc_local_port *localport,
500501
* We end up here from delete association exchange:
501502
* nvmet_fc_xmt_disconnect_assoc sends an async request.
502503
*
503-
* Return success because this is what LLDDs do; silently
504-
* drop the response.
504+
* Return success when remoteport is still online because this
505+
* is what LLDDs do and silently drop the response. Otherwise,
506+
* return with error to signal upper layer to perform the lsrsp
507+
* resource cleanup.
505508
*/
506-
lsrsp->done(lsrsp);
509+
if (remoteport->port_state == FC_OBJSTATE_ONLINE)
510+
lsrsp->done(lsrsp);
511+
else
512+
ret = -ENODEV;
513+
507514
kmem_cache_free(lsreq_cache, tls_req);
508-
return 0;
515+
return ret;
509516
}
510517

511518
memcpy(lsreq->rspaddr, lsrsp->rspbuf,

0 commit comments

Comments
 (0)