From: Sagi Grimberg <sagi@grimberg.me>
Date: Thu, 23 Jul 2020 23:42:26 +0000 (-0700)
Subject: nvme-tcp: fix possible hang waiting for icresp response
X-Git-Tag: v5.4.56~52
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=831c904a0f6837619dcbb13bb83f6b6aaf913f61;p=users%2Fdwmw2%2Flinux.git

nvme-tcp: fix possible hang waiting for icresp response

[ Upstream commit adc99fd378398f4c58798a1c57889872967d56a6 ]

If the controller died exactly when we are receiving icresp
we hang because icresp may never return. Make sure to set a
high finite limit.

Fixes: 3f2304f8c6d6 ("nvme-tcp: add NVMe over TCP host driver")
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index 7900814355c28..53e113a18a549 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -1319,6 +1319,9 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl,
 		}
 	}
 
+	/* Set 10 seconds timeout for icresp recvmsg */
+	queue->sock->sk->sk_rcvtimeo = 10 * HZ;
+
 	queue->sock->sk->sk_allocation = GFP_ATOMIC;
 	if (!qid)
 		n = 0;