Skip to content

Commit

Permalink
io_uring: move apoll cache to poll.c
Browse files Browse the repository at this point in the history
This is where it's used, move the flush handler in there.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Jens Axboe committed Jul 25, 2022
1 parent e8375e4 commit 9da7471
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
12 changes: 0 additions & 12 deletions io_uring/io_uring.c
Original file line number Diff line number Diff line change
Expand Up @@ -2445,18 +2445,6 @@ static void io_req_caches_free(struct io_ring_ctx *ctx)
mutex_unlock(&ctx->uring_lock);
}

static void io_flush_apoll_cache(struct io_ring_ctx *ctx)
{
struct async_poll *apoll;

while (!list_empty(&ctx->apoll_cache)) {
apoll = list_first_entry(&ctx->apoll_cache, struct async_poll,
poll.wait.entry);
list_del(&apoll->poll.wait.entry);
kfree(apoll);
}
}

static __cold void io_ring_ctx_free(struct io_ring_ctx *ctx)
{
io_sq_thread_finish(ctx);
Expand Down
12 changes: 12 additions & 0 deletions io_uring/poll.c
Original file line number Diff line number Diff line change
Expand Up @@ -959,3 +959,15 @@ int io_poll_remove(struct io_kiocb *req, unsigned int issue_flags)
io_req_set_res(req, ret, 0);
return IOU_OK;
}

void io_flush_apoll_cache(struct io_ring_ctx *ctx)
{
struct async_poll *apoll;

while (!list_empty(&ctx->apoll_cache)) {
apoll = list_first_entry(&ctx->apoll_cache, struct async_poll,
poll.wait.entry);
list_del(&apoll->poll.wait.entry);
kfree(apoll);
}
}
2 changes: 2 additions & 0 deletions io_uring/poll.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ int io_poll_cancel(struct io_ring_ctx *ctx, struct io_cancel_data *cd,
int io_arm_poll_handler(struct io_kiocb *req, unsigned issue_flags);
bool io_poll_remove_all(struct io_ring_ctx *ctx, struct task_struct *tsk,
bool cancel_all);

void io_flush_apoll_cache(struct io_ring_ctx *ctx);

0 comments on commit 9da7471

Please sign in to comment.