Skip to content

Commit

Permalink
io_uring: open code io_cqring_overflow_flush()
Browse files Browse the repository at this point in the history
There is only one caller of io_cqring_overflow_flush(), open code it

Signed-off-by: Pavel Begunkov <[email protected]>
Link: https://lore.kernel.org/r/a1fecd56d9dba923ed8d4d159727fa939d3baa2a.1712708261.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <[email protected]>
  • Loading branch information
isilence authored and axboe committed Apr 15, 2024
1 parent e45ec96 commit 408024b
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions io_uring/io_uring.c
Original file line number Diff line number Diff line change
Expand Up @@ -726,12 +726,6 @@ static void io_cqring_do_overflow_flush(struct io_ring_ctx *ctx)
mutex_unlock(&ctx->uring_lock);
}

static void io_cqring_overflow_flush(struct io_ring_ctx *ctx)
{
if (test_bit(IO_CHECK_CQ_OVERFLOW_BIT, &ctx->check_cq))
io_cqring_do_overflow_flush(ctx);
}

/* can be called by any task */
static void io_put_task_remote(struct task_struct *task)
{
Expand Down Expand Up @@ -2452,8 +2446,9 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events,
if (!llist_empty(&ctx->work_llist))
io_run_local_work(ctx, min_events);
io_run_task_work();
io_cqring_overflow_flush(ctx);
/* if user messes with these they will just get an early return */

if (unlikely(test_bit(IO_CHECK_CQ_OVERFLOW_BIT, &ctx->check_cq)))
io_cqring_do_overflow_flush(ctx);
if (__io_cqring_events_user(ctx) >= min_events)
return 0;

Expand Down

0 comments on commit 408024b

Please sign in to comment.