diff options
| author | Chao Leng <lengchao@huawei.com> | 2021-02-01 11:49:39 +0800 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2021-02-10 16:38:03 +0100 |
| commit | ea5e5f42cd2c80d19862dd63a2f3a4e7a99c6a20 (patch) | |
| tree | 73389b301113e73f3f6bc054073d658a6c5ad08a /drivers/nvme/host | |
| parent | dda3248e7fc306e0ce3612ae96bdd9a36e2ab04f (diff) | |
| download | lwn-ea5e5f42cd2c80d19862dd63a2f3a4e7a99c6a20.tar.gz lwn-ea5e5f42cd2c80d19862dd63a2f3a4e7a99c6a20.zip | |
nvme-fabrics: avoid double completions in nvmf_fail_nonready_command
When reconnecting, the request may be completed with
NVME_SC_HOST_PATH_ERROR in nvmf_fail_nonready_command, which currently
set the state of the request to MQ_RQ_IN_FLIGHT before calling
nvme_complete_rq. When this happens for a request that is freed by
the caller, such as nvme_submit_user_cmd, in the worst case the request
could be completed again in tear down process.
Instead of calling blk_mq_start_request from nvmf_fail_nonready_command,
just use the new nvme_host_path_error helper to complete the command
without starting it.
Signed-off-by: Chao Leng <lengchao@huawei.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme/host')
| -rw-r--r-- | drivers/nvme/host/fabrics.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c index 72ac00173500..5dfd806fc2d2 100644 --- a/drivers/nvme/host/fabrics.c +++ b/drivers/nvme/host/fabrics.c @@ -552,11 +552,7 @@ blk_status_t nvmf_fail_nonready_command(struct nvme_ctrl *ctrl, !test_bit(NVME_CTRL_FAILFAST_EXPIRED, &ctrl->flags) && !blk_noretry_request(rq) && !(rq->cmd_flags & REQ_NVME_MPATH)) return BLK_STS_RESOURCE; - - nvme_req(rq)->status = NVME_SC_HOST_PATH_ERROR; - blk_mq_start_request(rq); - nvme_complete_rq(rq); - return BLK_STS_OK; + return nvme_host_path_error(rq); } EXPORT_SYMBOL_GPL(nvmf_fail_nonready_command); |