[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH-for-5.2 v2 05/25] block/nvme: Trace nvme_poll_queue() per queue
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH-for-5.2 v2 05/25] block/nvme: Trace nvme_poll_queue() per queue |
Date: |
Thu, 29 Oct 2020 10:32:46 +0100 |
As we want to enable multiple queues, report the event
in each nvme_poll_queue() call, rather than once in
the callback calling nvme_poll_queues().
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
block/nvme.c | 2 +-
block/trace-events | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index 361b5772b7a..8d74401ae7a 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -594,6 +594,7 @@ static bool nvme_poll_queue(NVMeQueuePair *q)
const size_t cqe_offset = q->cq.head * NVME_CQ_ENTRY_BYTES;
NvmeCqe *cqe = (NvmeCqe *)&q->cq.queue[cqe_offset];
+ trace_nvme_poll_queue(q->s, q->index);
/*
* Do an early check for completions. q->lock isn't needed because
* nvme_process_completion() only runs in the event loop thread and
@@ -684,7 +685,6 @@ static bool nvme_poll_cb(void *opaque)
BDRVNVMeState *s = container_of(e, BDRVNVMeState,
irq_notifier[MSIX_SHARED_IRQ_IDX]);
- trace_nvme_poll_cb(s);
return nvme_poll_queues(s);
}
diff --git a/block/trace-events b/block/trace-events
index b90b07b15fa..86292f3312b 100644
--- a/block/trace-events
+++ b/block/trace-events
@@ -145,7 +145,7 @@ nvme_complete_command(void *s, int index, int cid) "s %p
queue %d cid %d"
nvme_submit_command(void *s, int index, int cid) "s %p queue %d cid %d"
nvme_submit_command_raw(int c0, int c1, int c2, int c3, int c4, int c5, int
c6, int c7) "%02x %02x %02x %02x %02x %02x %02x %02x"
nvme_handle_event(void *s) "s %p"
-nvme_poll_cb(void *s) "s %p"
+nvme_poll_queue(void *s, unsigned q_index) "s %p q #%u"
nvme_prw_aligned(void *s, int is_write, uint64_t offset, uint64_t bytes, int
flags, int niov) "s %p is_write %d offset 0x%"PRIx64" bytes %"PRId64" flags %d
niov %d"
nvme_write_zeroes(void *s, uint64_t offset, uint64_t bytes, int flags) "s %p
offset 0x%"PRIx64" bytes %"PRId64" flags %d"
nvme_qiov_unaligned(const void *qiov, int n, void *base, size_t size, int
align) "qiov %p n %d base %p size 0x%zx align 0x%x"
--
2.26.2
- [PATCH-for-5.2 v2 00/25] block/nvme: Fix Aarch64 or big-endian hosts, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 01/25] MAINTAINERS: Cover 'block/nvme.h' file, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 02/25] block/nvme: Use hex format to display offset in trace events, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 03/25] block/nvme: Report warning with warn_report(), Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 04/25] block/nvme: Trace controller capabilities, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 05/25] block/nvme: Trace nvme_poll_queue() per queue,
Philippe Mathieu-Daudé <=
- [PATCH-for-5.2 v2 06/25] block/nvme: Improve nvme_free_req_queue_wait() trace information, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 07/25] block/nvme: Trace queue pair creation/deletion, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 08/25] block/nvme: Move definitions before structure declarations, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 09/25] block/nvme: Use unsigned integer for queue counter/size, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 10/25] block/nvme: Make nvme_identify() return boolean indicating error, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 11/25] block/nvme: Make nvme_init_queue() return boolean indicating error, Philippe Mathieu-Daudé, 2020/10/29
- [PATCH-for-5.2 v2 12/25] block/nvme: Introduce Completion Queue definitions, Philippe Mathieu-Daudé, 2020/10/29