diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2022-10-16 23:31:25 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-10-26 13:25:55 +0200 |
| commit | 67cbc8865a66533fa08c1c13fe9acbaaae63c403 (patch) | |
| tree | 29980a4b69f6c2880e5dd640fce55b1e6f6da11a | |
| parent | 904f881b57360cf85de962d84d8614d94431f60e (diff) | |
| download | linux-stable-67cbc8865a66533fa08c1c13fe9acbaaae63c403.tar.gz linux-stable-67cbc8865a66533fa08c1c13fe9acbaaae63c403.tar.bz2 linux-stable-67cbc8865a66533fa08c1c13fe9acbaaae63c403.zip | |
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>
| -rw-r--r-- | fs/io_uring.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 9654b60a06a5..b82a446d5e59 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -8436,8 +8436,6 @@ static void io_ring_ctx_free(struct io_ring_ctx *ctx) if (ctx->sqo_task) { put_task_struct(ctx->sqo_task); ctx->sqo_task = NULL; - mmdrop(ctx->mm_account); - ctx->mm_account = NULL; } #ifdef CONFIG_BLK_CGROUP @@ -8456,6 +8454,11 @@ static void io_ring_ctx_free(struct io_ring_ctx *ctx) } #endif + if (ctx->mm_account) { + mmdrop(ctx->mm_account); + ctx->mm_account = NULL; + } + io_mem_free(ctx->rings); io_mem_free(ctx->sq_sqes); |