lkml.org 
[lkml]   [2019]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 230/434] nvme: introduce "Command Aborted By host" status code
    Date
    From: Max Gurtovoy <maxg@mellanox.com>

    [ Upstream commit 2dc3947b53f573e8a75ea9cbec5588df88ca502e ]

    Fix the status code of canceled requests initiated by the host according
    to TP4028 (Status Code 0x371):
    "Command Aborted By host: The command was aborted as a result of host
    action (e.g., the host disconnected the Fabric connection)."

    Also in a multipath environment, unless otherwise specified, errors of
    this type (path related) should be retried using a different path, if
    one is available.

    Signed-off-by: Max Gurtovoy <maxg@mellanox.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Keith Busch <kbusch@kernel.org>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/nvme/host/core.c | 2 +-
    drivers/nvme/host/multipath.c | 1 +
    include/linux/nvme.h | 1 +
    3 files changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
    index af3212aec871..b4e1e4379f1f 100644
    --- a/drivers/nvme/host/core.c
    +++ b/drivers/nvme/host/core.c
    @@ -313,7 +313,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved)
    if (blk_mq_request_completed(req))
    return true;

    - nvme_req(req)->status = NVME_SC_HOST_PATH_ERROR;
    + nvme_req(req)->status = NVME_SC_HOST_ABORTED_CMD;
    blk_mq_complete_request(req);
    return true;
    }
    diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
    index e0f064dcbd02..132ade51ee87 100644
    --- a/drivers/nvme/host/multipath.c
    +++ b/drivers/nvme/host/multipath.c
    @@ -95,6 +95,7 @@ void nvme_failover_req(struct request *req)
    }
    break;
    case NVME_SC_HOST_PATH_ERROR:
    + case NVME_SC_HOST_ABORTED_CMD:
    /*
    * Temporary transport disruption in talking to the controller.
    * Try to send on a new path.
    diff --git a/include/linux/nvme.h b/include/linux/nvme.h
    index f61d6906e59d..a260cd754f28 100644
    --- a/include/linux/nvme.h
    +++ b/include/linux/nvme.h
    @@ -1368,6 +1368,7 @@ enum {
    NVME_SC_ANA_INACCESSIBLE = 0x302,
    NVME_SC_ANA_TRANSITION = 0x303,
    NVME_SC_HOST_PATH_ERROR = 0x370,
    + NVME_SC_HOST_ABORTED_CMD = 0x371,

    NVME_SC_CRD = 0x1800,
    NVME_SC_DNR = 0x4000,
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-29 19:06    [W:2.279 / U:0.332 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site