* [PATCH for-next 0/3] io_uring trace events clean up
@ 2022-06-16 12:57 Pavel Begunkov
2022-06-16 12:57 ` [PATCH for-next 1/3] io_uring: kill extra io_uring_types.h includes Pavel Begunkov
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Pavel Begunkov @ 2022-06-16 12:57 UTC (permalink / raw)
To: io-uring; +Cc: Jens Axboe, asml.silence
Make io_uring_types.h public and teach tracing how to derive
opcode, user_data, etc. from io_kiocb.
note: rebased on top of the hashing patches
Pavel Begunkov (3):
io_uring: kill extra io_uring_types.h includes
io_uring: make io_uring_types.h public
io_uring: clean up tracing events
{io_uring => include/linux}/io_uring_types.h | 28 ++++-
include/trace/events/io_uring.h | 118 +++++++------------
io_uring/advise.c | 1 -
io_uring/cancel.c | 1 -
io_uring/epoll.c | 1 -
io_uring/fdinfo.c | 1 -
io_uring/filetable.c | 1 -
io_uring/filetable.h | 11 --
io_uring/fs.c | 1 -
io_uring/io-wq.h | 17 +--
io_uring/io_uring.c | 17 +--
io_uring/io_uring.h | 4 +-
io_uring/kbuf.c | 1 -
io_uring/msg_ring.c | 1 -
io_uring/net.c | 1 -
io_uring/nop.c | 1 -
io_uring/opdef.c | 1 -
io_uring/openclose.c | 1 -
io_uring/poll.c | 6 +-
io_uring/refs.h | 2 +-
io_uring/rsrc.c | 1 -
io_uring/rw.c | 1 -
io_uring/splice.c | 1 -
io_uring/sqpoll.c | 1 -
io_uring/statx.c | 1 -
io_uring/sync.c | 1 -
io_uring/tctx.c | 1 -
io_uring/timeout.c | 4 +-
io_uring/uring_cmd.c | 1 -
io_uring/xattr.c | 1 -
30 files changed, 85 insertions(+), 143 deletions(-)
rename {io_uring => include/linux}/io_uring_types.h (96%)
--
2.36.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH for-next 1/3] io_uring: kill extra io_uring_types.h includes
2022-06-16 12:57 [PATCH for-next 0/3] io_uring trace events clean up Pavel Begunkov
@ 2022-06-16 12:57 ` Pavel Begunkov
2022-06-16 12:57 ` [PATCH for-next 2/3] io_uring: make io_uring_types.h public Pavel Begunkov
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Pavel Begunkov @ 2022-06-16 12:57 UTC (permalink / raw)
To: io-uring; +Cc: Jens Axboe, asml.silence
io_uring/io_uring.h already includes io_uring_types.h, no need to
include it every time. Kill it in a bunch of places, it prepares us for
following patches.
Signed-off-by: Pavel Begunkov <[email protected]>
---
io_uring/advise.c | 1 -
io_uring/cancel.c | 1 -
io_uring/epoll.c | 1 -
io_uring/fdinfo.c | 1 -
io_uring/filetable.c | 1 -
io_uring/fs.c | 1 -
io_uring/io_uring.c | 1 -
io_uring/kbuf.c | 1 -
io_uring/msg_ring.c | 1 -
io_uring/net.c | 1 -
io_uring/nop.c | 1 -
io_uring/opdef.c | 1 -
io_uring/openclose.c | 1 -
io_uring/poll.c | 1 -
io_uring/rsrc.c | 1 -
io_uring/rw.c | 1 -
io_uring/splice.c | 1 -
io_uring/sqpoll.c | 1 -
io_uring/statx.c | 1 -
io_uring/sync.c | 1 -
io_uring/tctx.c | 1 -
io_uring/timeout.c | 1 -
io_uring/uring_cmd.c | 1 -
io_uring/xattr.c | 1 -
24 files changed, 24 deletions(-)
diff --git a/io_uring/advise.c b/io_uring/advise.c
index 8870fdf66ffb..581956934c0b 100644
--- a/io_uring/advise.c
+++ b/io_uring/advise.c
@@ -11,7 +11,6 @@
#include <uapi/linux/fadvise.h>
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "advise.h"
diff --git a/io_uring/cancel.c b/io_uring/cancel.c
index f07bfd27c98a..d1e7f5a955ab 100644
--- a/io_uring/cancel.c
+++ b/io_uring/cancel.c
@@ -10,7 +10,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "tctx.h"
#include "poll.h"
diff --git a/io_uring/epoll.c b/io_uring/epoll.c
index 10853e8ed078..a8b794471d6b 100644
--- a/io_uring/epoll.c
+++ b/io_uring/epoll.c
@@ -9,7 +9,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "epoll.h"
diff --git a/io_uring/fdinfo.c b/io_uring/fdinfo.c
index 344e7d90d557..61c35707a6cf 100644
--- a/io_uring/fdinfo.c
+++ b/io_uring/fdinfo.c
@@ -9,7 +9,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "sqpoll.h"
#include "fdinfo.h"
diff --git a/io_uring/filetable.c b/io_uring/filetable.c
index e449ceb9a848..534e1a3c625d 100644
--- a/io_uring/filetable.c
+++ b/io_uring/filetable.c
@@ -9,7 +9,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "rsrc.h"
#include "filetable.h"
diff --git a/io_uring/fs.c b/io_uring/fs.c
index aac1bc5255b0..0de4f549bb7d 100644
--- a/io_uring/fs.c
+++ b/io_uring/fs.c
@@ -12,7 +12,6 @@
#include "../fs/internal.h"
-#include "io_uring_types.h"
#include "io_uring.h"
#include "fs.h"
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index d256a611be4e..6ade0ec91979 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -80,7 +80,6 @@
#include "io-wq.h"
-#include "io_uring_types.h"
#include "io_uring.h"
#include "opdef.h"
#include "refs.h"
diff --git a/io_uring/kbuf.c b/io_uring/kbuf.c
index 223d9db2ba94..e8931e0b3e4a 100644
--- a/io_uring/kbuf.c
+++ b/io_uring/kbuf.c
@@ -10,7 +10,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "opdef.h"
#include "kbuf.h"
diff --git a/io_uring/msg_ring.c b/io_uring/msg_ring.c
index 3b89f9a0a0b4..1f2de3534932 100644
--- a/io_uring/msg_ring.c
+++ b/io_uring/msg_ring.c
@@ -7,7 +7,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "msg_ring.h"
diff --git a/io_uring/net.c b/io_uring/net.c
index 207803758222..cd931dae1313 100644
--- a/io_uring/net.c
+++ b/io_uring/net.c
@@ -10,7 +10,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "kbuf.h"
#include "net.h"
diff --git a/io_uring/nop.c b/io_uring/nop.c
index d363d8ce70a3..d956599a3c1b 100644
--- a/io_uring/nop.c
+++ b/io_uring/nop.c
@@ -7,7 +7,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "nop.h"
diff --git a/io_uring/opdef.c b/io_uring/opdef.c
index 2b6d133d845a..a5478cbf742d 100644
--- a/io_uring/opdef.c
+++ b/io_uring/opdef.c
@@ -8,7 +8,6 @@
#include <linux/file.h>
#include <linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "opdef.h"
#include "refs.h"
diff --git a/io_uring/openclose.c b/io_uring/openclose.c
index 1cbf39030970..099a5ec84dfd 100644
--- a/io_uring/openclose.c
+++ b/io_uring/openclose.c
@@ -12,7 +12,6 @@
#include "../fs/internal.h"
-#include "io_uring_types.h"
#include "io_uring.h"
#include "rsrc.h"
#include "openclose.h"
diff --git a/io_uring/poll.c b/io_uring/poll.c
index 2e068e05732a..76828bce8653 100644
--- a/io_uring/poll.c
+++ b/io_uring/poll.c
@@ -13,7 +13,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "refs.h"
#include "opdef.h"
diff --git a/io_uring/rsrc.c b/io_uring/rsrc.c
index fd1323482030..2f893e3f5c15 100644
--- a/io_uring/rsrc.c
+++ b/io_uring/rsrc.c
@@ -12,7 +12,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "openclose.h"
#include "rsrc.h"
diff --git a/io_uring/rw.c b/io_uring/rw.c
index 818692a83d75..f5567d52d2af 100644
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -14,7 +14,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "opdef.h"
#include "kbuf.h"
diff --git a/io_uring/splice.c b/io_uring/splice.c
index 0e19d6330345..b013ba34bffa 100644
--- a/io_uring/splice.c
+++ b/io_uring/splice.c
@@ -11,7 +11,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "splice.h"
diff --git a/io_uring/sqpoll.c b/io_uring/sqpoll.c
index 149d5c976f14..76d4d70c733a 100644
--- a/io_uring/sqpoll.c
+++ b/io_uring/sqpoll.c
@@ -14,7 +14,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "sqpoll.h"
diff --git a/io_uring/statx.c b/io_uring/statx.c
index 83b15687e9c5..6056cd7f4876 100644
--- a/io_uring/statx.c
+++ b/io_uring/statx.c
@@ -8,7 +8,6 @@
#include "../fs/internal.h"
-#include "io_uring_types.h"
#include "io_uring.h"
#include "statx.h"
diff --git a/io_uring/sync.c b/io_uring/sync.c
index 9ee8ff865521..f2102afa79ca 100644
--- a/io_uring/sync.c
+++ b/io_uring/sync.c
@@ -11,7 +11,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "sync.h"
diff --git a/io_uring/tctx.c b/io_uring/tctx.c
index 012be261dc50..a3bfbe5b6b72 100644
--- a/io_uring/tctx.c
+++ b/io_uring/tctx.c
@@ -9,7 +9,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "tctx.h"
diff --git a/io_uring/timeout.c b/io_uring/timeout.c
index 526fc8b2e3b6..f9df359813c9 100644
--- a/io_uring/timeout.c
+++ b/io_uring/timeout.c
@@ -8,7 +8,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "refs.h"
#include "cancel.h"
diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c
index 5fb95767ceaf..233e137f8c6d 100644
--- a/io_uring/uring_cmd.c
+++ b/io_uring/uring_cmd.c
@@ -6,7 +6,6 @@
#include <uapi/linux/io_uring.h>
-#include "io_uring_types.h"
#include "io_uring.h"
#include "uring_cmd.h"
diff --git a/io_uring/xattr.c b/io_uring/xattr.c
index 79adf4efba01..b179f9acd5ac 100644
--- a/io_uring/xattr.c
+++ b/io_uring/xattr.c
@@ -13,7 +13,6 @@
#include "../fs/internal.h"
-#include "io_uring_types.h"
#include "io_uring.h"
#include "xattr.h"
--
2.36.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH for-next 2/3] io_uring: make io_uring_types.h public
2022-06-16 12:57 [PATCH for-next 0/3] io_uring trace events clean up Pavel Begunkov
2022-06-16 12:57 ` [PATCH for-next 1/3] io_uring: kill extra io_uring_types.h includes Pavel Begunkov
@ 2022-06-16 12:57 ` Pavel Begunkov
2022-06-16 12:57 ` [PATCH for-next 3/3] io_uring: clean up tracing events Pavel Begunkov
2022-06-17 13:35 ` [PATCH for-next 0/3] io_uring trace events clean up Jens Axboe
3 siblings, 0 replies; 5+ messages in thread
From: Pavel Begunkov @ 2022-06-16 12:57 UTC (permalink / raw)
To: io-uring; +Cc: Jens Axboe, asml.silence
Move io_uring types to linux/include, need them public so tracing can
see the definitions and we can clean trace/events/io_uring.h
Signed-off-by: Pavel Begunkov <[email protected]>
---
{io_uring => include/linux}/io_uring_types.h | 28 ++++++++++++++++++--
io_uring/filetable.h | 11 --------
io_uring/io-wq.h | 17 +-----------
io_uring/io_uring.h | 4 ++-
io_uring/refs.h | 2 +-
5 files changed, 31 insertions(+), 31 deletions(-)
rename {io_uring => include/linux}/io_uring_types.h (96%)
diff --git a/io_uring/io_uring_types.h b/include/linux/io_uring_types.h
similarity index 96%
rename from io_uring/io_uring_types.h
rename to include/linux/io_uring_types.h
index 65ac7cdaaa73..779c72da5b8f 100644
--- a/io_uring/io_uring_types.h
+++ b/include/linux/io_uring_types.h
@@ -6,8 +6,32 @@
#include <linux/bitmap.h>
#include <uapi/linux/io_uring.h>
-#include "io-wq.h"
-#include "filetable.h"
+struct io_wq_work_node {
+ struct io_wq_work_node *next;
+};
+
+struct io_wq_work_list {
+ struct io_wq_work_node *first;
+ struct io_wq_work_node *last;
+};
+
+struct io_wq_work {
+ struct io_wq_work_node list;
+ unsigned flags;
+ /* place it here instead of io_kiocb as it fills padding and saves 4B */
+ int cancel_seq;
+};
+
+struct io_fixed_file {
+ /* file * with additional FFS_* flags */
+ unsigned long file_ptr;
+};
+
+struct io_file_table {
+ struct io_fixed_file *files;
+ unsigned long *bitmap;
+ unsigned int alloc_hint;
+};
struct io_hash_bucket {
spinlock_t lock;
diff --git a/io_uring/filetable.h b/io_uring/filetable.h
index c404360f7090..6b58aa48bc45 100644
--- a/io_uring/filetable.h
+++ b/io_uring/filetable.h
@@ -22,17 +22,6 @@ struct io_kiocb;
#endif
#define FFS_MASK ~(FFS_NOWAIT|FFS_ISREG|FFS_SCM)
-struct io_fixed_file {
- /* file * with additional FFS_* flags */
- unsigned long file_ptr;
-};
-
-struct io_file_table {
- struct io_fixed_file *files;
- unsigned long *bitmap;
- unsigned int alloc_hint;
-};
-
bool io_alloc_file_tables(struct io_file_table *table, unsigned nr_files);
void io_free_file_tables(struct io_file_table *table);
diff --git a/io_uring/io-wq.h b/io_uring/io-wq.h
index 3f54ee2a8eeb..10b80ef78bb8 100644
--- a/io_uring/io-wq.h
+++ b/io_uring/io-wq.h
@@ -2,6 +2,7 @@
#define INTERNAL_IO_WQ_H
#include <linux/refcount.h>
+#include <linux/io_uring_types.h>
struct io_wq;
@@ -20,15 +21,6 @@ enum io_wq_cancel {
IO_WQ_CANCEL_NOTFOUND, /* work not found */
};
-struct io_wq_work_node {
- struct io_wq_work_node *next;
-};
-
-struct io_wq_work_list {
- struct io_wq_work_node *first;
- struct io_wq_work_node *last;
-};
-
#define wq_list_for_each(pos, prv, head) \
for (pos = (head)->first, prv = NULL; pos; prv = pos, pos = (pos)->next)
@@ -152,13 +144,6 @@ struct io_wq_work_node *wq_stack_extract(struct io_wq_work_node *stack)
return node;
}
-struct io_wq_work {
- struct io_wq_work_node list;
- unsigned flags;
- /* place it here instead of io_kiocb as it fills padding and saves 4B */
- int cancel_seq;
-};
-
static inline struct io_wq_work *wq_next_work(struct io_wq_work *work)
{
if (!work->list.next)
diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h
index 3f6cad3d356c..16e46b09253a 100644
--- a/io_uring/io_uring.h
+++ b/io_uring/io_uring.h
@@ -3,7 +3,9 @@
#include <linux/errno.h>
#include <linux/lockdep.h>
-#include "io_uring_types.h"
+#include <linux/io_uring_types.h>
+#include "io-wq.h"
+#include "filetable.h"
#ifndef CREATE_TRACE_POINTS
#include <trace/events/io_uring.h>
diff --git a/io_uring/refs.h b/io_uring/refs.h
index 334c5ead4c43..1336de3f2a30 100644
--- a/io_uring/refs.h
+++ b/io_uring/refs.h
@@ -2,7 +2,7 @@
#define IOU_REQ_REF_H
#include <linux/atomic.h>
-#include "io_uring_types.h"
+#include <linux/io_uring_types.h>
/*
* Shamelessly stolen from the mm implementation of page reference checking,
--
2.36.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH for-next 3/3] io_uring: clean up tracing events
2022-06-16 12:57 [PATCH for-next 0/3] io_uring trace events clean up Pavel Begunkov
2022-06-16 12:57 ` [PATCH for-next 1/3] io_uring: kill extra io_uring_types.h includes Pavel Begunkov
2022-06-16 12:57 ` [PATCH for-next 2/3] io_uring: make io_uring_types.h public Pavel Begunkov
@ 2022-06-16 12:57 ` Pavel Begunkov
2022-06-17 13:35 ` [PATCH for-next 0/3] io_uring trace events clean up Jens Axboe
3 siblings, 0 replies; 5+ messages in thread
From: Pavel Begunkov @ 2022-06-16 12:57 UTC (permalink / raw)
To: io-uring; +Cc: Jens Axboe, asml.silence
We have lots of trace events accepting an io_uring request and wanting
to print some of its fields like user_data, opcode, flags and so on.
However, as trace points were unaware of io_uring structures, we had to
pass all the fields as arguments. Teach trace/events/io_uring.h about
struct io_kiocb and stop the misery of passing a horde of arguments to
trace helpers.
Signed-off-by: Pavel Begunkov <[email protected]>
---
include/trace/events/io_uring.h | 118 ++++++++++++--------------------
io_uring/io_uring.c | 16 ++---
io_uring/poll.c | 5 +-
io_uring/timeout.c | 3 +-
4 files changed, 54 insertions(+), 88 deletions(-)
diff --git a/include/trace/events/io_uring.h b/include/trace/events/io_uring.h
index 66fcc5a1a5b1..5635912e1013 100644
--- a/include/trace/events/io_uring.h
+++ b/include/trace/events/io_uring.h
@@ -7,6 +7,7 @@
#include <linux/tracepoint.h>
#include <uapi/linux/io_uring.h>
+#include <linux/io_uring_types.h>
#include <linux/io_uring.h>
struct io_wq_work;
@@ -97,9 +98,7 @@ TRACE_EVENT(io_uring_register,
/**
* io_uring_file_get - called before getting references to an SQE file
*
- * @ctx: pointer to a ring context structure
* @req: pointer to a submitted request
- * @user_data: user data associated with the request
* @fd: SQE file descriptor
*
* Allows to trace out how often an SQE file reference is obtained, which can
@@ -108,9 +107,9 @@ TRACE_EVENT(io_uring_register,
*/
TRACE_EVENT(io_uring_file_get,
- TP_PROTO(void *ctx, void *req, unsigned long long user_data, int fd),
+ TP_PROTO(struct io_kiocb *req, int fd),
- TP_ARGS(ctx, req, user_data, fd),
+ TP_ARGS(req, fd),
TP_STRUCT__entry (
__field( void *, ctx )
@@ -120,9 +119,9 @@ TRACE_EVENT(io_uring_file_get,
),
TP_fast_assign(
- __entry->ctx = ctx;
+ __entry->ctx = req->ctx;
__entry->req = req;
- __entry->user_data = user_data;
+ __entry->user_data = req->cqe.user_data;
__entry->fd = fd;
),
@@ -133,22 +132,16 @@ TRACE_EVENT(io_uring_file_get,
/**
* io_uring_queue_async_work - called before submitting a new async work
*
- * @ctx: pointer to a ring context structure
* @req: pointer to a submitted request
- * @user_data: user data associated with the request
- * @opcode: opcode of request
- * @flags request flags
- * @work: pointer to a submitted io_wq_work
* @rw: type of workqueue, hashed or normal
*
* Allows to trace asynchronous work submission.
*/
TRACE_EVENT(io_uring_queue_async_work,
- TP_PROTO(void *ctx, void * req, unsigned long long user_data, u8 opcode,
- unsigned int flags, struct io_wq_work *work, int rw),
+ TP_PROTO(struct io_kiocb *req, int rw),
- TP_ARGS(ctx, req, user_data, opcode, flags, work, rw),
+ TP_ARGS(req, rw),
TP_STRUCT__entry (
__field( void *, ctx )
@@ -161,12 +154,12 @@ TRACE_EVENT(io_uring_queue_async_work,
),
TP_fast_assign(
- __entry->ctx = ctx;
+ __entry->ctx = req->ctx;
__entry->req = req;
- __entry->user_data = user_data;
- __entry->flags = flags;
- __entry->opcode = opcode;
- __entry->work = work;
+ __entry->user_data = req->cqe.user_data;
+ __entry->flags = req->flags;
+ __entry->opcode = req->opcode;
+ __entry->work = &req->work;
__entry->rw = rw;
),
@@ -179,19 +172,16 @@ TRACE_EVENT(io_uring_queue_async_work,
/**
* io_uring_defer - called when an io_uring request is deferred
*
- * @ctx: pointer to a ring context structure
* @req: pointer to a deferred request
- * @user_data: user data associated with the request
- * @opcode: opcode of request
*
* Allows to track deferred requests, to get an insight about what requests are
* not started immediately.
*/
TRACE_EVENT(io_uring_defer,
- TP_PROTO(void *ctx, void *req, unsigned long long user_data, u8 opcode),
+ TP_PROTO(struct io_kiocb *req),
- TP_ARGS(ctx, req, user_data, opcode),
+ TP_ARGS(req),
TP_STRUCT__entry (
__field( void *, ctx )
@@ -201,10 +191,10 @@ TRACE_EVENT(io_uring_defer,
),
TP_fast_assign(
- __entry->ctx = ctx;
+ __entry->ctx = req->ctx;
__entry->req = req;
- __entry->data = user_data;
- __entry->opcode = opcode;
+ __entry->data = req->cqe.user_data;
+ __entry->opcode = req->opcode;
),
TP_printk("ring %p, request %p, user_data 0x%llx, opcode %s",
@@ -216,7 +206,6 @@ TRACE_EVENT(io_uring_defer,
* io_uring_link - called before the io_uring request added into link_list of
* another request
*
- * @ctx: pointer to a ring context structure
* @req: pointer to a linked request
* @target_req: pointer to a previous request, that would contain @req
*
@@ -225,9 +214,9 @@ TRACE_EVENT(io_uring_defer,
*/
TRACE_EVENT(io_uring_link,
- TP_PROTO(void *ctx, void *req, void *target_req),
+ TP_PROTO(struct io_kiocb *req, struct io_kiocb *target_req),
- TP_ARGS(ctx, req, target_req),
+ TP_ARGS(req, target_req),
TP_STRUCT__entry (
__field( void *, ctx )
@@ -236,7 +225,7 @@ TRACE_EVENT(io_uring_link,
),
TP_fast_assign(
- __entry->ctx = ctx;
+ __entry->ctx = req->ctx;
__entry->req = req;
__entry->target_req = target_req;
),
@@ -277,10 +266,7 @@ TRACE_EVENT(io_uring_cqring_wait,
/**
* io_uring_fail_link - called before failing a linked request
*
- * @ctx: pointer to a ring context structure
* @req: request, which links were cancelled
- * @user_data: user data associated with the request
- * @opcode: opcode of request
* @link: cancelled link
*
* Allows to track linked requests cancellation, to see not only that some work
@@ -288,9 +274,9 @@ TRACE_EVENT(io_uring_cqring_wait,
*/
TRACE_EVENT(io_uring_fail_link,
- TP_PROTO(void *ctx, void *req, unsigned long long user_data, u8 opcode, void *link),
+ TP_PROTO(struct io_kiocb *req, struct io_kiocb *link),
- TP_ARGS(ctx, req, user_data, opcode, link),
+ TP_ARGS(req, link),
TP_STRUCT__entry (
__field( void *, ctx )
@@ -301,10 +287,10 @@ TRACE_EVENT(io_uring_fail_link,
),
TP_fast_assign(
- __entry->ctx = ctx;
+ __entry->ctx = req->ctx;
__entry->req = req;
- __entry->user_data = user_data;
- __entry->opcode = opcode;
+ __entry->user_data = req->cqe.user_data;
+ __entry->opcode = req->opcode;
__entry->link = link;
),
@@ -364,23 +350,17 @@ TRACE_EVENT(io_uring_complete,
/**
* io_uring_submit_sqe - called before submitting one SQE
*
- * @ctx: pointer to a ring context structure
* @req: pointer to a submitted request
- * @user_data: user data associated with the request
- * @opcode: opcode of request
- * @flags request flags
* @force_nonblock: whether a context blocking or not
- * @sq_thread: true if sq_thread has submitted this SQE
*
* Allows to track SQE submitting, to understand what was the source of it, SQ
* thread or io_uring_enter call.
*/
TRACE_EVENT(io_uring_submit_sqe,
- TP_PROTO(void *ctx, void *req, unsigned long long user_data, u8 opcode, u32 flags,
- bool force_nonblock, bool sq_thread),
+ TP_PROTO(struct io_kiocb *req, bool force_nonblock),
- TP_ARGS(ctx, req, user_data, opcode, flags, force_nonblock, sq_thread),
+ TP_ARGS(req, force_nonblock),
TP_STRUCT__entry (
__field( void *, ctx )
@@ -393,13 +373,13 @@ TRACE_EVENT(io_uring_submit_sqe,
),
TP_fast_assign(
- __entry->ctx = ctx;
+ __entry->ctx = req->ctx;
__entry->req = req;
- __entry->user_data = user_data;
- __entry->opcode = opcode;
- __entry->flags = flags;
+ __entry->user_data = req->cqe.user_data;
+ __entry->opcode = req->opcode;
+ __entry->flags = req->flags;
__entry->force_nonblock = force_nonblock;
- __entry->sq_thread = sq_thread;
+ __entry->sq_thread = req->ctx->flags & IORING_SETUP_SQPOLL;
),
TP_printk("ring %p, req %p, user_data 0x%llx, opcode %s, flags 0x%x, "
@@ -411,10 +391,7 @@ TRACE_EVENT(io_uring_submit_sqe,
/*
* io_uring_poll_arm - called after arming a poll wait if successful
*
- * @ctx: pointer to a ring context structure
* @req: pointer to the armed request
- * @user_data: user data associated with the request
- * @opcode: opcode of request
* @mask: request poll events mask
* @events: registered events of interest
*
@@ -423,10 +400,9 @@ TRACE_EVENT(io_uring_submit_sqe,
*/
TRACE_EVENT(io_uring_poll_arm,
- TP_PROTO(void *ctx, void *req, u64 user_data, u8 opcode,
- int mask, int events),
+ TP_PROTO(struct io_kiocb *req, int mask, int events),
- TP_ARGS(ctx, req, user_data, opcode, mask, events),
+ TP_ARGS(req, mask, events),
TP_STRUCT__entry (
__field( void *, ctx )
@@ -438,10 +414,10 @@ TRACE_EVENT(io_uring_poll_arm,
),
TP_fast_assign(
- __entry->ctx = ctx;
+ __entry->ctx = req->ctx;
__entry->req = req;
- __entry->user_data = user_data;
- __entry->opcode = opcode;
+ __entry->user_data = req->cqe.user_data;
+ __entry->opcode = req->opcode;
__entry->mask = mask;
__entry->events = events;
),
@@ -455,18 +431,15 @@ TRACE_EVENT(io_uring_poll_arm,
/*
* io_uring_task_add - called after adding a task
*
- * @ctx: pointer to a ring context structure
* @req: pointer to request
- * @user_data: user data associated with the request
- * @opcode: opcode of request
* @mask: request poll events mask
*
*/
TRACE_EVENT(io_uring_task_add,
- TP_PROTO(void *ctx, void *req, unsigned long long user_data, u8 opcode, int mask),
+ TP_PROTO(struct io_kiocb *req, int mask),
- TP_ARGS(ctx, req, user_data, opcode, mask),
+ TP_ARGS(req, mask),
TP_STRUCT__entry (
__field( void *, ctx )
@@ -477,10 +450,10 @@ TRACE_EVENT(io_uring_task_add,
),
TP_fast_assign(
- __entry->ctx = ctx;
+ __entry->ctx = req->ctx;
__entry->req = req;
- __entry->user_data = user_data;
- __entry->opcode = opcode;
+ __entry->user_data = req->cqe.user_data;
+ __entry->opcode = req->opcode;
__entry->mask = mask;
),
@@ -494,7 +467,6 @@ TRACE_EVENT(io_uring_task_add,
* io_uring_req_failed - called when an sqe is errored dring submission
*
* @sqe: pointer to the io_uring_sqe that failed
- * @ctx: pointer to a ring context structure
* @req: pointer to request
* @error: error it failed with
*
@@ -502,9 +474,9 @@ TRACE_EVENT(io_uring_task_add,
*/
TRACE_EVENT(io_uring_req_failed,
- TP_PROTO(const struct io_uring_sqe *sqe, void *ctx, void *req, int error),
+ TP_PROTO(const struct io_uring_sqe *sqe, struct io_kiocb *req, int error),
- TP_ARGS(sqe, ctx, req, error),
+ TP_ARGS(sqe, req, error),
TP_STRUCT__entry (
__field( void *, ctx )
@@ -526,7 +498,7 @@ TRACE_EVENT(io_uring_req_failed,
),
TP_fast_assign(
- __entry->ctx = ctx;
+ __entry->ctx = req->ctx;
__entry->req = req;
__entry->user_data = sqe->user_data;
__entry->opcode = sqe->opcode;
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 6ade0ec91979..80c433995347 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -447,9 +447,7 @@ void io_queue_iowq(struct io_kiocb *req, bool *dont_use)
if (WARN_ON_ONCE(!same_thread_group(req->task, current)))
req->work.flags |= IO_WQ_WORK_CANCEL;
- trace_io_uring_queue_async_work(req->ctx, req, req->cqe.user_data,
- req->opcode, req->flags, &req->work,
- io_wq_is_hashed(&req->work));
+ trace_io_uring_queue_async_work(req, io_wq_is_hashed(&req->work));
io_wq_enqueue(tctx->io_wq, &req->work);
if (link)
io_queue_linked_timeout(link);
@@ -1518,7 +1516,7 @@ static __cold void io_drain_req(struct io_kiocb *req)
goto queue;
}
- trace_io_uring_defer(ctx, req, req->cqe.user_data, req->opcode);
+ trace_io_uring_defer(req);
de->req = req;
de->seq = seq;
list_add_tail(&de->list, &ctx->defer_list);
@@ -1718,7 +1716,7 @@ struct file *io_file_get_normal(struct io_kiocb *req, int fd)
{
struct file *file = fget(fd);
- trace_io_uring_file_get(req->ctx, req, req->cqe.user_data, fd);
+ trace_io_uring_file_get(req, fd);
/* we don't allow fixed io_uring files */
if (file && io_is_uring_fops(file))
@@ -1940,7 +1938,7 @@ static __cold int io_submit_fail_init(const struct io_uring_sqe *sqe,
struct io_submit_link *link = &ctx->submit_state.link;
struct io_kiocb *head = link->head;
- trace_io_uring_req_failed(sqe, ctx, req, ret);
+ trace_io_uring_req_failed(sqe, req, ret);
/*
* Avoid breaking links in the middle as it renders links with SQPOLL
@@ -1982,9 +1980,7 @@ static inline int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
return io_submit_fail_init(sqe, req, ret);
/* don't need @sqe from now on */
- trace_io_uring_submit_sqe(ctx, req, req->cqe.user_data, req->opcode,
- req->flags, true,
- ctx->flags & IORING_SETUP_SQPOLL);
+ trace_io_uring_submit_sqe(req, true);
/*
* If we already have a head request, queue this one for async
@@ -1998,7 +1994,7 @@ static inline int io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req,
if (unlikely(ret))
return io_submit_fail_init(sqe, req, ret);
- trace_io_uring_link(ctx, req, link->head);
+ trace_io_uring_link(req, link->head);
link->last->link = req;
link->last = req;
diff --git a/io_uring/poll.c b/io_uring/poll.c
index 76828bce8653..7f245f5617f6 100644
--- a/io_uring/poll.c
+++ b/io_uring/poll.c
@@ -296,7 +296,7 @@ static void __io_poll_execute(struct io_kiocb *req, int mask, __poll_t events)
else
req->io_task_work.func = io_apoll_task_func;
- trace_io_uring_task_add(req->ctx, req, req->cqe.user_data, req->opcode, mask);
+ trace_io_uring_task_add(req, mask);
io_req_task_work_add(req);
}
@@ -560,8 +560,7 @@ int io_arm_poll_handler(struct io_kiocb *req, unsigned issue_flags)
if (ret || ipt.error)
return ret ? IO_APOLL_READY : IO_APOLL_ABORTED;
- trace_io_uring_poll_arm(ctx, req, req->cqe.user_data, req->opcode,
- mask, apoll->poll.events);
+ trace_io_uring_poll_arm(req, mask, apoll->poll.events);
return IO_APOLL_OK;
}
diff --git a/io_uring/timeout.c b/io_uring/timeout.c
index f9df359813c9..557c637af158 100644
--- a/io_uring/timeout.c
+++ b/io_uring/timeout.c
@@ -115,8 +115,7 @@ static void io_fail_links(struct io_kiocb *req)
nxt = link->link;
link->link = NULL;
- trace_io_uring_fail_link(req->ctx, req, req->cqe.user_data,
- req->opcode, link);
+ trace_io_uring_fail_link(req, link);
if (ignore_cqes)
link->flags |= REQ_F_CQE_SKIP;
--
2.36.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH for-next 0/3] io_uring trace events clean up
2022-06-16 12:57 [PATCH for-next 0/3] io_uring trace events clean up Pavel Begunkov
` (2 preceding siblings ...)
2022-06-16 12:57 ` [PATCH for-next 3/3] io_uring: clean up tracing events Pavel Begunkov
@ 2022-06-17 13:35 ` Jens Axboe
3 siblings, 0 replies; 5+ messages in thread
From: Jens Axboe @ 2022-06-17 13:35 UTC (permalink / raw)
To: io-uring, asml.silence
On Thu, 16 Jun 2022 13:57:17 +0100, Pavel Begunkov wrote:
> Make io_uring_types.h public and teach tracing how to derive
> opcode, user_data, etc. from io_kiocb.
>
> note: rebased on top of the hashing patches
>
> Pavel Begunkov (3):
> io_uring: kill extra io_uring_types.h includes
> io_uring: make io_uring_types.h public
> io_uring: clean up tracing events
>
> [...]
Applied, thanks!
[1/3] io_uring: kill extra io_uring_types.h includes
(no commit info)
[2/3] io_uring: make io_uring_types.h public
(no commit info)
[3/3] io_uring: clean up tracing events
(no commit info)
Best regards,
--
Jens Axboe
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-06-17 13:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-16 12:57 [PATCH for-next 0/3] io_uring trace events clean up Pavel Begunkov
2022-06-16 12:57 ` [PATCH for-next 1/3] io_uring: kill extra io_uring_types.h includes Pavel Begunkov
2022-06-16 12:57 ` [PATCH for-next 2/3] io_uring: make io_uring_types.h public Pavel Begunkov
2022-06-16 12:57 ` [PATCH for-next 3/3] io_uring: clean up tracing events Pavel Begunkov
2022-06-17 13:35 ` [PATCH for-next 0/3] io_uring trace events clean up Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox