lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.14 48/97] nvme_fcloop: fix abort race condition
    Date
    From: James Smart <jsmart2021@gmail.com>

    [ Upstream commit 278e096063f1914fccfc77a617be9fc8dbb31b0e ]

    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>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/nvme/target/fcloop.c | 12 +++++++-----
    1 file changed, 7 insertions(+), 5 deletions(-)

    diff --git a/drivers/nvme/target/fcloop.c b/drivers/nvme/target/fcloop.c
    index 5b51653ba9fe..c0080f6ab2f5 100644
    --- a/drivers/nvme/target/fcloop.c
    +++ b/drivers/nvme/target/fcloop.c
    @@ -374,6 +374,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) {
    @@ -615,11 +616,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);
    @@ -627,6 +624,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);
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-19 23:03    [W:4.149 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site