Skip to content

Commit

Permalink
io_uring: correct pinned_vm accounting
Browse files Browse the repository at this point in the history
[ upstream commit 42b6419 ]

->mm_account should be released only after we free all registered
buffers, otherwise __io_sqe_buffers_unregister() will see a NULL
->mm_account and skip locked_vm accounting.

Cc: <Stable@vger.kernel.org>
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/6d798f65ed4ab8db3664c4d3397d4af16ca98846.1664849932.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Pavel Begunkov authored and Greg Kroah-Hartman committed Oct 26, 2022
1 parent 813d8fe commit cd148d4
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions fs/io_uring.c
Original file line number Diff line number Diff line change
Expand Up @@ -9303,11 +9303,6 @@ static void io_ring_ctx_free(struct io_ring_ctx *ctx)
{
io_sq_thread_finish(ctx);

if (ctx->mm_account) {
mmdrop(ctx->mm_account);
ctx->mm_account = NULL;
}

/* __io_rsrc_put_work() may need uring_lock to progress, wait w/o it */
io_wait_rsrc_data(ctx->buf_data);
io_wait_rsrc_data(ctx->file_data);
Expand Down Expand Up @@ -9343,6 +9338,11 @@ static void io_ring_ctx_free(struct io_ring_ctx *ctx)
#endif
WARN_ON_ONCE(!list_empty(&ctx->ltimeout_list));

if (ctx->mm_account) {
mmdrop(ctx->mm_account);
ctx->mm_account = NULL;
}

io_mem_free(ctx->rings);
io_mem_free(ctx->sq_sqes);

Expand Down

0 comments on commit cd148d4

Please sign in to comment.