diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2022-10-04 03:19:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-10-21 12:37:34 +0200 |
| commit | e9513b113eadc8bbb67b2e531d60565185d737f8 (patch) | |
| tree | c8c7445dd5253f9830f4d0784842e5a8227edffe /io_uring | |
| parent | 75e94c7e8859e58aadc15a98cc9704edff47d4f2 (diff) | |
| download | linux-e9513b113eadc8bbb67b2e531d60565185d737f8.tar.gz linux-e9513b113eadc8bbb67b2e531d60565185d737f8.tar.bz2 linux-e9513b113eadc8bbb67b2e531d60565185d737f8.zip | |
io_uring: correct pinned_vm accounting
commit 42b6419d0aba47c5d8644cdc0b68502254671de5 upstream.
->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>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/io_uring.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 951db16ec5da..a22a32acf590 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -2422,12 +2422,6 @@ static void io_req_caches_free(struct io_ring_ctx *ctx) static __cold 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_refs_drop(ctx); /* __io_rsrc_put_work() may need uring_lock to progress, wait w/o it */ io_wait_rsrc_data(ctx->buf_data); @@ -2470,6 +2464,10 @@ static __cold void io_ring_ctx_free(struct io_ring_ctx *ctx) WARN_ON_ONCE(!list_empty(&ctx->ltimeout_list)); WARN_ON_ONCE(ctx->notif_slots || ctx->nr_notif_slots); + if (ctx->mm_account) { + mmdrop(ctx->mm_account); + ctx->mm_account = NULL; + } io_mem_free(ctx->rings); io_mem_free(ctx->sq_sqes); |