nvme-fcloop: Fix dropped LS's to removed target port

jsmart-gh · Christoph Hellwig · commit afd299ca9969 · 2018-08-28T08:40:43.000+02:00
When a targetport is removed from the config, fcloop will avoid calling
the LS done() routine thinking the targetport is gone. This leaves the
initiator reset/reconnect hanging as it waits for a status on the
Create_Association LS for the reconnect.

Change the filter in the LS callback path. If tport null (set when
failed validation before "sending to remote port"), be sure to call
done. This was the main bug. But, continue the logic that only calls
done if tport was set but there is no remoteport (e.g. case where
remoteport has been removed, thus host doesn't expect a completion).

Signed-off-by: James Smart &lt;james.smart@broadcom.com&gt;
Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
diff --git a/drivers/nvme/target/fcloop.c b/drivers/nvme/target/fcloop.c
@@ -311,7 +311,7 @@ fcloop_tgt_lsrqst_done_work(struct work_struct *work)
 	struct fcloop_tport *tport = tls_req->tport;
 	struct nvmefc_ls_req *lsreq = tls_req->lsreq;
 
-	if (tport->remoteport)
+	if (!tport || tport->remoteport)
 		lsreq->done(lsreq, tls_req->status);
 }
 
@@ -329,6 +329,7 @@ fcloop_ls_req(struct nvme_fc_local_port *localport,
 
 	if (!rport->targetport) {
 		tls_req->status = -ECONNREFUSED;
+		tls_req->tport = NULL;
 		schedule_work(&tls_req->work);
 		return ret;
 	}

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ fcloop_tgt_lsrqst_done_work(struct work_struct *work)`
`311`	`311`	`struct fcloop_tport *tport = tls_req->tport;`
`312`	`312`	`struct nvmefc_ls_req *lsreq = tls_req->lsreq;`
`313`	`313`
`314`		`- if (tport->remoteport)`
	`314`	`+ if (!tport \|\| tport->remoteport)`
`315`	`315`	`lsreq->done(lsreq, tls_req->status);`
`316`	`316`	`}`
`317`	`317`
`@@ -329,6 +329,7 @@ fcloop_ls_req(struct nvme_fc_local_port *localport,`
`329`	`329`
`330`	`330`	`if (!rport->targetport) {`
`331`	`331`	`tls_req->status = -ECONNREFUSED;`
	`332`	`+ tls_req->tport = NULL;`
`332`	`333`	`schedule_work(&tls_req->work);`
`333`	`334`	`return ret;`
`334`	`335`	`}`