Hello, Axel, Dimitris, On Wed, Jul 19, 2023 at 02:54:21PM -0700, Axel Rasmussen wrote: > On Wed, Jul 19, 2023 at 2:16 PM Axel Rasmussen <axelrasmussen@xxxxxxxxxx> wrote: > > > > Thanks for the detailed report Dimitris! I've CCed the MM mailing list and some > > folks who work on userfaultfd. > > Apologies, I should have quoted the original message for the others I > added to CC: https://lore.kernel.org/lkml/79375b71-db2e-3e66-346b-254c90d915e2@xxxxxxxxxxxxxxxxx/T/#u > > > > > I took a look at this today, but I haven't quite come up with a solution. > > > > I thought it might be as easy as changing userfaultfd_release() to set released > > *after* taking the lock. But no such luck, the ordering is what it is to deal > > with another subtle case: > > > > > > WRITE_ONCE(ctx->released, true); > > > > if (!mmget_not_zero(mm)) > > goto wakeup; > > > > /* > > * Flush page faults out of all CPUs. NOTE: all page faults > > * must be retried without returning VM_FAULT_SIGBUS if > > * userfaultfd_ctx_get() succeeds but vma->vma_userfault_ctx > > * changes while handle_userfault released the mmap_lock. So > > * it's critical that released is set to true (above), before > > * taking the mmap_lock for writing. > > */ > > mmap_write_lock(mm); > > > > I think perhaps the right thing to do is to have handle_userfault() release > > mmap_lock when it returns VM_FAULT_NOPAGE, and to have GUP deal with that > > appropriately? But, some investigation is required to be sure that's okay to do > > in the other non-GUP ways we can end up in handle_userfault(). Heh, this is also what I thought after reading. :) If we see in the very early commit from Andrea it seems that would not hang gup but just sigbus-ing it (see the comment that's mostly exactly the thing Dimitris hit here): commit 86039bd3b4e6a1129318cbfed4e0a6e001656635 Author: Andrea Arcangeli <aarcange@xxxxxxxxxx> Date: Fri Sep 4 15:46:31 2015 -0700 userfaultfd: add new syscall to provide memory externalization + /* + * If it's already released don't get it. This avoids to loop + * in __get_user_pages if userfaultfd_release waits on the + * caller of handle_userfault to release the mmap_sem. + */ + if (unlikely(ACCESS_ONCE(ctx->released))) + return VM_FAULT_SIGBUS; + Then we switched over to the friendly way, assuming CRIU could close() the uffd during the monitee process running, in: commit 656710a60e3693911bee3a355d2f2bbae3faba33 Author: Andrea Arcangeli <aarcange@xxxxxxxxxx> Date: Fri Sep 8 16:12:42 2017 -0700 userfaultfd: non-cooperative: closing the uffd without triggering SIGBUS I had a feeling that after that we didn't test gup (I assume normal page fault path will still work). Let me copy Mike too for that just in case he has anything to say. Paste thread again: https://lore.kernel.org/lkml/79375b71-db2e-3e66-346b-254c90d915e2@xxxxxxxxxxxxxxxxx/T/#u My understanding is that releasing mmap lock here should work, but we need to move the code a bit. Dimitris, please feel free to try the patch attached here if you want. It's probably not a major use case of uffd over kvm (IIUC unregister before close() will also work?), but if it's trivial to fix we should proably fix it. Thanks, ===8<=== >From 7e9ef050b487220463fa77a7aa97259ffe9bb15e Mon Sep 17 00:00:00 2001 From: Peter Xu <peterx@xxxxxxxxxx> Date: Thu, 20 Jul 2023 15:33:55 -0400 Subject: [PATCH] mm/uffd: Fix release hang over GUP Signed-off-by: Peter Xu <peterx@xxxxxxxxxx> --- fs/userfaultfd.c | 57 ++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index bbfaf5837a08..2358e6b00315 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -455,32 +455,6 @@ vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason) if (!(vmf->flags & FAULT_FLAG_USER) && (ctx->flags & UFFD_USER_MODE_ONLY)) goto out; - /* - * If it's already released don't get it. This avoids to loop - * in __get_user_pages if userfaultfd_release waits on the - * caller of handle_userfault to release the mmap_lock. - */ - if (unlikely(READ_ONCE(ctx->released))) { - /* - * Don't return VM_FAULT_SIGBUS in this case, so a non - * cooperative manager can close the uffd after the - * last UFFDIO_COPY, without risking to trigger an - * involuntary SIGBUS if the process was starting the - * userfaultfd while the userfaultfd was still armed - * (but after the last UFFDIO_COPY). If the uffd - * wasn't already closed when the userfault reached - * this point, that would normally be solved by - * userfaultfd_must_wait returning 'false'. - * - * If we were to return VM_FAULT_SIGBUS here, the non - * cooperative manager would be instead forced to - * always call UFFDIO_UNREGISTER before it can safely - * close the uffd. - */ - ret = VM_FAULT_NOPAGE; - goto out; - } - /* * Check that we can return VM_FAULT_RETRY. * @@ -517,6 +491,37 @@ vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason) if (vmf->flags & FAULT_FLAG_RETRY_NOWAIT) goto out; + /* + * If it's already released don't get it. This avoids to loop + * in __get_user_pages if userfaultfd_release waits on the + * caller of handle_userfault to release the mmap_lock. + */ + if (unlikely(READ_ONCE(ctx->released))) { + /* + * Don't return VM_FAULT_SIGBUS in this case, so a non + * cooperative manager can close the uffd after the + * last UFFDIO_COPY, without risking to trigger an + * involuntary SIGBUS if the process was starting the + * userfaultfd while the userfaultfd was still armed + * (but after the last UFFDIO_COPY). If the uffd + * wasn't already closed when the userfault reached + * this point, that would normally be solved by + * userfaultfd_must_wait returning 'false'. + * + * If we were to return VM_FAULT_SIGBUS here, the non + * cooperative manager would be instead forced to + * always call UFFDIO_UNREGISTER before it can safely + * close the uffd. + * + * We release the mmap lock in this special case, just in + * case we're in a gup to not dead loop, so the other uffd + * handler thread/process can have a chance to take the + * write lock and do the unregistration. + */ + release_fault_lock(vmf); + goto out; + } + /* take the reference before dropping the mmap_lock */ userfaultfd_ctx_get(ctx); -- 2.41.0 ===8<=== -- Peter Xu
