[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 09/15] block: add trace events for io_uring
From: |
Stefan Hajnoczi |
Subject: |
[PATCH v4 09/15] block: add trace events for io_uring |
Date: |
Tue, 14 Jan 2020 10:59:15 +0000 |
From: Aarushi Mehta <address@hidden>
Signed-off-by: Aarushi Mehta <address@hidden>
Acked-by: Stefano Garzarella <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/io_uring.c | 23 ++++++++++++++++++++---
block/trace-events | 12 ++++++++++++
2 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/block/io_uring.c b/block/io_uring.c
index bb433a685b..a5c0d16220 100644
--- a/block/io_uring.c
+++ b/block/io_uring.c
@@ -17,6 +17,7 @@
#include "block/raw-aio.h"
#include "qemu/coroutine.h"
#include "qapi/error.h"
+#include "trace.h"
/* io_uring ring size */
#define MAX_ENTRIES 128
@@ -85,6 +86,8 @@ static void luring_resubmit_short_read(LuringState *s,
LuringAIOCB *luringcb,
QEMUIOVector *resubmit_qiov;
size_t remaining;
+ trace_luring_resubmit_short_read(s, luringcb, nread);
+
/* Update read position */
luringcb->total_read = nread;
remaining = luringcb->qiov->size - luringcb->total_read;
@@ -156,6 +159,7 @@ static void luring_process_completions(LuringState *s)
/* Change counters one-by-one because we can be nested. */
s->io_q.in_flight--;
+ trace_luring_process_completion(s, luringcb, ret);
/* total_read is non-zero only for resubmitted read requests */
total_bytes = ret + luringcb->total_read;
@@ -224,6 +228,7 @@ static int ioq_submit(LuringState *s)
QSIMPLEQ_REMOVE_HEAD(&s->io_q.submit_queue, next);
}
ret = io_uring_submit(&s->ring);
+ trace_luring_io_uring_submit(s, ret);
/* Prevent infinite loop if submission is refused */
if (ret <= 0) {
if (ret == -EAGAIN) {
@@ -280,12 +285,15 @@ static void ioq_init(LuringQueue *io_q)
void luring_io_plug(BlockDriverState *bs, LuringState *s)
{
+ trace_luring_io_plug(s);
s->io_q.plugged++;
}
void luring_io_unplug(BlockDriverState *bs, LuringState *s)
{
assert(s->io_q.plugged);
+ trace_luring_io_unplug(s, s->io_q.blocked, s->io_q.plugged,
+ s->io_q.in_queue, s->io_q.in_flight);
if (--s->io_q.plugged == 0 &&
!s->io_q.blocked && s->io_q.in_queue > 0) {
ioq_submit(s);
@@ -306,6 +314,7 @@ void luring_io_unplug(BlockDriverState *bs, LuringState *s)
static int luring_do_submit(int fd, LuringAIOCB *luringcb, LuringState *s,
uint64_t offset, int type)
{
+ int ret;
struct io_uring_sqe *sqes = &luringcb->sqeq;
switch (type) {
@@ -329,11 +338,14 @@ static int luring_do_submit(int fd, LuringAIOCB
*luringcb, LuringState *s,
QSIMPLEQ_INSERT_TAIL(&s->io_q.submit_queue, luringcb, next);
s->io_q.in_queue++;
-
+ trace_luring_do_submit(s, s->io_q.blocked, s->io_q.plugged,
+ s->io_q.in_queue, s->io_q.in_flight);
if (!s->io_q.blocked &&
(!s->io_q.plugged ||
s->io_q.in_flight + s->io_q.in_queue >= MAX_ENTRIES)) {
- return ioq_submit(s);
+ ret = ioq_submit(s);
+ trace_luring_do_submit_done(s, ret);
+ return ret;
}
return 0;
}
@@ -348,8 +360,10 @@ int coroutine_fn luring_co_submit(BlockDriverState *bs,
LuringState *s, int fd,
.qiov = qiov,
.is_read = (type == QEMU_AIO_READ),
};
-
+ trace_luring_co_submit(bs, s, &luringcb, fd, offset, qiov ? qiov->size : 0,
+ type);
ret = luring_do_submit(fd, &luringcb, s, offset, type);
+
if (ret < 0) {
return ret;
}
@@ -382,6 +396,8 @@ LuringState *luring_init(Error **errp)
LuringState *s = g_new0(LuringState, 1);
struct io_uring *ring = &s->ring;
+ trace_luring_init_state(s, sizeof(*s));
+
rc = io_uring_queue_init(MAX_ENTRIES, ring, 0);
if (rc < 0) {
error_setg_errno(errp, errno, "failed to init linux io_uring ring");
@@ -398,4 +414,5 @@ void luring_cleanup(LuringState *s)
{
io_uring_queue_exit(&s->ring);
g_free(s);
+ trace_luring_cleanup_state(s);
}
diff --git a/block/trace-events b/block/trace-events
index 6ba86decca..1a7329b736 100644
--- a/block/trace-events
+++ b/block/trace-events
@@ -63,6 +63,18 @@ qmp_block_stream(void *bs) "bs %p"
file_paio_submit(void *acb, void *opaque, int64_t offset, int count, int type)
"acb %p opaque %p offset %"PRId64" count %d type %d"
file_copy_file_range(void *bs, int src, int64_t src_off, int dst, int64_t
dst_off, int64_t bytes, int flags, int64_t ret) "bs %p src_fd %d offset
%"PRIu64" dst_fd %d offset %"PRIu64" bytes %"PRIu64" flags %d ret %"PRId64
+#io_uring.c
+luring_init_state(void *s, size_t size) "s %p size %zu"
+luring_cleanup_state(void *s) "%p freed"
+luring_io_plug(void *s) "LuringState %p plug"
+luring_io_unplug(void *s, int blocked, int plugged, int queued, int inflight)
"LuringState %p blocked %d plugged %d queued %d inflight %d"
+luring_do_submit(void *s, int blocked, int plugged, int queued, int inflight)
"LuringState %p blocked %d plugged %d queued %d inflight %d"
+luring_do_submit_done(void *s, int ret) "LuringState %p submitted to kernel %d"
+luring_co_submit(void *bs, void *s, void *luringcb, int fd, uint64_t offset,
size_t nbytes, int type) "bs %p s %p luringcb %p fd %d offset %" PRId64 "
nbytes %zd type %d"
+luring_process_completion(void *s, void *aiocb, int ret) "LuringState %p
luringcb %p ret %d"
+luring_io_uring_submit(void *s, int ret) "LuringState %p ret %d"
+luring_resubmit_short_read(void *s, void *luringcb, int nread) "LuringState %p
luringcb %p nread %d"
+
# qcow2.c
qcow2_add_task(void *co, void *bs, void *pool, const char *action, int
cluster_type, uint64_t file_cluster_offset, uint64_t offset, uint64_t bytes,
void *qiov, size_t qiov_offset) "co %p bs %p pool %p: %s: cluster_type %d
file_cluster_offset %" PRIu64 " offset %" PRIu64 " bytes %" PRIu64 " qiov %p
qiov_offset %zu"
qcow2_writev_start_req(void *co, int64_t offset, int bytes) "co %p offset 0x%"
PRIx64 " bytes %d"
--
2.24.1
- [PATCH v4 00/15] io_uring: add Linux io_uring AIO engine, Stefan Hajnoczi, 2020/01/14
- [PATCH v4 01/15] configure: permit use of io_uring, Stefan Hajnoczi, 2020/01/14
- [PATCH v4 02/15] qapi/block-core: add option for io_uring, Stefan Hajnoczi, 2020/01/14
- [PATCH v4 03/15] block/block: add BDRV flag for io_uring, Stefan Hajnoczi, 2020/01/14
- [PATCH v4 04/15] block/io_uring: implements interfaces for io_uring, Stefan Hajnoczi, 2020/01/14
- [PATCH v4 05/15] stubs: add stubs for io_uring interface, Stefan Hajnoczi, 2020/01/14
- [PATCH v4 06/15] util/async: add aio interfaces for io_uring, Stefan Hajnoczi, 2020/01/14
- [PATCH v4 07/15] blockdev: adds bdrv_parse_aio to use io_uring, Stefan Hajnoczi, 2020/01/14
- [PATCH v4 08/15] block/file-posix.c: extend to use io_uring, Stefan Hajnoczi, 2020/01/14
- [PATCH v4 11/15] qemu-io: adds option to use aio engine, Stefan Hajnoczi, 2020/01/14
- [PATCH v4 09/15] block: add trace events for io_uring,
Stefan Hajnoczi <=
- [PATCH v4 10/15] block/io_uring: adds userspace completion polling, Stefan Hajnoczi, 2020/01/14
- [PATCH v4 12/15] qemu-img: adds option to use aio engine for benchmarking, Stefan Hajnoczi, 2020/01/14
- [PATCH v4 13/15] qemu-nbd: adds option for aio engines, Stefan Hajnoczi, 2020/01/14
- [PATCH v4 14/15] tests/qemu-iotests: enable testing with aio options, Stefan Hajnoczi, 2020/01/14
- [PATCH v4 15/15] tests/qemu-iotests: use AIOMODE with various tests, Stefan Hajnoczi, 2020/01/14
- Re: [PATCH v4 00/15] io_uring: add Linux io_uring AIO engine, Stefan Hajnoczi, 2020/01/20