diff options
| author |   Bijan Mottahedeh <bijan.mottahedeh@oracle.com> | 2020-02-26 18:53:43 -0800 |
|---|---|---|
| committer |   Keith Busch <kbusch@kernel.org> | 2020-02-28 01:32:14 +0900 |
| commit | 9515743bfb39c61aaf3d4f3219a645c8d1fe9a0e (patch) | |
| tree | abe811e8684f25b41397639a2c41b54466bbc8a1 /drivers/nvme | |
| parent | blk-mq: Remove some unused function arguments (diff) | |
| download | linux-dev-9515743bfb39c61aaf3d4f3219a645c8d1fe9a0e.tar.xz linux-dev-9515743bfb39c61aaf3d4f3219a645c8d1fe9a0e.zip | |
nvme-pci: Hold cq_poll_lock while completing CQEs
Completions need to consumed in the same order the controller submitted
them, otherwise future completion entries may overwrite ones we haven't
handled yet. Hold the nvme queue's poll lock while completing new CQEs to
prevent another thread from freeing command tags for reuse out-of-order.
Fixes: dabcefab45d3 ("nvme: provide optimized poll function for separate poll queues")
Signed-off-by: Bijan Mottahedeh <bijan.mottahedeh@oracle.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index ace4dd9e953c..d3f23d6254e4 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1078,9 +1078,9 @@ static int nvme_poll(struct blk_mq_hw_ctx *hctx) spin_lock(&nvmeq->cq_poll_lock); found = nvme_process_cq(nvmeq, &start, &end, -1); + nvme_complete_cqes(nvmeq, start, end); spin_unlock(&nvmeq->cq_poll_lock); - nvme_complete_cqes(nvmeq, start, end); return found; } |