iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: fail cancelled commands with NVME_SC_HOST_PATH_ERROR

Browse Source 
NVME_SC_ABORT_REQ means that the request was aborted due to
an abort command received. In our case, this is a transport
cancellation, so host pathing error is much more appropriate.

Also, convert NVME_SC_HOST_PATH_ERROR to BLK_STS_TRANSPORT for
such that callers can understand that the status is a transport
related error. This will be used by the ns scanning code to
understand if it got an error from the controller or that the
controller happens to be unreachable by the transport.

Reviewed-by: Minwoo Im <minwoo.im.dev@gmail.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: James Smart <james.smart@broadcom.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
This commit is contained in:
Sagi Grimberg 2019-08-02 18:04:12 -07:00
parent 0a67b5a926
commit 1c0d12c0b1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/nvme/host/core.c
View File

@ -226,6 +226,8 @@ static blk_status_t nvme_error_status(struct request *req)
return BLK_STS_PROTECTION; return BLK_STS_PROTECTION;
case NVME_SC_RESERVATION_CONFLICT: case NVME_SC_RESERVATION_CONFLICT:
return BLK_STS_NEXUS; return BLK_STS_NEXUS;
case NVME_SC_HOST_PATH_ERROR:
return BLK_STS_TRANSPORT;
default: default:
return BLK_STS_IOERR; return BLK_STS_IOERR;
} }
@ -294,7 +296,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved)
if (blk_mq_request_completed(req)) if (blk_mq_request_completed(req))
return true; return true;
nvme_req(req)->status = NVME_SC_ABORT_REQ; nvme_req(req)->status = NVME_SC_HOST_PATH_ERROR;
blk_mq_complete_request(req); blk_mq_complete_request(req);
return true; return true;
} }