Commit 354420f7 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring: add opcode to issue trace event 



For some test apps at least, user_data is just zeroes. So it's not a
good way to tell what the command actually is. Add the opcode to the
issue trace point.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent cebdb986

fs/io_uring.c

+2 −1
Original line number Diff line number Diff line
@@ -4810,7 +4810,8 @@ static int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr, 
		req->has_user = *mm != NULL;

		req->in_async = async;

		req->needs_fixed_file = async;

		trace_io_uring_submit_sqe(ctx, req->user_data, true, async);

		trace_io_uring_submit_sqe(ctx, req->opcode, req->user_data,

						true, async);

		if (!io_submit_sqe(req, sqe, statep, &link))

			break;

	}

include/trace/events/io_uring.h

+9 −4
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ TRACE_EVENT(io_uring_complete, 
 * io_uring_submit_sqe - called before submitting one SQE

 *

 * @ctx:		pointer to a ring context structure

 * @opcode:		opcode of request

 * @user_data:		user data associated with the request

 * @force_nonblock:	whether a context blocking or not

 * @sq_thread:		true if sq_thread has submitted this SQE
@@ -329,12 +330,14 @@ TRACE_EVENT(io_uring_complete, 
 */

TRACE_EVENT(io_uring_submit_sqe,



	TP_PROTO(void *ctx, u64 user_data, bool force_nonblock, bool sq_thread),

	TP_PROTO(void *ctx, u8 opcode, u64 user_data, bool force_nonblock,

		 bool sq_thread),



	TP_ARGS(ctx, user_data, force_nonblock, sq_thread),

	TP_ARGS(ctx, opcode, user_data, force_nonblock, sq_thread),



	TP_STRUCT__entry (

		__field(  void *,	ctx		)

		__field(  u8,		opcode		)

		__field(  u64,		user_data	)

		__field(  bool,		force_nonblock	)

		__field(  bool,		sq_thread	)
@@ -342,13 +345,15 @@ TRACE_EVENT(io_uring_submit_sqe, 


	TP_fast_assign(

		__entry->ctx		= ctx;

		__entry->opcode		= opcode;

		__entry->user_data	= user_data;

		__entry->force_nonblock	= force_nonblock;

		__entry->sq_thread	= sq_thread;

	),



	TP_printk("ring %p, user data 0x%llx, non block %d, sq_thread %d",

			  __entry->ctx, (unsigned long long) __entry->user_data,

	TP_printk("ring %p, op %d, data 0x%llx, non block %d, sq_thread %d",

			  __entry->ctx, __entry->opcode,

			  (unsigned long long) __entry->user_data,

			  __entry->force_nonblock, __entry->sq_thread)

);

CRA Git | Maintained and supported by SUSTech CRA and CCSE