diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-07-29 11:21:14 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-07-29 11:21:14 -0600 |
| commit | d6364a867ccbf34a6afe0d57721ff64aa43befcd (patch) | |
| tree | c02c6ba948ea0c6d76281fb34cfbfb9b4e8830c0 /drivers/nvme/host/tcp.c | |
| parent | 1f273e255b285282707fa3246391f66e9dc4178f (diff) | |
| parent | 5bedd3afee8eb01ccd256f0cd2cc0fa6f841417a (diff) | |
Merge branch 'nvme-5.8' of git://git.infradead.org/nvme into block-5.8block-5.8-2020-07-30
Pull NVMe fixes from Christoph.
* 'nvme-5.8' of git://git.infradead.org/nvme:
nvme: add a Identify Namespace Identification Descriptor list quirk
nvme-pci: prevent SK hynix PC400 from using Write Zeroes command
nvme-tcp: fix possible hang waiting for icresp response
Diffstat (limited to 'drivers/nvme/host/tcp.c')
| -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 79ef2b8e2b3c..f3a91818167b 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1382,6 +1382,9 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, if (nctrl->opts->tos >= 0) ip_sock_set_tos(queue->sock->sk, nctrl->opts->tos); + /* 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; |