nvme-tcp: always fail a request when sending it failed
authorSagi Grimberg <sagi@grimberg.me>
Sun, 26 Jun 2022 09:24:51 +0000 (12:24 +0300)
committerChristoph Hellwig <hch@lst.de>
Wed, 29 Jun 2022 14:13:45 +0000 (16:13 +0200)
queue stoppage and inflight requests cancellation is fully fenced from
io_work and thus failing a request from this context. Hence we don't
need to try to guess from the socket retcode if this failure is because
the queue is about to be torn down or not.

We are perfectly safe to just fail it, the request will not be cancelled
later on.

This solves possible very long shutdown delays when the users issues a
'nvme disconnect-all'

Reported-by: Daniel Wagner <dwagner@suse.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/tcp.c

index bb67538d241b657dec9ee4bac33029920c493d9d..009c2cf3f1068fa018e8506b9a2a9764b0fda4a5 100644 (file)
@@ -1180,8 +1180,7 @@ done:
        } else if (ret < 0) {
                dev_err(queue->ctrl->ctrl.device,
                        "failed to send request %d\n", ret);
-               if (ret != -EPIPE && ret != -ECONNRESET)
-                       nvme_tcp_fail_request(queue->request);
+               nvme_tcp_fail_request(queue->request);
                nvme_tcp_done_send_req(queue);
        }
        return ret;