io_uring: correct pinned_vm accounting
[ upstream commit 42b6419d0aba47c5d8644cdc0b68502254671de5 ] ->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>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
904f881b57
commit
67cbc8865a
@@ -8436,8 +8436,6 @@ static void io_ring_ctx_free(struct io_ring_ctx *ctx)
|
|||||||
if (ctx->sqo_task) {
|
if (ctx->sqo_task) {
|
||||||
put_task_struct(ctx->sqo_task);
|
put_task_struct(ctx->sqo_task);
|
||||||
ctx->sqo_task = NULL;
|
ctx->sqo_task = NULL;
|
||||||
mmdrop(ctx->mm_account);
|
|
||||||
ctx->mm_account = NULL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_BLK_CGROUP
|
#ifdef CONFIG_BLK_CGROUP
|
||||||
@@ -8456,6 +8454,11 @@ static void io_ring_ctx_free(struct io_ring_ctx *ctx)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (ctx->mm_account) {
|
||||||
|
mmdrop(ctx->mm_account);
|
||||||
|
ctx->mm_account = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
io_mem_free(ctx->rings);
|
io_mem_free(ctx->rings);
|
||||||
io_mem_free(ctx->sq_sqes);
|
io_mem_free(ctx->sq_sqes);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user