Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 278e0960 authored by James Smart's avatar James Smart Committed by Christoph Hellwig
Browse files

nvme_fcloop: fix abort race condition 



A test case revealed a race condition of an i/o completing on a thread
parallel to the delete_association generating the aborts for the
outstanding ios on the controller.  The i/o completion was freeing the
target fcloop context, thus the abort task referenced the just-freed
memory.

Correct by clearing the target/initiator cross pointers in the io
completion and abort tasks before calling the callbacks. On aborts
that detect already finished io's, ensure the complete context is
called.

Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 6a1c57ac

drivers/nvme/target/fcloop.c

+7 −5
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ fcloop_tgt_fcprqst_done_work(struct work_struct *work) 


	spin_lock(&tfcp_req->reqlock);

	fcpreq = tfcp_req->fcpreq;

	tfcp_req->fcpreq = NULL;

	spin_unlock(&tfcp_req->reqlock);



	if (tport->remoteport && fcpreq) {
@@ -611,11 +612,7 @@ fcloop_fcp_abort(struct nvme_fc_local_port *localport, 


	if (!tfcp_req)

		/* abort has already been called */

		return;



	if (rport->targetport)

		nvmet_fc_rcv_fcp_abort(rport->targetport,

					&tfcp_req->tgt_fcp_req);

		goto finish;



	/* break initiator/target relationship for io */

	spin_lock(&tfcp_req->reqlock);
@@ -623,6 +620,11 @@ fcloop_fcp_abort(struct nvme_fc_local_port *localport, 
	tfcp_req->fcpreq = NULL;

	spin_unlock(&tfcp_req->reqlock);



	if (rport->targetport)

		nvmet_fc_rcv_fcp_abort(rport->targetport,

					&tfcp_req->tgt_fcp_req);



finish:

	/* post the aborted io completion */

	fcpreq->status = -ECANCELED;

	schedule_work(&inireq->iniwork);