Skip to content

mm, kvm: allow uffd support in guest_memfd

Mike Rapoport kvm linux-fsdevel linux-kselftest linux-mm lkml 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest15 patches 14 repliesIn review 9 of 15 applied
  2. v315 patches 12 repliesSuperseded
  3. v215 patches 24 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v1 RFC17 patches25 repliesSuperseded

Changes in v4 from the cover letter

* fix lock leak not only in patch 4, but also in patch 2, thanks Harry

Patches in v4 9 of 15 applied

#Subject and filesSizeRepliesApplied
1/15userfaultfd: introduce mfill_copy_folio_locked() helpermm/userfaultfd.c+35 -240 repliesApplied
2/15userfaultfd: introduce struct mfill_statemm/userfaultfd.c+81 -661 replyApplied
3/15userfaultfd: introduce mfill_establish_pmd() helpermm/userfaultfd.c+52 -500 repliesApplied
4/15userfaultfd: introduce mfill_get_vma() and mfill_put_vma()mm/userfaultfd.c+75 -501 replyApplied
5/15userfaultfd: retry copying with locks dropped in mfill_atomic_pte_copy()mm/userfaultfd.c+51 -241 replyApplied
6/15userfaultfd: move vma_can_userfault out of lineinclude/linux/userfaultfd_k.h mm/userfaultfd.c+35 -330 repliesApplied
7/15userfaultfd: introduce vm_uffd_opsinclude/linux/mm.h include/linux/userfaultfd_k.h mm/hugetlb.c +2 more+72 -132 replies
8/15shmem, userfaultfd: use a VMA callback to handle UFFDIO_CONTINUEinclude/linux/userfaultfd_k.h mm/shmem.c mm/userfaultfd.c+39 -170 repliesApplied
9/15userfaultfd: introduce vm_uffd_ops->alloc_folio()include/linux/userfaultfd_k.h mm/userfaultfd.c+54 -440 repliesApplied
10/15shmem, userfaultfd: implement shmem uffd operations using vm_uffd_opsinclude/linux/shmem_fs.h include/linux/userfaultfd_k.h mm/shmem.c +1 more+106 -1550 repliesApplied
11/15userfaultfd: mfill_atomic(): remove retry logicmm/userfaultfd.c+0 -242 replies
12/15mm: generalize handling of userfaults in __do_fault()mm/memory.c mm/shmem.c mm/userfaultfd.c+52 -120 replies
13/15KVM: guest_memfd: implement userfaultfd operationsmm/filemap.c virt/kvm/guest_memfd.c+83 -26 replies
14/15KVM: selftests: test userfaultfd minor for guest_memfdtools/testing/selftests/kvm/guest_memfd_test.c+113 -00 replies
15/15KVM: selftests: test userfaultfd missing for guest_memfdtools/testing/selftests/kvm/guest_memfd_test.c+79 -10 replies

Reviews trailers per patch

9 of 15 patches have a Reviewed-by or Acked-by.

PatchPeter XuDavid Hildenbrand (Arm)Harry Yoo (Oracle)Liam R. HowlettJames Houghton
1/15A-b R-b R-b
2/15A-b R-b
3/15R-b
4/15R-b
5/15R-b
6/15R-b R-b
7/15
8/15R-b
9/15R-b
10/15R-b
11/15
12/15
13/15
14/15
15/15

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v4 thread

Cover letter [PATCH v4 00/15] mm, kvm: allow uffd support in guest_memfd

From: "Mike Rapoport (Microsoft)" <[email protected]>

Hi,

These patches enable support for userfaultfd in guest_memfd.

As the ground work I refactored userfaultfd handling of PTE-based memory types (anonymous and shmem) and converted them to use vm_uffd_ops for allocating a folio or getting an existing folio from the page cache. shmem also implements callbacks that add a folio to the page cache after the data passed in UFFDIO_COPY was copied and remove the folio from the page cache if page table update fails.

In order for guest_memfd to notify userspace about page faults, there are new VM_FAULT_UFFD_MINOR and VM_FAULT_UFFD_MISSING that a ->fault() handler can return to inform the page fault handler that it needs to call handle_userfault() to complete the fault.

Nikita helped to plumb these new goodies into guest_memfd and provided basic tests to verify that guest_memfd works with userfaultfd.
The handling of UFFDIO_MISSING in guest_memfd requires ability to remove a folio from page cache, the best way I could find was exporting filemap_remove_folio() to KVM.

I deliberately left hugetlb out, at least for the most part. hugetlb handles acquisition of VMA and more importantly establishing of parent page table entry differently than PTE-based memory types. This is a different abstraction level than what vm_uffd_ops provides and people objected to exposing such low level APIs as a part of VMA operations.

Also, to enable uffd in guest_memfd refactoring of hugetlb is not needed and I prefer to delay it until the dust settles after the changes in this set.

v4 changes:
* fix lock leak not only in patch 4, but also in patch 2, thanks Harry

v3: https://lore.kernel.org/all/[email protected]
* add fixes from Harry and Andrei
* fix handling of WP-only mode for WP_ASYNC contexts in vma_can_userfault()
* address David's comments about mfill_get_pmd() and rename it to mfill_establish_pmd()
* add VM_WARN()s for unsupported operations (James)
* update comments using James' suggestions

v2: https://lore.kernel.org/all/[email protected]
* instead of returning uffd-specific values from ->fault() handlers add __do_userfault() helper to resolve user faults in __do_fault()
* address comments from Peter
* rebased on v7.0-c1

RFC: https://lore.kernel.org/all/[email protected]

Mike Rapoport (Microsoft) (11):
userfaultfd: introduce mfill_copy_folio_locked() helper
userfaultfd: introduce struct mfill_state
userfaultfd: introduce mfill_establish_pmd() helper
userfaultfd: introduce mfill_get_vma() and mfill_put_vma()
userfaultfd: retry copying with locks dropped in
mfill_atomic_pte_copy()
userfaultfd: move vma_can_userfault out of line
userfaultfd: introduce vm_uffd_ops
shmem, userfaultfd: use a VMA callback to handle UFFDIO_CONTINUE
userfaultfd: introduce vm_uffd_ops->alloc_folio()
shmem, userfaultfd: implement shmem uffd operations using vm_uffd_ops
userfaultfd: mfill_atomic(): remove retry logic

Nikita Kalyazin (3):
KVM: guest_memfd: implement userfaultfd operations
KVM: selftests: test userfaultfd minor for guest_memfd
KVM: selftests: test userfaultfd missing for guest_memfd

Peter Xu (1):
mm: generalize handling of userfaults in __do_fault()

 include/linux/mm.h                            |   5 +
 include/linux/shmem_fs.h                      |  14 -
 include/linux/userfaultfd_k.h                 |  73 +-
 mm/filemap.c                                  |   1 +
 mm/hugetlb.c                                  |  15 +
 mm/memory.c                                   |  43 ++
 mm/shmem.c                                    | 188 ++---
 mm/userfaultfd.c                              | 694 ++++++++++--------
 .../testing/selftests/kvm/guest_memfd_test.c  | 191 +++++
 virt/kvm/guest_memfd.c                        |  84 ++-
 10 files changed, 860 insertions(+), 448 deletions(-)

base-commit: c369299895a591d96745d6492d4888259b004a9e --
2.53.0