io_uring: rename trace_io_uring_submit_sqe() tracepoint

It has nothing to do with the SQE at this point, it's a request
submission. While in there, get rid of the 'force_nonblock' argument
which is also dead, as we only pass in true.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/include/trace/events/io_uring.h b/include/trace/events/io_uring.h
index 936fd41..69454f1 100644 (file)
--- a/include/trace/events/io_uring.h
+++ b/include/trace/events/io_uring.h
@@ -360,19 +360,18 @@ TRACE_EVENT(io_uring_complete,
 );
 
 /**
- * io_uring_submit_sqe - called before submitting one SQE
+ * io_uring_submit_req - called before submitting a request
  *
  * @req:               pointer to a submitted request
- * @force_nonblock:    whether a context blocking or not
  *
  * 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,
+TRACE_EVENT(io_uring_submit_req,
 
-       TP_PROTO(struct io_kiocb *req, bool force_nonblock),
+       TP_PROTO(struct io_kiocb *req),
 
-       TP_ARGS(req, force_nonblock),
+       TP_ARGS(req),
 
        TP_STRUCT__entry (
                __field(  void *,               ctx             )
@@ -380,7 +379,6 @@ TRACE_EVENT(io_uring_submit_sqe,
                __field(  unsigned long long,   user_data       )
                __field(  u8,                   opcode          )
                __field(  u32,                  flags           )
-               __field(  bool,                 force_nonblock  )
                __field(  bool,                 sq_thread       )
 
                __string( op_str, io_uring_get_opcode(req->opcode) )
@@ -392,16 +390,15 @@ TRACE_EVENT(io_uring_submit_sqe,
                __entry->user_data      = req->cqe.user_data;
                __entry->opcode         = req->opcode;
                __entry->flags          = req->flags;
-               __entry->force_nonblock = force_nonblock;
                __entry->sq_thread      = req->ctx->flags & IORING_SETUP_SQPOLL;
 
                __assign_str(op_str, io_uring_get_opcode(req->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,
+                 "sq_thread %d", __entry->ctx, __entry->req,
                  __entry->user_data, __get_str(op_str),
-                 __entry->flags, __entry->force_nonblock, __entry->sq_thread)
+                 __entry->flags, __entry->sq_thread)
 );
 
 /*

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 5369406..775b537 100644 (file)
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -2305,8 +2305,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);
 
-       /* don't need @sqe from now on */
-       trace_io_uring_submit_sqe(req, true);
+       trace_io_uring_submit_req(req);
 
        /*
         * If we already have a head request, queue this one for async