io_uring: don't assume mm is constant across submits
Jens Axboe
maintainerPATCH 1/1 io_uring: don't assume mm is constant across submits
If we COW the identity, we assume that ->mm never changes. But this isn't true of multiple processes end up sharing the ring. Hence treat id->mm like like any other process compontent when it comes to the identity mapping.
Reported-by Christian Brauner <[email protected]>:
Tested-by Christian Brauner <[email protected]>:
Signed-off-by Jens Axboe <[email protected]>
---
fs/io_uring.c +7 -7
@@ -1501,6 +1501,13 @@ static bool io_grab_identity(struct io_kiocb *req)spin_unlock_irq (&ctx->inflight_lock); req->work.flags |=IO_WQ_WORK_FILES ; } +if (!(req->work.flags &IO_WQ_WORK_MM ) && + (def->work_flags &IO_WQ_WORK_MM )) { +if (id->mm != current->mm) +return false; +mmgrab (id->mm); + req->work.flags |=IO_WQ_WORK_MM ; + }return true; }
@@ -1525,13 +1532,6 @@ static void io_prep_async_work(struct io_kiocb *req) req->work.flags |=IO_WQ_WORK_UNBOUND ; } -/* ->mm can never change on us */ -if (!(req->work.flags &IO_WQ_WORK_MM ) && - (def->work_flags &IO_WQ_WORK_MM )) { -mmgrab (id->mm); - req->work.flags |=IO_WQ_WORK_MM ; - } -/* if we fail grabbing identity, we must COW, regrab, and retry */ if (io_grab_identity (req))return ;
Signature · 1 line
Jens Axboe
Quoted 10 lines · Jens Axboe
If we COW the identity, we assume that ->mm never changes. But this isn't true of multiple processes end up sharing the ring. Hence treat
id->mmlike like any other process compontent when it comes to the identity mapping.Reported-by Christian Brauner <[email protected]>:Tested-by Christian Brauner <[email protected]>:Signed-off-by Jens Axboe <[email protected]>---
Thanks for fixing this! Fwiw, tested again just now.
Reviewed-by Christian Brauner <[email protected]>