Two minor 5.11 io_uring fixes
Jens Axboe
maintainercover Two minor 5.11 io_uring fixes
Hi,
1) Make sure we break links if a shutdown command fails
2) Play it safe and grab mmap_sem when modifying mm->locked_vm
Signature · 1 line
Jens Axboe
Jens Axboe
maintainerPATCH 1/2 io_uring: break links on shutdown failure
Ensure that the return value of __sys_shutdown_sock() is used to potentially break links to the request, if we fail.
Fixes 36f4fa6886a8 ("io_uring: add support for shutdown(2)")
Signed-off-by Jens Axboe <[email protected]>
--- fs/io_uring.c | 2 ++ 1 file changed, 2 insertions(+)
fs/io_uring.c +2 -0
@@ -3784,6 +3784,8 @@ static int io_shutdown(struct io_kiocb *req, bool force_nonblock)return -ENOTSOCK ; ret =__sys_shutdown_sock (sock, req->shutdown.how); +if (ret <0 ) +req_set_fail_links (req);io_req_complete (req, ret);return 0 ;#else
Signature · 1 line
2.29.2
Jens Axboe
maintainerPATCH 2/2 io_uring: hold mmap_sem for mm->locked_vm manipulation
In reply to Jens AxboeThe kernel doesn't seem to have clear rules around this, but various spots are using the mmap_sem to serialize access to modifying the locked_vm count. Play it safe and lock the mm for write when accounting or unaccounting locked memory.
Signed-off-by Jens Axboe <[email protected]>
--- fs/io_uring.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
fs/io_uring.c +10 -4
@@ -8157,10 +8157,13 @@ static void io_unaccount_mem(struct io_ring_ctx *ctx, unsigned long nr_pages,__io_unaccount_mem (ctx->user, nr_pages);if (ctx->mm_account) { -if (acct ==ACCT_LOCKED ) +if (acct ==ACCT_LOCKED ) { +mmap_write_lock (ctx->mm_account); ctx->mm_account->locked_vm -= nr_pages; -else if (acct ==ACCT_PINNED ) +mmap_write_unlock (ctx->mm_account); + }else if (acct ==ACCT_PINNED ) {atomic64_sub (nr_pages, &ctx->mm_account->pinned_vm); + } } }
@@ -8176,10 +8179,13 @@ static int io_account_mem(struct io_ring_ctx *ctx, unsigned long nr_pages, }if (ctx->mm_account) { -if (acct ==ACCT_LOCKED ) +if (acct ==ACCT_LOCKED ) { +mmap_write_lock (ctx->mm_account); ctx->mm_account->locked_vm += nr_pages; -else if (acct ==ACCT_PINNED ) +mmap_write_unlock (ctx->mm_account); + }else if (acct ==ACCT_PINNED ) {atomic64_add (nr_pages, &ctx->mm_account->pinned_vm); + } }return 0 ;
Signature · 1 line
2.29.2