[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/15] block/nvme: Improve nvme_free_req_queue_wait() trace infor
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 04/15] block/nvme: Improve nvme_free_req_queue_wait() trace information |
Date: |
Wed, 14 Oct 2020 17:57:59 +0200 |
What we want to trace is the block driver state and the queue index.
Suggested-by: Stefan Hajnoczi <stefanha@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 d84206b598d..e9410f2e0eb 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -286,7 +286,7 @@ static NVMeRequest *nvme_get_free_req(NVMeQueuePair *q)
while (q->free_req_head == -1) {
if (qemu_in_coroutine()) {
- trace_nvme_free_req_queue_wait(q);
+ trace_nvme_free_req_queue_wait(q->s, q->index);
qemu_co_queue_wait(&q->free_req_queue, &q->lock);
} else {
qemu_mutex_unlock(&q->lock);
diff --git a/block/trace-events b/block/trace-events
index 3bb5a238601..410789188cc 100644
--- a/block/trace-events
+++ b/block/trace-events
@@ -152,7 +152,7 @@ nvme_rw_done(void *s, int is_write, uint64_t offset,
uint64_t bytes, int ret) "s
nvme_dsm(void *s, uint64_t offset, uint64_t bytes) "s %p offset %"PRId64"
bytes %"PRId64""
nvme_dsm_done(void *s, uint64_t offset, uint64_t bytes, int ret) "s %p offset
%"PRId64" bytes %"PRId64" ret %d"
nvme_dma_map_flush(void *s) "s %p"
-nvme_free_req_queue_wait(void *q) "q %p"
+nvme_free_req_queue_wait(void *s, unsigned q_index) "s %p q #%u"
nvme_cmd_map_qiov(void *s, void *cmd, void *req, void *qiov, int entries) "s
%p cmd %p req %p qiov %p entries %d"
nvme_cmd_map_qiov_pages(void *s, int i, uint64_t page) "s %p page[%d]
0x%"PRIx64
nvme_cmd_map_qiov_iov(void *s, int i, void *page, int pages) "s %p iov[%d] %p
pages %d"
--
2.26.2
- [PATCH 00/15] block/nvme: Improve debugging experience and minor fixes, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 01/15] block/nvme: Move nvme_poll_cb() earlier, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 02/15] block/nvme: Trace nvme_poll_queue() per queue, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 03/15] block/nvme: Use unsigned integer for queue counter/size, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 04/15] block/nvme: Improve nvme_free_req_queue_wait() trace information,
Philippe Mathieu-Daudé <=
- [PATCH 05/15] block/nvme: Trace queue pair creation/deletion, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 06/15] block/nvme: Make nvme_identify() return boolean indicating error, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 07/15] block/nvme: Make nvme_init_queue() return boolean indicating error, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 08/15] block/nvme: Pass AioContext argument to nvme_add_io_queue(), Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 09/15] block/nvme: Introduce Completion Queue definitions, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 10/15] block/nvme: Use definitions instead of magic values in add_io_queue(), Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 11/15] block/nvme: Trace controller capabilities, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 12/15] block/nvme: Simplify device reset, Philippe Mathieu-Daudé, 2020/10/14
- [PATCH 13/15] block/nvme: Simplify ADMIN queue access, Philippe Mathieu-Daudé, 2020/10/14