lkml.org 
[lkml]   [2020]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.9 36/55] nvme-tcp: avoid repeated request completion
    Date
    From: Sagi Grimberg <sagi@grimberg.me>

    [ Upstream commit 0a8a2c85b83589a5c10bc5564b796836bf4b4984 ]

    The request may be executed asynchronously, and rq->state may be
    changed to IDLE. To avoid repeated request completion, only
    MQ_RQ_COMPLETE of rq->state is checked in nvme_tcp_complete_timed_out.
    It is not safe, so need adding check IDLE for rq->state.

    Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
    Signed-off-by: Chao Leng <lengchao@huawei.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvme/host/tcp.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
    index 19f86ea547bbc..c0c33320fe659 100644
    --- a/drivers/nvme/host/tcp.c
    +++ b/drivers/nvme/host/tcp.c
    @@ -2168,7 +2168,7 @@ static void nvme_tcp_complete_timed_out(struct request *rq)
    struct nvme_ctrl *ctrl = &req->queue->ctrl->ctrl;

    nvme_tcp_stop_queue(ctrl, nvme_tcp_queue_id(req->queue));
    - if (!blk_mq_request_completed(rq)) {
    + if (blk_mq_request_started(rq) && !blk_mq_request_completed(rq)) {
    nvme_req(rq)->status = NVME_SC_HOST_ABORTED_CMD;
    blk_mq_complete_request(rq);
    }
    --
    2.27.0
    \
     
     \ /
      Last update: 2020-11-10 05:05    [W:4.065 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site