diff options
| author | Sagi Grimberg <sagi@grimberg.me> | 2020-07-23 16:42:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-05 09:58:40 +0200 |
| commit | 49fe954ca02c51c0af0cf3fa54c88fd63c9d71d6 (patch) | |
| tree | 59e8f64c92f4e5686ecb8bd31ac90f3103ba0863 | |
| parent | cc77fa81043f4b219317430b8c77bcb083c8676f (diff) | |
| download | linux-stable-49fe954ca02c51c0af0cf3fa54c88fd63c9d71d6.tar.gz linux-stable-49fe954ca02c51c0af0cf3fa54c88fd63c9d71d6.tar.bz2 linux-stable-49fe954ca02c51c0af0cf3fa54c88fd63c9d71d6.zip | |
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>
| -rw-r--r-- | drivers/nvme/host/tcp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 4862fa962011..26461bf3fdcc 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1392,6 +1392,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; nvme_tcp_set_queue_io_cpu(queue); queue->request = NULL; |