diff options
| author | Sagi Grimberg <sagi@grimberg.me> | 2022-02-06 23:40:13 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2022-02-09 14:50:42 +0100 |
| commit | 63573807b27e0faf8065a28b1bbe1cbfb23c0130 (patch) | |
| tree | d1cf1cd2cef00b3cc51e7743606e15b94a74e026 /drivers/nvme | |
| parent | nvme: add nvme_complete_req tracepoint for batched completion (diff) | |
| download | linux-63573807b27e0faf8065a28b1bbe1cbfb23c0130.tar.xz linux-63573807b27e0faf8065a28b1bbe1cbfb23c0130.zip | |
nvme-tcp: fix bogus request completion when failing to send AER
AER is not backed by a real request, hence we should not incorrectly
assume that when failing to send a nvme command, it is a normal request
but rather check if this is an aer and if so complete the aer (similar
to the normal completion path).
Cc: stable@vger.kernel.org
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/tcp.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 01e24b5703db..891a36d02e7c 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -913,7 +913,15 @@ static inline void nvme_tcp_done_send_req(struct nvme_tcp_queue *queue) static void nvme_tcp_fail_request(struct nvme_tcp_request *req) { - nvme_tcp_end_request(blk_mq_rq_from_pdu(req), NVME_SC_HOST_PATH_ERROR); + if (nvme_tcp_async_req(req)) { + union nvme_result res = {}; + + nvme_complete_async_event(&req->queue->ctrl->ctrl, + cpu_to_le16(NVME_SC_HOST_PATH_ERROR), &res); + } else { + nvme_tcp_end_request(blk_mq_rq_from_pdu(req), + NVME_SC_HOST_PATH_ERROR); + } } static int nvme_tcp_try_send_data(struct nvme_tcp_request *req) |