[PATCH for-6.1 1/1] io_uring: correct pinned_vm accounting

[PATCH for-6.1 1/1] io_uring: correct pinned_vm accounting

[Pavel Begunkov]

->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>
---
 io_uring/io_uring.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 62d1f55fde55..73b841d4cfd0 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -2585,12 +2585,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);
@@ -2633,6 +2627,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);
 
-- 
2.37.3

Re: [PATCH for-6.1 1/1] io_uring: correct pinned_vm accounting

[Jens Axboe]

On Tue, 4 Oct 2022 03:19:08 +0100, Pavel Begunkov wrote:
> ->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.
> 
> 

Applied, thanks!

[1/1] io_uring: correct pinned_vm accounting
      commit: 0a80de2c7f64c4cb211bdecf4a96d93d039ec1b1

Best regards,
-- 
Jens Axboe