xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme_fcloop: fix abort race condition

Browse Source 
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: James Smart <james.smart@broadcom.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
James Smart
2017-11-29 16:47:30 -08:00
committed by Christoph Hellwig
parent 6a1c57acab
commit 278e096063
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/nvme/target/fcloop.c
View File

@@ -370,6 +370,7 @@ fcloop_tgt_fcprqst_done_work(struct work_struct *work)
spin_lock(&tfcp_req->reqlock); spin_lock(&tfcp_req->reqlock);
fcpreq = tfcp_req->fcpreq; fcpreq = tfcp_req->fcpreq;
tfcp_req->fcpreq = NULL;
spin_unlock(&tfcp_req->reqlock); spin_unlock(&tfcp_req->reqlock);
if (tport->remoteport && fcpreq) { if (tport->remoteport && fcpreq) {
@@ -611,11 +612,7 @@ fcloop_fcp_abort(struct nvme_fc_local_port *localport,
if (!tfcp_req) if (!tfcp_req)
/* abort has already been called */ /* abort has already been called */
return; goto finish;
if (rport->targetport)
nvmet_fc_rcv_fcp_abort(rport->targetport,
&tfcp_req->tgt_fcp_req);
/* break initiator/target relationship for io */ /* break initiator/target relationship for io */
spin_lock(&tfcp_req->reqlock); spin_lock(&tfcp_req->reqlock);
@@ -623,6 +620,11 @@ fcloop_fcp_abort(struct nvme_fc_local_port *localport,
tfcp_req->fcpreq = NULL; tfcp_req->fcpreq = NULL;
spin_unlock(&tfcp_req->reqlock); 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 */ /* post the aborted io completion */
fcpreq->status = -ECANCELED; fcpreq->status = -ECANCELED;
schedule_work(&inireq->iniwork); schedule_work(&inireq->iniwork);