From: Keith Busch Date: Tue, 12 Apr 2016 17:13:11 +0000 (-0600) Subject: NVMe: Skip async events for degraded controllers X-Git-Tag: v4.1.12-102.0.20170601_1400~99 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ad55e0864dee9c7e71780d1d0e9c20cb61293179;p=users%2Fjedix%2Flinux-maple.git 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 Reviewed-by: Sagi Grimberg Reviewed-by: Christoph Hellwig Signed-off-by: Jens Axboe (cherry picked from commit 21f033f7c72e9505c46c6555b019b907dc39dfcd) Orabug: 25130845 Signed-off-by: Ashok Vairavan Reviewed-by: Martin K. Petersen --- diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index b20059e9a7e2a..7cdedeb479ad8 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1903,8 +1903,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)); /*