diff options
| author | Keith Busch <keith.busch@intel.com> | 2016-04-12 19:13:11 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-04-12 21:44:00 +0200 |
| commit | 21f033f7c72e9505c46c6555b019b907dc39dfcd (patch) | |
| tree | e579d6001699450d2cc39f01638429cf51929571 | |
| parent | nvme: add helper nvme_setup_cmd() (diff) | |
| download | linux-21f033f7c72e9505c46c6555b019b907dc39dfcd.tar.xz linux-21f033f7c72e9505c46c6555b019b907dc39dfcd.zip | |
NVMe: Skip async events for degraded controllers
If the controller is degraded, the driver should stay out of the way so
the user can recover the drive. This patch skips driver initiated async
event requests when the drive is in this state.
Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | drivers/nvme/host/pci.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 008c9eec437a..7508a0ae57ff 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1855,8 +1855,16 @@ static void nvme_reset_work(struct work_struct *work) if (result) goto out; - dev->ctrl.event_limit = NVME_NR_AEN_COMMANDS; - queue_work(nvme_workq, &dev->async_work); + /* + * A controller that can not execute IO typically requires user + * intervention to correct. For such degraded controllers, the driver + * should not submit commands the user did not request, so skip + * registering for asynchronous event notification on this condition. + */ + if (dev->online_queues > 1) { + dev->ctrl.event_limit = NVME_NR_AEN_COMMANDS; + queue_work(nvme_workq, &dev->async_work); + } mod_timer(&dev->watchdog_timer, round_jiffies(jiffies + HZ)); |