[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 17/17] block/nvme: Check BDRVNVMeState::plugged out of nvme_proce
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 17/17] block/nvme: Check BDRVNVMeState::plugged out of nvme_process_completion |
Date: |
Thu, 25 Jun 2020 20:48:38 +0200 |
The queues are tied to the hardware, not to the block driver.
As this function doesn't need to know about the BDRVNVMeState,
move the 'plugged' check to the caller.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
block/nvme.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index b335dfdb73..03658776f4 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -318,7 +318,7 @@ static inline int nvme_translate_error(const NvmeCqe *c)
}
/* With q->lock */
-static bool nvme_process_completion(BDRVNVMeState *s, NVMeQueuePair *q)
+static bool nvme_process_completion(NVMeQueuePair *q)
{
bool progress = false;
NVMeRequest *preq;
@@ -326,7 +326,7 @@ static bool nvme_process_completion(BDRVNVMeState *s,
NVMeQueuePair *q)
NvmeCqe *c;
trace_nvme_process_completion(q->index, q->inflight);
- if (q->busy || s->plugged) {
+ if (q->busy) {
trace_nvme_process_completion_queue_busy(q->index);
return false;
}
@@ -408,8 +408,8 @@ static void nvme_submit_command(BDRVNVMeState *s,
NVMeQueuePair *q,
q->need_kick++;
if (!s->plugged) {
nvme_kick(q);
+ nvme_process_completion(q);
}
- nvme_process_completion(s, q);
qemu_mutex_unlock(&q->lock);
}
@@ -529,10 +529,13 @@ static bool nvme_poll_queues(BDRVNVMeState *s)
bool progress = false;
int i;
+ if (s->plugged) {
+ return false;
+ }
for (i = 0; i < s->nr_queues; i++) {
NVMeQueuePair *q = s->queues[i];
qemu_mutex_lock(&q->lock);
- while (nvme_process_completion(s, q)) {
+ while (nvme_process_completion(q)) {
/* Keep polling */
progress = true;
}
@@ -1314,7 +1317,7 @@ static void nvme_aio_unplug(BlockDriverState *bs)
NVMeQueuePair *q = s->queues[i];
qemu_mutex_lock(&q->lock);
nvme_kick(q);
- nvme_process_completion(s, q);
+ nvme_process_completion(q);
qemu_mutex_unlock(&q->lock);
}
}
--
2.21.3
- Re: [PATCH 12/17] block/nvme: Simplify nvme_kick trace event, (continued)
- [PATCH 13/17] block/nvme: Simplify completion trace events, Philippe Mathieu-Daudé, 2020/06/25
- [PATCH 14/17] block/nvme: Replace BDRV_POLL_WHILE by AIO_WAIT_WHILE, Philippe Mathieu-Daudé, 2020/06/25
- [RFC PATCH 15/17] block/nvme: Use per-queue AIO context, Philippe Mathieu-Daudé, 2020/06/25
- [PATCH 16/17] block/nvme: Check BDRVNVMeState::plugged out of nvme_kick(), Philippe Mathieu-Daudé, 2020/06/25
- [PATCH 17/17] block/nvme: Check BDRVNVMeState::plugged out of nvme_process_completion,
Philippe Mathieu-Daudé <=
- Re: [PATCH 00/17] block/nvme: Various cleanups required to use multiple queues, no-reply, 2020/06/25