diff options
| author | Keith Busch <keith.busch@intel.com> | 2016-02-11 13:05:42 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-02-12 08:10:08 -0700 |
| commit | ae1fba20015bca7401db2422fe18c9c049184163 (patch) | |
| tree | bd7c64840a6a5b76aafcd6505f265da487e3aca2 | |
| parent | ef2d4615c59efb312e531a5e949970f37ca1c841 (diff) | |
| download | op-kernel-dev-ae1fba20015bca7401db2422fe18c9c049184163.zip op-kernel-dev-ae1fba20015bca7401db2422fe18c9c049184163.tar.gz | |
NVMe: Requeue requests on suspended queues
It's possible a request may get to the driver after the nvme queue was
disabled. This has the request requeue if that happens.
Note the request is still "started" by the driver, but requeuing will
clear the start state for timeout handling.
Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | drivers/nvme/host/pci.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 72ef832..e5c2bea 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -678,6 +678,11 @@ static int nvme_queue_rq(struct blk_mq_hw_ctx *hctx, blk_mq_start_request(req); spin_lock_irq(&nvmeq->q_lock); + if (unlikely(nvmeq->cq_vector < 0)) { + ret = BLK_MQ_RQ_QUEUE_BUSY; + spin_unlock_irq(&nvmeq->q_lock); + goto out; + } __nvme_submit_cmd(nvmeq, &cmnd); nvme_process_cq(nvmeq); spin_unlock_irq(&nvmeq->q_lock); |
