Commit e70b64a3 authored by Dylan Yudaken's avatar Dylan Yudaken Committed by Jens Axboe
Browse files

io_uring: move io_uring_get_opcode out of TP_printk 

The TP_printk macro's are not supposed to use custom code ([1]) or else
tools such as perf cannot use these events.

Convert the opcode string representation to use the __string wiring that
the event framework provides ([2]).

[1]: https://lwn.net/Articles/379903/
[2]: https://lwn.net/Articles/381064/



Fixes: 033b87d2 ("io_uring: use the text representation of ops in trace")
Signed-off-by: default avatarDylan Yudaken <dylany@fb.com>
Link: https://lore.kernel.org/r/20220623083743.2648321-1-dylany@fb.com


[axboe: fixup spurious removal of sq_thread assignment]
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c0737fa9

include/trace/events/io_uring.h

+35 −7
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ TRACE_EVENT(io_uring_queue_async_work, 
		__field(  unsigned int,			flags		)

		__field(  struct io_wq_work *,		work		)

		__field(  int,				rw		)



		__string( op_str, io_uring_get_opcode(opcode)	)

	),



	TP_fast_assign(
@@ -168,11 +170,13 @@ TRACE_EVENT(io_uring_queue_async_work, 
		__entry->opcode		= opcode;

		__entry->work		= work;

		__entry->rw		= rw;



		__assign_str(op_str, io_uring_get_opcode(opcode));

	),



	TP_printk("ring %p, request %p, user_data 0x%llx, opcode %s, flags 0x%x, %s queue, work %p",

		__entry->ctx, __entry->req, __entry->user_data,

		io_uring_get_opcode(__entry->opcode),

		__get_str(op_str),

		__entry->flags, __entry->rw ? "hashed" : "normal", __entry->work)

);
@@ -198,6 +202,8 @@ TRACE_EVENT(io_uring_defer, 
		__field(  void *,		req	)

		__field(  unsigned long long,	data	)

		__field(  u8,			opcode	)



		__string( op_str, io_uring_get_opcode(opcode) )

	),



	TP_fast_assign(
@@ -205,11 +211,13 @@ TRACE_EVENT(io_uring_defer, 
		__entry->req	= req;

		__entry->data	= user_data;

		__entry->opcode	= opcode;



		__assign_str(op_str, io_uring_get_opcode(opcode));

	),



	TP_printk("ring %p, request %p, user_data 0x%llx, opcode %s",

		__entry->ctx, __entry->req, __entry->data,

		io_uring_get_opcode(__entry->opcode))

		__get_str(op_str))

);



/**
@@ -298,6 +306,8 @@ TRACE_EVENT(io_uring_fail_link, 
		__field(  unsigned long long,	user_data	)

		__field(  u8,			opcode		)

		__field(  void *,		link		)



		__string( op_str, io_uring_get_opcode(opcode) )

	),



	TP_fast_assign(
@@ -306,11 +316,13 @@ TRACE_EVENT(io_uring_fail_link, 
		__entry->user_data	= user_data;

		__entry->opcode		= opcode;

		__entry->link		= link;



		__assign_str(op_str, io_uring_get_opcode(opcode));

	),



	TP_printk("ring %p, request %p, user_data 0x%llx, opcode %s, link %p",

		__entry->ctx, __entry->req, __entry->user_data,

		io_uring_get_opcode(__entry->opcode), __entry->link)

		__get_str(op_str), __entry->link)

);



/**
@@ -390,6 +402,8 @@ TRACE_EVENT(io_uring_submit_sqe, 
		__field(  u32,			flags		)

		__field(  bool,			force_nonblock	)

		__field(  bool,			sq_thread	)



		__string( op_str, io_uring_get_opcode(opcode) )

	),



	TP_fast_assign(
@@ -400,11 +414,13 @@ TRACE_EVENT(io_uring_submit_sqe, 
		__entry->flags		= flags;

		__entry->force_nonblock	= force_nonblock;

		__entry->sq_thread	= sq_thread;



		__assign_str(op_str, io_uring_get_opcode(opcode));

	),



	TP_printk("ring %p, req %p, user_data 0x%llx, opcode %s, flags 0x%x, "

		  "non block %d, sq_thread %d", __entry->ctx, __entry->req,

		  __entry->user_data, io_uring_get_opcode(__entry->opcode),

		  __entry->user_data, __get_str(op_str),

		  __entry->flags, __entry->force_nonblock, __entry->sq_thread)

);
@@ -435,6 +451,8 @@ TRACE_EVENT(io_uring_poll_arm, 
		__field(  u8,			opcode		)

		__field(  int,			mask		)

		__field(  int,			events		)



		__string( op_str, io_uring_get_opcode(opcode) )

	),



	TP_fast_assign(
@@ -444,11 +462,13 @@ TRACE_EVENT(io_uring_poll_arm, 
		__entry->opcode		= opcode;

		__entry->mask		= mask;

		__entry->events		= events;



		__assign_str(op_str, io_uring_get_opcode(opcode));

	),



	TP_printk("ring %p, req %p, user_data 0x%llx, opcode %s, mask 0x%x, events 0x%x",

		  __entry->ctx, __entry->req, __entry->user_data,

		  io_uring_get_opcode(__entry->opcode),

		  __get_str(op_str),

		  __entry->mask, __entry->events)

);
@@ -474,6 +494,8 @@ TRACE_EVENT(io_uring_task_add, 
		__field(  unsigned long long,	user_data	)

		__field(  u8,			opcode		)

		__field(  int,			mask		)



		__string( op_str, io_uring_get_opcode(opcode) )

	),



	TP_fast_assign(
@@ -482,11 +504,13 @@ TRACE_EVENT(io_uring_task_add, 
		__entry->user_data	= user_data;

		__entry->opcode		= opcode;

		__entry->mask		= mask;



		__assign_str(op_str, io_uring_get_opcode(opcode));

	),



	TP_printk("ring %p, req %p, user_data 0x%llx, opcode %s, mask %x",

		__entry->ctx, __entry->req, __entry->user_data,

		io_uring_get_opcode(__entry->opcode),

		__get_str(op_str),

		__entry->mask)

);
@@ -523,6 +547,8 @@ TRACE_EVENT(io_uring_req_failed, 
		__field( u64,			pad1		)

		__field( u64,			addr3		)

		__field( int,			error		)



		__string( op_str, io_uring_get_opcode(sqe->opcode) )

	),



	TP_fast_assign(
@@ -542,6 +568,8 @@ TRACE_EVENT(io_uring_req_failed, 
		__entry->pad1		= sqe->__pad2[0];

		__entry->addr3		= sqe->addr3;

		__entry->error		= error;



		__assign_str(op_str, io_uring_get_opcode(sqe->opcode));

	),



	TP_printk("ring %p, req %p, user_data 0x%llx, "
@@ -550,7 +578,7 @@ TRACE_EVENT(io_uring_req_failed, 
		  "personality=%d, file_index=%d, pad=0x%llx, addr3=%llx, "

		  "error=%d",

		  __entry->ctx, __entry->req, __entry->user_data,

		  io_uring_get_opcode(__entry->opcode),

		  __get_str(op_str),

		  __entry->flags, __entry->ioprio,

		  (unsigned long long)__entry->off,

		  (unsigned long long) __entry->addr, __entry->len,