lkml.org 
[lkml]   [2020]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.7 378/388] nvme-fc: don't call nvme_cleanup_cmd() for AENs
    Date
    From: Daniel Wagner <dwagner@suse.de>

    [ Upstream commit c9c12e51b82b2bd0c59ac4e27ee5427f382a503f ]

    Asynchronous event notifications do not have an associated request.
    When fcp_io() fails we unconditionally call nvme_cleanup_cmd() which
    leads to a crash.

    Fixes: 16686f3a6c3c ("nvme: move common call to nvme_cleanup_cmd to core layer")
    Signed-off-by: Daniel Wagner <dwagner@suse.de>
    Reviewed-by: Himanshu Madhani <hmadhani2024@gmail.com>
    Reviewed-by: Hannes Reinecke <hare@suse.de>
    Reviewed-by: James Smart <james.smart@broadcom.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvme/host/fc.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
    index 7dfc4a2ecf1e..287a3e8ea317 100644
    --- a/drivers/nvme/host/fc.c
    +++ b/drivers/nvme/host/fc.c
    @@ -2300,10 +2300,11 @@ nvme_fc_start_fcp_op(struct nvme_fc_ctrl *ctrl, struct nvme_fc_queue *queue,
    opstate = atomic_xchg(&op->state, FCPOP_STATE_COMPLETE);
    __nvme_fc_fcpop_chk_teardowns(ctrl, op, opstate);

    - if (!(op->flags & FCOP_FLAGS_AEN))
    + if (!(op->flags & FCOP_FLAGS_AEN)) {
    nvme_fc_unmap_data(ctrl, op->rq, op);
    + nvme_cleanup_cmd(op->rq);
    + }

    - nvme_cleanup_cmd(op->rq);
    nvme_fc_ctrl_put(ctrl);

    if (ctrl->rport->remoteport.port_state == FC_OBJSTATE_ONLINE &&
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-18 04:31    [W:4.044 / U:0.312 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site