io_uring: deduplicate __io_fill_cqe_req tracing

Deduplicate two trace_io_uring_complete() calls in __io_fill_cqe_req().

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/277ed85dba5189ab7d932164b314013a0f0b0fdc.1655455613.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h
index 88c64a69beaaeb1f4270cefba5d3ee550a02a396..763915c665933fe974158776292e1e5582ff2a0f 100644 (file)
--- a/io_uring/io_uring.h
+++ b/io_uring/io_uring.h
@@ -41,10 +41,12 @@ static inline bool __io_fill_cqe_req(struct io_ring_ctx *ctx,
 {
        struct io_uring_cqe *cqe;
 
-       if (!(ctx->flags & IORING_SETUP_CQE32)) {
-               trace_io_uring_complete(req->ctx, req, req->cqe.user_data,
-                                       req->cqe.res, req->cqe.flags, 0, 0);
+       trace_io_uring_complete(req->ctx, req, req->cqe.user_data,
+                               req->cqe.res, req->cqe.flags,
+                               (req->flags & REQ_F_CQE32_INIT) ? req->extra1 : 0,
+                               (req->flags & REQ_F_CQE32_INIT) ? req->extra2 : 0);
 
+       if (!(ctx->flags & IORING_SETUP_CQE32)) {
                /*
                 * If we can't get a cq entry, userspace overflowed the
                 * submission (by quite a lot). Increment the overflow count in
@@ -63,9 +65,6 @@ static inline bool __io_fill_cqe_req(struct io_ring_ctx *ctx,
                        extra2 = req->extra2;
                }
 
-               trace_io_uring_complete(req->ctx, req, req->cqe.user_data,
-                                       req->cqe.res, req->cqe.flags, extra1, extra2);
-
                /*
                 * If we can't get a cq entry, userspace overflowed the
                 * submission (by quite a lot). Increment the overflow count in