[Qemu-devel] [PATCH v5 09/12] block: add trace events for io_uring
Signed-off-by: Aarushi Mehta --- block/io_uring.c | 14 -- block/trace-events | 8 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/block/io_uring.c b/block/io_uring.c index f327c7ef96..47e027364a 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" #define MAX_EVENTS 128 @@ -191,12 +192,15 @@ static int ioq_submit(LuringState *s) void luring_io_plug(BlockDriverState *bs, LuringState *s) { +trace_luring_io_plug(); s->io_q.plugged++; } void luring_io_unplug(BlockDriverState *bs, LuringState *s) { assert(s->io_q.plugged); +trace_luring_io_unplug(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); @@ -217,6 +221,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 = io_uring_get_sqe(&s->ring); if (!sqes) { sqes = &luringcb->sqeq; @@ -242,11 +247,14 @@ static int luring_do_submit(int fd, LuringAIOCB *luringcb, LuringState *s, } io_uring_sqe_set_data(sqes, luringcb); s->io_q.in_queue++; - +trace_luring_do_submit(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_EVENTS)) { -return ioq_submit(s); +ret = ioq_submit(s); +trace_luring_do_submit_done(ret); +return ret; } return 0; } @@ -294,6 +302,7 @@ LuringState *luring_init(Error **errp) int rc; LuringState *s; s = g_malloc0(sizeof(*s)); +trace_luring_init_state((void *)s, sizeof(*s)); struct io_uring *ring = &s->ring; rc = io_uring_queue_init(MAX_EVENTS, ring, 0); if (rc < 0) { @@ -311,4 +320,5 @@ void luring_cleanup(LuringState *s) { io_uring_queue_exit(&s->ring); g_free(s); +trace_luring_cleanup_state(); } diff --git a/block/trace-events b/block/trace-events index eab51497fc..c4564dcd96 100644 --- a/block/trace-events +++ b/block/trace-events @@ -60,6 +60,14 @@ qmp_block_stream(void *bs, void *job) "bs %p job %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 freed" +disable luring_io_plug(void) "plug" +disable luring_io_unplug(int blocked, int plugged, int queued, int inflight) "blocked %d plugged %d queued %d inflight %d" +disable luring_do_submit(int blocked, int plugged, int queued, int inflight) "blocked %d plugged %d queued %d inflight %d" +disable luring_do_submit_done(int ret) "submitted to kernel %d" + # qcow2.c qcow2_writev_start_req(void *co, int64_t offset, int bytes) "co %p offset 0x%" PRIx64 " bytes %d" qcow2_writev_done_req(void *co, int ret) "co %p ret %d" -- 2.17.1
Re: [Qemu-devel] [PATCH v5 09/12] block: add trace events for io_uring
On Mon, Jun 10, 2019 at 07:19:02PM +0530, Aarushi Mehta wrote: > @@ -294,6 +302,7 @@ LuringState *luring_init(Error **errp) > int rc; > LuringState *s; > s = g_malloc0(sizeof(*s)); > +trace_luring_init_state((void *)s, sizeof(*s)); In C conversion to void * is automatic and doesn't need to be done manually. > diff --git a/block/trace-events b/block/trace-events > index eab51497fc..c4564dcd96 100644 > --- a/block/trace-events > +++ b/block/trace-events > @@ -60,6 +60,14 @@ qmp_block_stream(void *bs, void *job) "bs %p job %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 freed" > +disable luring_io_plug(void) "plug" > +disable luring_io_unplug(int blocked, int plugged, int queued, int inflight) > "blocked %d plugged %d queued %d inflight %d" > +disable luring_do_submit(int blocked, int plugged, int queued, int inflight) > "blocked %d plugged %d queued %d inflight %d" > +disable luring_do_submit_done(int ret) "submitted to kernel %d" Why are these disabled? "disable" compiles them out and they won't be available at runtime. "disable" should probably be dropped here. Please include the LuringState *s pointer in trace events since there can be multiple LuringStates at any given time and it should be possible to correlate trace events. signature.asc Description: PGP signature
Re: [Qemu-devel] [PATCH v5 09/12] block: add trace events for io_uring
On Mon, 06/10 19:19, Aarushi Mehta wrote: > Signed-off-by: Aarushi Mehta > --- > block/io_uring.c | 14 -- > block/trace-events | 8 > 2 files changed, 20 insertions(+), 2 deletions(-) > > diff --git a/block/io_uring.c b/block/io_uring.c > index f327c7ef96..47e027364a 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" > > #define MAX_EVENTS 128 > > @@ -191,12 +192,15 @@ static int ioq_submit(LuringState *s) > > void luring_io_plug(BlockDriverState *bs, LuringState *s) > { > +trace_luring_io_plug(); > s->io_q.plugged++; > } > > void luring_io_unplug(BlockDriverState *bs, LuringState *s) > { > assert(s->io_q.plugged); > +trace_luring_io_unplug(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); > @@ -217,6 +221,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 = io_uring_get_sqe(&s->ring); > if (!sqes) { > sqes = &luringcb->sqeq; > @@ -242,11 +247,14 @@ static int luring_do_submit(int fd, LuringAIOCB > *luringcb, LuringState *s, > } > io_uring_sqe_set_data(sqes, luringcb); > s->io_q.in_queue++; > - > +trace_luring_do_submit(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_EVENTS)) { > -return ioq_submit(s); > +ret = ioq_submit(s); > +trace_luring_do_submit_done(ret); > +return ret; > } > return 0; > } > @@ -294,6 +302,7 @@ LuringState *luring_init(Error **errp) > int rc; > LuringState *s; > s = g_malloc0(sizeof(*s)); > +trace_luring_init_state((void *)s, sizeof(*s)); The pointer type cast is unnecessary. > struct io_uring *ring = &s->ring; > rc = io_uring_queue_init(MAX_EVENTS, ring, 0); > if (rc < 0) { > @@ -311,4 +320,5 @@ void luring_cleanup(LuringState *s) > { > io_uring_queue_exit(&s->ring); > g_free(s); > +trace_luring_cleanup_state(); Pass @s? > } > diff --git a/block/trace-events b/block/trace-events > index eab51497fc..c4564dcd96 100644 > --- a/block/trace-events > +++ b/block/trace-events > @@ -60,6 +60,14 @@ qmp_block_stream(void *bs, void *job) "bs %p job %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 freed" > +disable luring_io_plug(void) "plug" > +disable luring_io_unplug(int blocked, int plugged, int queued, int inflight) > "blocked %d plugged %d queued %d inflight %d" > +disable luring_do_submit(int blocked, int plugged, int queued, int inflight) > "blocked %d plugged %d queued %d inflight %d" > +disable luring_do_submit_done(int ret) "submitted to kernel %d" > + > # qcow2.c > qcow2_writev_start_req(void *co, int64_t offset, int bytes) "co %p offset > 0x%" PRIx64 " bytes %d" > qcow2_writev_done_req(void *co, int ret) "co %p ret %d" > -- > 2.17.1 > Fam