diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2020-07-18 11:31:20 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-07-24 13:00:45 -0600 |
| commit | 5dbcad51f78434e782d0470b8b5fc4380700c35f (patch) | |
| tree | ca3f1b1f9be35f84d06e5dcea240740b263235e6 /fs/io_uring.c | |
| parent | 7fbb1b541f4286cc337b9bca1e5bad0ce4ee978c (diff) | |
| download | linux-5dbcad51f78434e782d0470b8b5fc4380700c35f.tar.gz linux-5dbcad51f78434e782d0470b8b5fc4380700c35f.tar.bz2 linux-5dbcad51f78434e782d0470b8b5fc4380700c35f.zip | |
io_uring: don't miscount pinned memory
io_sqe_buffer_unregister() uses cxt->sqo_mm for memory accounting, but
io_ring_ctx_free() drops ->sqo_mm before leaving pinned_vm
over-accounted. Postpone mm cleanup for when it's not needed anymore.
Fixes: 309758254ea62 ("io_uring: report pinned memory usage")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 6e5ea7991c08..ba7ce103667b 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -7670,12 +7670,12 @@ static void io_destroy_buffers(struct io_ring_ctx *ctx) static void io_ring_ctx_free(struct io_ring_ctx *ctx) { io_finish_async(ctx); + io_sqe_buffer_unregister(ctx); if (ctx->sqo_mm) { mmdrop(ctx->sqo_mm); ctx->sqo_mm = NULL; } - io_sqe_buffer_unregister(ctx); io_sqe_files_unregister(ctx); io_eventfd_unregister(ctx); io_destroy_buffers(ctx); |