Commit 166e31d7 authored by Keith Busch's avatar Keith Busch
Browse files

nvme-pci: ensure we're polling a polled queue 



A user can change the polled queue count at run time. There's a brief
window during a reset where a hipri task may try to poll that queue
before the block layer has updated the queue maps, which would race with
the now interrupt driven queue and may cause double completions.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKanchan Joshi <joshi.k@samsung.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent bbdaa8c1

drivers/nvme/host/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -1627,7 +1627,8 @@ static int nvme_poll(struct blk_mq_hw_ctx *hctx, struct io_comp_batch *iob) 
	struct nvme_queue *nvmeq = hctx->driver_data;

	bool found;



	if (!nvme_cqe_pending(nvmeq))

	if (!test_bit(NVMEQ_POLLED, &nvmeq->flags) ||

	    !nvme_cqe_pending(nvmeq))

		return 0;



	spin_lock(&nvmeq->cq_poll_lock);