Commit 915967f6 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring: improve trace_io_uring_defer() trace point 



We don't have shadow requests anymore, so get rid of the shadow
argument. Add the user_data argument, as that's often useful to easily
match up requests, instead of having to look at request pointers.

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

fs/io_uring.c

+1 −1
Original line number Diff line number Diff line
@@ -2588,7 +2588,7 @@ static int io_req_defer(struct io_kiocb *req) 
	req->flags |= REQ_F_FREE_SQE;

	req->submit.sqe = sqe_copy;



	trace_io_uring_defer(ctx, req, false);

	trace_io_uring_defer(ctx, req, req->user_data);

	list_add_tail(&req->list, &ctx->defer_list);

	spin_unlock_irq(&ctx->completion_lock);

	return -EIOCBQUEUED;

include/trace/events/io_uring.h

+8 −8
Original line number Diff line number Diff line
@@ -163,35 +163,35 @@ TRACE_EVENT(io_uring_queue_async_work, 
);



/**

 * io_uring_defer_list - called before the io_uring work added into defer_list

 * io_uring_defer - called when an io_uring request is deferred

 *

 * @ctx:	pointer to a ring context structure

 * @req:	pointer to a deferred request

 * @shadow: whether request is shadow or not

 * @user_data:	user data associated with the 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, bool shadow),

	TP_PROTO(void *ctx, void *req, unsigned long long user_data),



	TP_ARGS(ctx, req, shadow),

	TP_ARGS(ctx, req, user_data),



	TP_STRUCT__entry (

		__field(  void *,	ctx		)

		__field(  void *,	req		)

		__field(  bool,		shadow	)

		__field(  unsigned long long, data	)

	),



	TP_fast_assign(

		__entry->ctx	= ctx;

		__entry->req	= req;

		__entry->shadow	= shadow;

		__entry->data	= user_data;

	),



	TP_printk("ring %p, request %p%s", __entry->ctx, __entry->req,

			  __entry->shadow ? ", shadow": "")

	TP_printk("ring %p, request %p user_data %llu", __entry->ctx,

			__entry->req, __entry->data)

);



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE