iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'nvme-5.7' of git://git.infradead.org/nvme into block-5.7

Browse Source 
Pull NVMe poll fix from Christoph.

* 'nvme-5.7' of git://git.infradead.org/nvme:
  nvme-pci: avoid race between nvme_reap_pending_cqes() and nvme_poll()
This commit is contained in:
Jens Axboe 2020-05-28 08:48:12 -06:00
commit 15fede122b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/nvme/host/pci.c
View File

@ -1382,16 +1382,19 @@ static void nvme_disable_admin_queue(struct nvme_dev *dev, bool shutdown)
/* /*
* Called only on a device that has been disabled and after all other threads * Called only on a device that has been disabled and after all other threads
* that can check this device's completion queues have synced. This is the * that can check this device's completion queues have synced, except
* last chance for the driver to see a natural completion before * nvme_poll(). This is the last chance for the driver to see a natural
* nvme_cancel_request() terminates all incomplete requests. * completion before nvme_cancel_request() terminates all incomplete requests.
*/ */
static void nvme_reap_pending_cqes(struct nvme_dev *dev) static void nvme_reap_pending_cqes(struct nvme_dev *dev)
{ {
int i; int i;
for (i = dev->ctrl.queue_count - 1; i > 0; i--) for (i = dev->ctrl.queue_count - 1; i > 0; i--) {
spin_lock(&dev->queues[i].cq_poll_lock);
nvme_process_cq(&dev->queues[i]); nvme_process_cq(&dev->queues[i]);
spin_unlock(&dev->queues[i].cq_poll_lock);
}
} }
static int nvme_cmb_qdepth(struct nvme_dev *dev, int nr_io_queues, static int nvme_cmb_qdepth(struct nvme_dev *dev, int nr_io_queues,