Fixup return value for nvme_submit_sync_cmd()
cover Fixup return value for nvme_submit_sync_cmd()
Hi all,
here are two small patches for fixing up the return value of nvme_submit_sync_cmd(). As Keith correctly noted, nvme_submit_sync_cmd() should be returning an error if the command could not be performed; however, currently only pci does that.
So the first patch fixes up nvme_cancel_request() to return an -EINTR on any pending sync commands during reset.
And the second patch adds a new flag 'NVME_REQ_TIMEOUT' to indicate that a command had been aborted due to a timeout, and translates that back into -ETIMEDOUT as a return code for nvme_submit_sync_cmd().
As usual, comments and reviews are welcome.
Hannes Reinecke (2):
nvme: add NVME_REQ_CANCELLED flag in nvme_cancel_request()
nvme: return -ETIMEDOUT in nvme_submit_sync_cmd()
drivers/nvme/host/core.c | 3 +++ drivers/nvme/host/nvme.h | 1 + drivers/nvme/host/rdma.c | 1 + drivers/nvme/host/tcp.c | 1 + 4 files changed, 6 insertions(+)
Signature · 7 lines
2.29.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
PATCH 1/2 nvme: add NVME_REQ_CANCELLED flag in nvme_cancel_request()
NVME_REQ_CANCELLED is translated into -EINTR in nvme_submit_sync_cmd(), so we should be setting this flags during nvme_cancel_request() to ensure that the callers to nvme_submit_sync_cmd() will get the correct error code when the controller is reset.
--- drivers/nvme/host/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/nvme/host/core.c +1 -0
@@ -367,6 +367,7 @@ bool nvme_cancel_request(struct request *req, void *data, bool reserved)return true;nvme_req (req)->status =NVME_SC_HOST_ABORTED_CMD ; +nvme_req (req)->flags |=NVME_REQ_CANCELLED ;blk_mq_complete_request (req);return true; }
Signature · 7 lines
2.29.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 1/2] nvme: add NVME_REQ_CANCELLED flag in nvme_cancel_request()
Quoted 6 lines · Hannes Reinecke
NVME_REQ_CANCELLEDis translated into-EINTRinnvme_submit_sync_cmd(), so we should be setting this flags duringnvme_cancel_request()to ensure that the callers tonvme_submit_sync_cmd()will get the correct error code when the controller is reset.Signed-off-by Hannes Reinecke <[email protected]>
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
PATCH 2/2 nvme: return -ETIMEDOUT in nvme_submit_sync_cmd()
In reply to Hannes ReineckeWhen a command times out we should be returning -ETIMEDOUT in nvme_submit_sync_cmd(), and not requiring the caller to guess whether a specific NVMe status should be interpreted as a timeout.
--- drivers/nvme/host/core.c | 2 ++ drivers/nvme/host/nvme.h | 1 + drivers/nvme/host/rdma.c | 1 + drivers/nvme/host/tcp.c | 1 + 4 files changed, 5 insertions(+)
drivers/nvme/host/core.c +2 -0
@@ -972,6 +972,8 @@ int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, *result =nvme_req (req)->result;if (nvme_req (req)->flags &NVME_REQ_CANCELLED ) ret = -EINTR ; +else if (nvme_req (req)->flags &NVME_REQ_TIMEOUT ) + ret = -ETIMEDOUT ;else ret =nvme_req (req)->status; out:
drivers/nvme/host/nvme.h +1 -0
@@ -167,6 +167,7 @@ struct nvme_request {enum {NVME_REQ_CANCELLED = (1 <<0 ),NVME_REQ_USERCMD = (1 <<1 ), +NVME_REQ_TIMEOUT = (1 <<2 ), };static inline struct nvme_request *nvme_req (struct request *req)
drivers/nvme/host/rdma.c +1 -0
@@ -1977,6 +1977,7 @@ static void nvme_rdma_complete_timed_out(struct request *rq)nvme_rdma_stop_queue (queue);if (blk_mq_request_started (rq) && !blk_mq_request_completed (rq)) {nvme_req (rq)->status =NVME_SC_HOST_ABORTED_CMD ; +nvme_req (rq)->flags |=NVME_REQ_TIMEOUT ;blk_mq_complete_request (rq); } }
drivers/nvme/host/tcp.c +1 -0
@@ -2170,6 +2170,7 @@ static void nvme_tcp_complete_timed_out(struct request *rq)nvme_tcp_stop_queue (ctrl,nvme_tcp_queue_id (req->queue));if (blk_mq_request_started (rq) && !blk_mq_request_completed (rq)) {nvme_req (rq)->status =NVME_SC_HOST_ABORTED_CMD ; +nvme_req (rq)->flags |=NVME_REQ_TIMEOUT ;blk_mq_complete_request (rq); } }
Signature · 7 lines
2.29.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 2/2] nvme: return -ETIMEDOUT in nvme_submit_sync_cmd()
Quoted 10 lines · Hannes Reinecke
When a command times out we should be returning
-ETIMEDOUTinnvme_submit_sync_cmd(), and not requiring the caller to guess whether a specific NVMe status should be interpreted as a timeout.Signed-off-by Hannes Reinecke <[email protected]>--- drivers/nvme/host/core.c | 2 ++ drivers/nvme/host/nvme.h | 1 + drivers/nvme/host/rdma.c | 1 + drivers/nvme/host/tcp.c | 1 +
I wonder if we have to do something similar for FC. As far I understand an abort command is issued and the drivers will return the original request with FCPOP_STATE_ABORTED which then will be mapped to NVME_SC_HOST_PATH_ERROR.
Can't say if this is good or bad, it's a just different.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 2/2] nvme: return -ETIMEDOUT in nvme_submit_sync_cmd()
Quoted 12 lines · Daniel Wagner
Quoted 10 lines · Hannes Reinecke
When a command times out we should be returning
-ETIMEDOUTinnvme_submit_sync_cmd(), and not requiring the caller to guess whether a specific NVMe status should be interpreted as a timeout.Signed-off-by Hannes Reinecke <[email protected]>--- drivers/nvme/host/core.c | 2 ++ drivers/nvme/host/nvme.h | 1 + drivers/nvme/host/rdma.c | 1 + drivers/nvme/host/tcp.c | 1 +
Quoted 7 lines
I wonder if we have to do something similar for FC. As far I understand an abort command is issued and the drivers will return the original request with
FCPOP_STATE_ABORTEDwhich then will be mapped toNVME_SC_HOST_PATH_ERROR.Can't say if this is good or bad, it's a just different.
Good point, and indeed you are correct.
Will be sending a v2 version.
Cheers,
Hannes
Signature · 9 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme