[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 14/16] block/nvme: Extract nvme_poll_queue()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v3 14/16] block/nvme: Extract nvme_poll_queue() |
Date: |
Sat, 4 Jul 2020 23:30:49 +0200 |
As we want to do per-queue polling, extract the nvme_poll_queue()
method which operates on a single queue.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Stefan better double check here!
---
block/nvme.c | 44 +++++++++++++++++++++++++++-----------------
1 file changed, 27 insertions(+), 17 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index 51ac36dc4f..a6ff660ad2 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -590,31 +590,41 @@ out:
qemu_vfree(id);
}
+static bool nvme_poll_queue(NVMeQueuePair *q)
+{
+ bool progress = false;
+
+ const size_t cqe_offset = q->cq.head * NVME_CQ_ENTRY_BYTES;
+ NvmeCqe *cqe = (NvmeCqe *)&q->cq.queue[cqe_offset];
+
+ /*
+ * Do an early check for completions. q->lock isn't needed because
+ * nvme_process_completion() only runs in the event loop thread and
+ * cannot race with itself.
+ */
+ if ((le16_to_cpu(cqe->status) & 0x1) == q->cq_phase) {
+ return false;
+ }
+
+ qemu_mutex_lock(&q->lock);
+ while (nvme_process_completion(q)) {
+ /* Keep polling */
+ progress = true;
+ }
+ qemu_mutex_unlock(&q->lock);
+
+ return progress;
+}
+
static bool nvme_poll_queues(BDRVNVMeState *s)
{
bool progress = false;
int i;
for (i = 0; i < s->nr_queues; i++) {
- NVMeQueuePair *q = s->queues[i];
- const size_t cqe_offset = q->cq.head * NVME_CQ_ENTRY_BYTES;
- NvmeCqe *cqe = (NvmeCqe *)&q->cq.queue[cqe_offset];
-
- /*
- * Do an early check for completions. q->lock isn't needed because
- * nvme_process_completion() only runs in the event loop thread and
- * cannot race with itself.
- */
- if ((le16_to_cpu(cqe->status) & 0x1) == q->cq_phase) {
- continue;
- }
-
- qemu_mutex_lock(&q->lock);
- while (nvme_process_completion(q)) {
- /* Keep polling */
+ if (nvme_poll_queue(s->queues[i])) {
progress = true;
}
- qemu_mutex_unlock(&q->lock);
}
return progress;
}
--
2.21.3
- Re: [PATCH v3 05/16] block/nvme: Improve error message when IO queue creation failed, (continued)
- [PATCH v3 06/16] block/nvme: Use common error path in nvme_add_io_queue(), Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 07/16] block/nvme: Rename local variable, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 08/16] block/nvme: Use union of NvmeIdCtrl / NvmeIdNs structures, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 09/16] block/nvme: Replace qemu_try_blockalign0 by qemu_try_blockalign/memset, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 10/16] block/nvme: Replace qemu_try_blockalign(bs) by qemu_try_memalign(pg_sz), Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 11/16] block/nvme: Simplify nvme_init_queue() arguments, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 12/16] block/nvme: Replace BDRV_POLL_WHILE by AIO_WAIT_WHILE, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 13/16] block/nvme: Simplify nvme_create_queue_pair() arguments, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 14/16] block/nvme: Extract nvme_poll_queue(),
Philippe Mathieu-Daudé <=
- [PATCH v3 15/16] block/nvme: Move nvme_poll_cb() earlier, Philippe Mathieu-Daudé, 2020/07/04
- [PATCH v3 16/16] block/nvme: Use per-queuepair IRQ notifier and AIO context, Philippe Mathieu-Daudé, 2020/07/04