diff options
| author | Sagi Grimberg <sagi@grimberg.me> | 2020-03-24 02:43:52 +0300 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2020-03-31 18:57:32 +0300 |
| commit | f86e5bf817a57c7e6538dafee2fc65a525bb9935 (patch) | |
| tree | 840049e0ff2bcdff8eeca05f29d4ca14212c2331 /drivers/nvme | |
| parent | 25e5cb780e62bde432b401f312bb847edc78b432 (diff) | |
| download | linux-f86e5bf817a57c7e6538dafee2fc65a525bb9935.tar.xz | |
nvme-tcp: don't poll a non-live queue
In error recovery we might be removing the queue so check we
can actually poll before we do.
Reported-by: Mark Wunderlich <mark.wunderlich@intel.com>
Tested-by: Mark Wunderlich <mark.wunderlich@intel.com>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme')
| -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 aa754ae3ca08..eb31c689d2cf 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -2299,6 +2299,9 @@ static int nvme_tcp_poll(struct blk_mq_hw_ctx *hctx) struct nvme_tcp_queue *queue = hctx->driver_data; struct sock *sk = queue->sock->sk; + if (!test_bit(NVME_TCP_Q_LIVE, &queue->flags)) + return 0; + if (sk_can_busy_loop(sk) && skb_queue_empty_lockless(&sk->sk_receive_queue)) sk_busy_loop(sk, true); nvme_tcp_try_recv(queue); |