NVMe: Fix reset/remove race
authorKeith Busch <keith.busch@intel.com>
Fri, 8 Apr 2016 22:11:02 +0000 (16:11 -0600)
committerJens Axboe <axboe@fb.com>
Mon, 11 Apr 2016 16:00:04 +0000 (10:00 -0600)
commit9bf2b972afeaffd173fe2ce211ebc555ea7e8a87
tree3ad6e0a0d24a9afff0b3c6cc426e606d8fa75cf6
parentc877ef8ae7b8edaedccad0fc8c23d4d1de7e2480
NVMe: Fix reset/remove race

This fixes a scenario where device is present and being reset, but a
request to unbind the driver occurs.

A previous patch series addressing a device failure removal scenario
flushed reset_work after controller disable to unblock reset_work waiting
on a completion that wouldn't occur. This isn't safe as-is. The broken
scenario can potentially be induced with:

  modprobe nvme && modprobe -r nvme

To fix, the reset work is flushed immediately after setting the controller
removing flag, and any subsequent reset will not proceed with controller
initialization if the flag is set.

The controller status must be polled while active, so the watchdog timer
is also left active until the controller is disabled to cleanup requests
that may be stuck during namespace removal.

[Fixes: ff23a2a15a2117245b4599c1352343c8b8fb4c43]
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 <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
drivers/nvme/host/pci.c