From: Axel Rasmussen <axelrasmussen@google.com> Date: 2021-05-03 18:07:46
Base
====
This series is based on (and therefore should apply cleanly to) the tag
"v5.12-rc8-mmots-2021-04-21-23-08", with the following applied first:
1. Peter's selftest cleanup series:
https://lore.kernel.org/patchwork/cover/1412450/
2. My patch to fix a pre-existing BUG_ON in an edge case:
https://lore.kernel.org/patchwork/patch/1419758/
Changelog
=========
v5->v6:
- Picked up {Reviewed,Acked}-by's.
- Rebased onto v5.12-rc8-mmots-2021-04-21-23-08.
- Put mistakenly removed delete_from_page_cache() back in the error path in
shmem_mfill_atomic_pte(). [Hugh]
- Keep shmem_mfill_atomic_pte() naming, instead of shmem_mcopy_... Likewise,
rename our new helper to mfill_atomic_install_pte(). [Hugh]
- Return directly instead of "goto out" in shmem_mfill_atomic_pte(), saving a
couple of lines. [Peter]
v4->v5:
- Picked up {Reviewed,Acked}-by's.
- Fix cleanup in error path in shmem_mcopy_atomic_pte(). [Hugh, Peter]
- Mention switching to lru_cache_add() in the commit message of 9/10. [Hugh]
- Split + reorder commits, so now we 1) implement the faulting path, 2)
implement the CONTINUE ioctl, and 3) advertise the feature. Squash the
documentation update into step (3). [Hugh, Peter]
- Reorder install_pte() cleanup to come before selftest changes. [Hugh]
v3->v4:
- Fix handling of the shmem private mcopy case. Previously, I had (incorrectly)
assumed that !vma_is_anonymous() was equivalent to "the page will be in the
page cache". But, in this case we have an optimization where we allocate a new
*anonymous* page. So, use a new "bool page_in_cache" instead, which checks if
page->mapping is set. Correct several places with this new check. [Hugh]
- Fix calling mm_counter() before page_add_..._rmap(). [Hugh]
- When modifying shmem_mcopy_atomic_pte() to use the new install_pte() helper,
just use lru_cache_add_inactive_or_unevictable(), no need to branch and maybe
use lru_cache_add(). [Hugh]
- De-pluralize mcopy_atomic_install_pte(s). [Hugh]
- Make "writable" a bool, and initialize consistently. [Hugh]
v2->v3:
- Picked up {Reviewed,Acked}-by's.
- Reorder commits: introduce CONTINUE before MINOR registration. [Hugh, Peter]
- Don't try to {unlock,put}_page an xarray value in shmem_getpage_gfp. [Hugh]
- Move enum mcopy_atomic_mode forward declare out of CONFIG_HUGETLB_PAGE. [Hugh]
- Keep mistakenly removed UFFD_USER_MODE_ONLY in selftest. [Peter]
- Cleanup context management in self test (make clear implicit, remove unneeded
return values now that we have err()). [Peter]
- Correct dst_pte argument to dst_pmd in shmem_mcopy_atomic_pte macro. [Hugh]
- Mention the new shmem support feature in documentation. [Hugh]
v1->v2:
- Pick up Reviewed-by's.
- Don't swapin page when a minor fault occurs. Notice that it needs to be
swapped in, and just immediately fire the minor fault. Let a future CONTINUE
deal with swapping in the page. [Peter]
- Clarify comment about i_size checks in mm/userfaultfd.c. [Peter]
- Only forward declare once (out of #ifdef) in hugetlb.h. [Peter]
Changes since [2]:
- Squash the fixes ([2]) in with the original series ([1]). This makes reviewing
easier, as we no longer have to sift through deltas undoing what we had done
before. [Hugh, Peter]
- Modify shmem_mcopy_atomic_pte() to use the new mcopy_atomic_install_ptes()
helper, reducing code duplication. [Hugh]
- Properly trigger handle_userfault() in the shmem_swapin_page() case. [Hugh]
- Use shmem_getpage() instead of find_lock_page() to lookup the existing page in
for continue. This properly deals with swapped-out pages. [Hugh]
- Unconditionally pte_mkdirty() for anon memory (as before). [Peter]
- Don't include userfaultfd_k.h in either hugetlb.h or shmem_fs.h. [Hugh]
- Add comment for UFFD_FEATURE_MINOR_SHMEM (to match _HUGETLBFS). [Hugh]
- Fix some small cleanup issues (parens, reworded conditionals, reduced plumbing
of some parameters, simplify labels/gotos, ...). [Hugh, Peter]
Overview
========
See the series which added minor faults for hugetlbfs [3] for a detailed
overview of minor fault handling in general. This series adds the same support
for shmem-backed areas.
This series is structured as follows:
- Commits 1 and 2 are cleanups.
- Commits 3 and 4 implement the new feature (minor fault handling for shmem).
- Commit 5 advertises that the feature is now available since at this point it's
fully implemented.
- Commit 6 is a final cleanup, modifying an existing code path to re-use a new
helper we've introduced.
- Commits 7, 8, 9, 10 update the userfaultfd selftest to exercise the feature.
Use Case
========
In some cases it is useful to have VM memory backed by tmpfs instead of
hugetlbfs. So, this feature will be used to support the same VM live migration
use case described in my original series.
Additionally, Android folks (Lokesh Gidra [off-list ref]) hope to
optimize the Android Runtime garbage collector using this feature:
"The plan is to use userfaultfd for concurrently compacting the heap. With
this feature, the heap can be shared-mapped at another location where the
GC-thread(s) could continue the compaction operation without the need to
invoke userfault ioctl(UFFDIO_COPY) each time. OTOH, if and when Java threads
get faults on the heap, UFFDIO_CONTINUE can be used to resume execution.
Furthermore, this feature enables updating references in the 'non-moving'
portion of the heap efficiently. Without this feature, uneccessary page
copying (ioctl(UFFDIO_COPY)) would be required."
[1] https://lore.kernel.org/patchwork/cover/1388144/
[2] https://lore.kernel.org/patchwork/patch/1408161/
[3] https://lore.kernel.org/linux-fsdevel/20210301222728.176417-1-axelrasmussen@google.com/T/#t
Axel Rasmussen (10):
userfaultfd/hugetlbfs: avoid including userfaultfd_k.h in hugetlb.h
userfaultfd/shmem: combine shmem_{mcopy_atomic,mfill_zeropage}_pte
userfaultfd/shmem: support minor fault registration for shmem
userfaultfd/shmem: support UFFDIO_CONTINUE for shmem
userfaultfd/shmem: advertise shmem minor fault support
userfaultfd/shmem: modify shmem_mfill_atomic_pte to use install_pte()
userfaultfd/selftests: use memfd_create for shmem test type
userfaultfd/selftests: create alias mappings in the shmem test
userfaultfd/selftests: reinitialize test context in each test
userfaultfd/selftests: exercise minor fault handling shmem support
Documentation/admin-guide/mm/userfaultfd.rst | 3 +-
fs/userfaultfd.c | 6 +-
include/linux/hugetlb.h | 2 +-
include/linux/shmem_fs.h | 19 +-
include/linux/userfaultfd_k.h | 5 +
include/uapi/linux/userfaultfd.h | 7 +-
mm/hugetlb.c | 1 +
mm/memory.c | 8 +-
mm/shmem.c | 120 +++-----
mm/userfaultfd.c | 175 ++++++++----
tools/testing/selftests/vm/userfaultfd.c | 274 ++++++++++++-------
11 files changed, 364 insertions(+), 256 deletions(-)
--
2.31.1.527.g47e6f16901-goog
From: Axel Rasmussen <axelrasmussen@google.com> Date: 2021-05-03 18:07:54
Minimizing header file inclusion is desirable. In this case, we can do
so just by forward declaring the enumeration our signature relies upon.
Reviewed-by: Peter Xu <peterx@redhat.com>
Acked-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
---
include/linux/hugetlb.h | 2 +-
mm/hugetlb.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
From: Axel Rasmussen <axelrasmussen@google.com> Date: 2021-05-03 18:07:57
Previously, we did a dance where we had one calling path in
userfaultfd.c (mfill_atomic_pte), but then we split it into two in
shmem_fs.h (shmem_{mcopy_atomic,mfill_zeropage}_pte), and then rejoined
into a single shared function in shmem.c (shmem_mfill_atomic_pte).
This is all a bit overly complex. Just call the single combined shmem
function directly, allowing us to clean up various branches,
boilerplate, etc.
While we're touching this function, two other small cleanup changes:
- offset is equivalent to pgoff, so we can get rid of offset entirely.
- Split two VM_BUG_ON cases into two statements. This means the line
number reported when the BUG is hit specifies exactly which condition
was true.
Reviewed-by: Peter Xu <peterx@redhat.com>
Acked-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
---
include/linux/shmem_fs.h | 19 +++++++--------
mm/shmem.c | 52 +++++++++++++---------------------------
mm/userfaultfd.c | 10 +++-----
3 files changed, 27 insertions(+), 54 deletions(-)
From: Axel Rasmussen <axelrasmussen@google.com> Date: 2021-05-03 18:08:09
With this change, userspace can resolve a minor fault within a
shmem-backed area with a UFFDIO_CONTINUE ioctl. The semantics for this
match those for hugetlbfs - we look up the existing page in the page
cache, and install a PTE for it.
This commit introduces a new helper: mfill_atomic_install_pte.
Why handle UFFDIO_CONTINUE for shmem in mm/userfaultfd.c, instead of in
shmem.c? The existing userfault implementation only relies on shmem.c
for VM_SHARED VMAs. However, minor fault handling / CONTINUE work just
fine for !VM_SHARED VMAs as well. We'd prefer to handle CONTINUE for
shmem in one place, regardless of shared/private (to reduce code
duplication).
Why add a new mfill_atomic_install_pte helper? A problem we have with
continue is that shmem_mfill_atomic_pte() and mcopy_atomic_pte() are
*close* to what we want, but not exactly. We do want to setup the PTEs
in a CONTINUE operation, but we don't want to e.g. allocate a new page,
charge it (e.g. to the shmem inode), manipulate various flags, etc. Also
we have the problem stated above: shmem_mfill_atomic_pte() and
mcopy_atomic_pte() both handle one-half of the problem (shared /
private) continue cares about. So, introduce mcontinue_atomic_pte(), to
handle all of the shmem continue cases. Introduce the helper so it
doesn't duplicate code with mcopy_atomic_pte().
In a future commit, shmem_mfill_atomic_pte() will also be modified to
use this new helper. However, since this is a bigger refactor, it seems
most clear to do it as a separate change.
Acked-by: Hugh Dickins <hughd@google.com>
Acked-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
---
mm/userfaultfd.c | 172 ++++++++++++++++++++++++++++++++++-------------
1 file changed, 127 insertions(+), 45 deletions(-)
@@ -48,6 +48,83 @@ struct vm_area_struct *find_dst_vma(struct mm_struct *dst_mm,returndst_vma;}+/*+*InstallPTEs,tomapdst_addr(withindst_vma)topage.+*+*ThisfunctionhandlesMCOPY_ATOMIC_CONTINUE(whichisalwaysfile-backed),+*whetherornotdst_vmaisVM_SHARED.Italsohandlesthemoregeneral+*MCOPY_ATOMIC_NORMALcase,whendst_vmais*not*VM_SHARED(itmaybefile+*backed,ornot).+*+*NotethatMCOPY_ATOMIC_NORMALforaVM_SHAREDdst_vmaishandledby+*shmem_mcopy_atomic_pteinstead.+*/+staticintmfill_atomic_install_pte(structmm_struct*dst_mm,pmd_t*dst_pmd,+structvm_area_struct*dst_vma,+unsignedlongdst_addr,structpage*page,+boolnewly_allocated,boolwp_copy)+{+intret;+pte_t_dst_pte,*dst_pte;+boolwritable=dst_vma->vm_flags&VM_WRITE;+boolvm_shared=dst_vma->vm_flags&VM_SHARED;+boolpage_in_cache=page->mapping;+spinlock_t*ptl;+structinode*inode;+pgoff_toffset,max_off;++_dst_pte=mk_pte(page,dst_vma->vm_page_prot);+if(page_in_cache&&!vm_shared)+writable=false;+if(writable||!page_in_cache)+_dst_pte=pte_mkdirty(_dst_pte);+if(writable){+if(wp_copy)+_dst_pte=pte_mkuffd_wp(_dst_pte);+else+_dst_pte=pte_mkwrite(_dst_pte);+}++dst_pte=pte_offset_map_lock(dst_mm,dst_pmd,dst_addr,&ptl);++if(vma_is_shmem(dst_vma)){+/* serialize against truncate with the page table lock */+inode=dst_vma->vm_file->f_inode;+offset=linear_page_index(dst_vma,dst_addr);+max_off=DIV_ROUND_UP(i_size_read(inode),PAGE_SIZE);+ret=-EFAULT;+if(unlikely(offset>=max_off))+gotoout_unlock;+}++ret=-EEXIST;+if(!pte_none(*dst_pte))+gotoout_unlock;++if(page_in_cache)+page_add_file_rmap(page,false);+else+page_add_new_anon_rmap(page,dst_vma,dst_addr,false);++/*+*Musthappenafterrmap,asmm_counter()checksmapping(via+*PageAnon()),whichissetby__page_set_anon_rmap().+*/+inc_mm_counter(dst_mm,mm_counter(page));++if(newly_allocated)+lru_cache_add_inactive_or_unevictable(page,dst_vma);++set_pte_at(dst_mm,dst_addr,dst_pte,_dst_pte);++/* No need to invalidate - it was non-present before */+update_mmu_cache(dst_vma,dst_addr,dst_pte);+ret=0;+out_unlock:+pte_unmap_unlock(dst_pte,ptl);+returnret;+}+staticintmcopy_atomic_pte(structmm_struct*dst_mm,pmd_t*dst_pmd,structvm_area_struct*dst_vma,
@@ -56,13 +133,9 @@ static int mcopy_atomic_pte(struct mm_struct *dst_mm,structpage**pagep,boolwp_copy){-pte_t_dst_pte,*dst_pte;-spinlock_t*ptl;void*page_kaddr;intret;structpage*page;-pgoff_toffset,max_off;-structinode*inode;if(!*pagep){ret=-ENOMEM;
@@ -99,43 +172,12 @@ static int mcopy_atomic_pte(struct mm_struct *dst_mm,if(mem_cgroup_charge(page,dst_mm,GFP_KERNEL))gotoout_release;-_dst_pte=pte_mkdirty(mk_pte(page,dst_vma->vm_page_prot));-if(dst_vma->vm_flags&VM_WRITE){-if(wp_copy)-_dst_pte=pte_mkuffd_wp(_dst_pte);-else-_dst_pte=pte_mkwrite(_dst_pte);-}--dst_pte=pte_offset_map_lock(dst_mm,dst_pmd,dst_addr,&ptl);-if(dst_vma->vm_file){-/* the shmem MAP_PRIVATE case requires checking the i_size */-inode=dst_vma->vm_file->f_inode;-offset=linear_page_index(dst_vma,dst_addr);-max_off=DIV_ROUND_UP(i_size_read(inode),PAGE_SIZE);-ret=-EFAULT;-if(unlikely(offset>=max_off))-gotoout_release_uncharge_unlock;-}-ret=-EEXIST;-if(!pte_none(*dst_pte))-gotoout_release_uncharge_unlock;--inc_mm_counter(dst_mm,MM_ANONPAGES);-page_add_new_anon_rmap(page,dst_vma,dst_addr,false);-lru_cache_add_inactive_or_unevictable(page,dst_vma);--set_pte_at(dst_mm,dst_addr,dst_pte,_dst_pte);--/* No need to invalidate - it was non-present before */-update_mmu_cache(dst_vma,dst_addr,dst_pte);--pte_unmap_unlock(dst_pte,ptl);-ret=0;+ret=mfill_atomic_install_pte(dst_mm,dst_pmd,dst_vma,dst_addr,+page,true,wp_copy);+if(ret)+gotoout_release;out:returnret;-out_release_uncharge_unlock:-pte_unmap_unlock(dst_pte,ptl);out_release:put_page(page);gotoout;
@@ -176,6 +218,41 @@ static int mfill_zeropage_pte(struct mm_struct *dst_mm,returnret;}+/* Handles UFFDIO_CONTINUE for all shmem VMAs (shared or private). */+staticintmcontinue_atomic_pte(structmm_struct*dst_mm,+pmd_t*dst_pmd,+structvm_area_struct*dst_vma,+unsignedlongdst_addr,+boolwp_copy)+{+structinode*inode=file_inode(dst_vma->vm_file);+pgoff_tpgoff=linear_page_index(dst_vma,dst_addr);+structpage*page;+intret;++ret=shmem_getpage(inode,pgoff,&page,SGP_READ);+if(ret)+gotoout;+if(!page){+ret=-EFAULT;+gotoout;+}++ret=mfill_atomic_install_pte(dst_mm,dst_pmd,dst_vma,dst_addr,+page,false,wp_copy);+if(ret)+gotoout_release;++unlock_page(page);+ret=0;+out:+returnret;+out_release:+unlock_page(page);+put_page(page);+gotoout;+}+staticpmd_t*mm_alloc_pmd(structmm_struct*mm,unsignedlongaddress){pgd_t*pgd;
From: Axel Rasmussen <axelrasmussen@google.com> Date: 2021-05-03 18:08:10
This patch allows shmem-backed VMAs to be registered for minor faults.
Minor faults are appropriately relayed to userspace in the fault path,
for VMAs with the relevant flag.
This commit doesn't hook up the UFFDIO_CONTINUE ioctl for shmem-backed
minor faults, though, so userspace doesn't yet have a way to resolve
such faults.
Because of this, we also don't yet advertise this as a supported
feature. That will be done in a separate commit when the feature is
fully implemented.
Acked-by: Peter Xu <peterx@redhat.com>
Acked-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
---
fs/userfaultfd.c | 3 +--
mm/memory.c | 8 +++++---
mm/shmem.c | 12 +++++++++++-
3 files changed, 17 insertions(+), 6 deletions(-)
From: Axel Rasmussen <axelrasmussen@google.com> Date: 2021-05-03 18:08:22
Now that the feature is fully implemented (the faulting path hooks exist
so userspace is notified, and the ioctl to resolve such faults is
available), advertise this as a supported feature.
Acked-by: Hugh Dickins <hughd@google.com>
Acked-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
---
Documentation/admin-guide/mm/userfaultfd.rst | 3 ++-
fs/userfaultfd.c | 3 ++-
include/uapi/linux/userfaultfd.h | 7 ++++++-
3 files changed, 10 insertions(+), 3 deletions(-)
@@ -77,7 +77,8 @@ events, except page fault notifications, may be generated:-``UFFD_FEATURE_MINOR_HUGETLBFS`` indicates that the kernel supports``UFFDIO_REGISTER_MODE_MINOR`` registration for hugetlbfs virtual memory- areas.+ areas. ``UFFD_FEATURE_MINOR_SHMEM`` is the analogous feature indicating+ support for shmem virtual memory areas. The userland application should set the feature flags it intends to use when invoking the ``UFFDIO_API`` ioctl, to request that those features be
@@ -1940,7 +1940,8 @@ static int userfaultfd_api(struct userfaultfd_ctx *ctx,/* report all available features and ioctls to userland */uffdio_api.features=UFFD_API_FEATURES;#ifndef CONFIG_HAVE_ARCH_USERFAULTFD_MINOR-uffdio_api.features&=~UFFD_FEATURE_MINOR_HUGETLBFS;+uffdio_api.features&=+~(UFFD_FEATURE_MINOR_HUGETLBFS|UFFD_FEATURE_MINOR_SHMEM);#endifuffdio_api.ioctls=UFFD_API_IOCTLS;ret=-EFAULT;
From: Axel Rasmussen <axelrasmussen@google.com> Date: 2021-05-03 18:08:25
In a previous commit, we added the mfill_atomic_install_pte() helper.
This helper does the job of setting up PTEs for an existing page, to map
it into a given VMA. It deals with both the anon and shmem cases, as
well as the shared and private cases.
In other words, shmem_mfill_atomic_pte() duplicates a case it already
handles. So, expose it, and let shmem_mfill_atomic_pte() use it
directly, to reduce code duplication.
This requires that we refactor shmem_mfill_atomic_pte() a bit:
Instead of doing accounting (shmem_recalc_inode() et al) part-way
through the PTE setup, do it afterward. This frees up
mfill_atomic_install_pte() from having to care about this accounting,
and means we don't need to e.g. shmem_uncharge() in the error path.
A side effect is this switches shmem_mfill_atomic_pte() to use
lru_cache_add_inactive_or_unevictable() instead of just lru_cache_add().
This wrapper does some extra accounting in an exceptional case, if
appropriate, so it's actually the more correct thing to use.
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
---
include/linux/userfaultfd_k.h | 5 +++
mm/shmem.c | 58 ++++++++---------------------------
mm/userfaultfd.c | 17 ++++------
3 files changed, 23 insertions(+), 57 deletions(-)
@@ -2378,14 +2378,11 @@ int shmem_mfill_atomic_pte(struct mm_struct *dst_mm,structaddress_space*mapping=inode->i_mapping;gfp_tgfp=mapping_gfp_mask(mapping);pgoff_tpgoff=linear_page_index(dst_vma,dst_addr);-spinlock_t*ptl;void*page_kaddr;structpage*page;-pte_t_dst_pte,*dst_pte;intret;pgoff_tmax_off;-ret=-ENOMEM;if(!shmem_inode_acct_block(inode,1)){/**Wemayhavegotapage,returned-ENOENTtriggeringaretry,
@@ -2396,10 +2393,11 @@ int shmem_mfill_atomic_pte(struct mm_struct *dst_mm,put_page(*pagep);*pagep=NULL;}-gotoout;+return-ENOMEM;}if(!*pagep){+ret=-ENOMEM;page=shmem_alloc_page(gfp,info,pgoff);if(!page)gotoout_unacct_blocks;
@@ -2414,9 +2412,9 @@ int shmem_mfill_atomic_pte(struct mm_struct *dst_mm,/* fallback to copy_from_user outside mmap_lock */if(unlikely(ret)){*pagep=page;-shmem_inode_unacct_blocks(inode,1);+ret=-ENOENT;/* don't free the page */-return-ENOENT;+gotoout_unacct_blocks;}}else{/* ZEROPAGE */clear_highpage(page);
@@ -2442,32 +2440,10 @@ int shmem_mfill_atomic_pte(struct mm_struct *dst_mm,if(ret)gotoout_release;-_dst_pte=mk_pte(page,dst_vma->vm_page_prot);-if(dst_vma->vm_flags&VM_WRITE)-_dst_pte=pte_mkwrite(pte_mkdirty(_dst_pte));-else{-/*-*Wedon'tsettheptedirtyifthevmahasno-*VM_WRITEpermission,somarkthepagedirtyorit-*couldbefreedfromunderus.Wecoulddoit-*unconditionallybeforeunlock_page(),butdoingit-*onlyifVM_WRITEisnotsetisfaster.-*/-set_page_dirty(page);-}--dst_pte=pte_offset_map_lock(dst_mm,dst_pmd,dst_addr,&ptl);--ret=-EFAULT;-max_off=DIV_ROUND_UP(i_size_read(inode),PAGE_SIZE);-if(unlikely(pgoff>=max_off))-gotoout_release_unlock;--ret=-EEXIST;-if(!pte_none(*dst_pte))-gotoout_release_unlock;--lru_cache_add(page);+ret=mfill_atomic_install_pte(dst_mm,dst_pmd,dst_vma,dst_addr,+page,true,false);+if(ret)+gotoout_delete_from_cache;spin_lock_irq(&info->lock);info->alloced++;
@@ -2475,27 +2451,17 @@ int shmem_mfill_atomic_pte(struct mm_struct *dst_mm,shmem_recalc_inode(inode);spin_unlock_irq(&info->lock);-inc_mm_counter(dst_mm,mm_counter_file(page));-page_add_file_rmap(page,false);-set_pte_at(dst_mm,dst_addr,dst_pte,_dst_pte);--/* No need to invalidate - it was non-present before */-update_mmu_cache(dst_vma,dst_addr,dst_pte);-pte_unmap_unlock(dst_pte,ptl);+SetPageDirty(page);unlock_page(page);-ret=0;-out:-returnret;-out_release_unlock:-pte_unmap_unlock(dst_pte,ptl);-ClearPageDirty(page);+return0;+out_delete_from_cache:delete_from_page_cache(page);out_release:unlock_page(page);put_page(page);out_unacct_blocks:shmem_inode_unacct_blocks(inode,1);-gotoout;+returnret;}#endif /* CONFIG_USERFAULTFD */
From: Peter Xu <peterx@redhat.com> Date: 2021-05-05 01:32:13
Axel,
On Mon, May 03, 2021 at 11:07:33AM -0700, Axel Rasmussen wrote:
In a previous commit, we added the mfill_atomic_install_pte() helper.
This helper does the job of setting up PTEs for an existing page, to map
it into a given VMA. It deals with both the anon and shmem cases, as
well as the shared and private cases.
In other words, shmem_mfill_atomic_pte() duplicates a case it already
handles. So, expose it, and let shmem_mfill_atomic_pte() use it
directly, to reduce code duplication.
This requires that we refactor shmem_mfill_atomic_pte() a bit:
Instead of doing accounting (shmem_recalc_inode() et al) part-way
through the PTE setup, do it afterward. This frees up
mfill_atomic_install_pte() from having to care about this accounting,
and means we don't need to e.g. shmem_uncharge() in the error path.
A side effect is this switches shmem_mfill_atomic_pte() to use
lru_cache_add_inactive_or_unevictable() instead of just lru_cache_add().
This wrapper does some extra accounting in an exceptional case, if
appropriate, so it's actually the more correct thing to use.
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
(The moving of "ret = -ENOMEM" seems unnecessary, but not a big deal I think)
Reviewed-by: Peter Xu <peterx@redhat.com>
Thanks,
--
Peter Xu
In a previous commit, we added the mfill_atomic_install_pte() helper.
This helper does the job of setting up PTEs for an existing page, to map
it into a given VMA. It deals with both the anon and shmem cases, as
well as the shared and private cases.
In other words, shmem_mfill_atomic_pte() duplicates a case it already
handles. So, expose it, and let shmem_mfill_atomic_pte() use it
directly, to reduce code duplication.
This requires that we refactor shmem_mfill_atomic_pte() a bit:
Instead of doing accounting (shmem_recalc_inode() et al) part-way
through the PTE setup, do it afterward. This frees up
mfill_atomic_install_pte() from having to care about this accounting,
and means we don't need to e.g. shmem_uncharge() in the error path.
A side effect is this switches shmem_mfill_atomic_pte() to use
lru_cache_add_inactive_or_unevictable() instead of just lru_cache_add().
This wrapper does some extra accounting in an exceptional case, if
appropriate, so it's actually the more correct thing to use.
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
Acked-by: Hugh Dickins <hughd@google.com>
And thanks for doing those late mcopy->mfill renamings,
I think those represent Andrea's intent better.
As far as I'm concerned, this series is now ripe for picking
into mmotm (bearing in mind the dependencies you noted in 00/10):
thank you Axel.
@@ -2378,14 +2378,11 @@ int shmem_mfill_atomic_pte(struct mm_struct *dst_mm,structaddress_space*mapping=inode->i_mapping;gfp_tgfp=mapping_gfp_mask(mapping);pgoff_tpgoff=linear_page_index(dst_vma,dst_addr);-spinlock_t*ptl;void*page_kaddr;structpage*page;-pte_t_dst_pte,*dst_pte;intret;pgoff_tmax_off;-ret=-ENOMEM;if(!shmem_inode_acct_block(inode,1)){/**Wemayhavegotapage,returned-ENOENTtriggeringaretry,
@@ -2396,10 +2393,11 @@ int shmem_mfill_atomic_pte(struct mm_struct *dst_mm,put_page(*pagep);*pagep=NULL;}-gotoout;+return-ENOMEM;}if(!*pagep){+ret=-ENOMEM;page=shmem_alloc_page(gfp,info,pgoff);if(!page)gotoout_unacct_blocks;
@@ -2414,9 +2412,9 @@ int shmem_mfill_atomic_pte(struct mm_struct *dst_mm,/* fallback to copy_from_user outside mmap_lock */if(unlikely(ret)){*pagep=page;-shmem_inode_unacct_blocks(inode,1);+ret=-ENOENT;/* don't free the page */-return-ENOENT;+gotoout_unacct_blocks;}}else{/* ZEROPAGE */clear_highpage(page);
@@ -2442,32 +2440,10 @@ int shmem_mfill_atomic_pte(struct mm_struct *dst_mm,if(ret)gotoout_release;-_dst_pte=mk_pte(page,dst_vma->vm_page_prot);-if(dst_vma->vm_flags&VM_WRITE)-_dst_pte=pte_mkwrite(pte_mkdirty(_dst_pte));-else{-/*-*Wedon'tsettheptedirtyifthevmahasno-*VM_WRITEpermission,somarkthepagedirtyorit-*couldbefreedfromunderus.Wecoulddoit-*unconditionallybeforeunlock_page(),butdoingit-*onlyifVM_WRITEisnotsetisfaster.-*/-set_page_dirty(page);-}--dst_pte=pte_offset_map_lock(dst_mm,dst_pmd,dst_addr,&ptl);--ret=-EFAULT;-max_off=DIV_ROUND_UP(i_size_read(inode),PAGE_SIZE);-if(unlikely(pgoff>=max_off))-gotoout_release_unlock;--ret=-EEXIST;-if(!pte_none(*dst_pte))-gotoout_release_unlock;--lru_cache_add(page);+ret=mfill_atomic_install_pte(dst_mm,dst_pmd,dst_vma,dst_addr,+page,true,false);+if(ret)+gotoout_delete_from_cache;spin_lock_irq(&info->lock);info->alloced++;
@@ -2475,27 +2451,17 @@ int shmem_mfill_atomic_pte(struct mm_struct *dst_mm,shmem_recalc_inode(inode);spin_unlock_irq(&info->lock);-inc_mm_counter(dst_mm,mm_counter_file(page));-page_add_file_rmap(page,false);-set_pte_at(dst_mm,dst_addr,dst_pte,_dst_pte);--/* No need to invalidate - it was non-present before */-update_mmu_cache(dst_vma,dst_addr,dst_pte);-pte_unmap_unlock(dst_pte,ptl);+SetPageDirty(page);unlock_page(page);-ret=0;-out:-returnret;-out_release_unlock:-pte_unmap_unlock(dst_pte,ptl);-ClearPageDirty(page);+return0;+out_delete_from_cache:delete_from_page_cache(page);out_release:unlock_page(page);put_page(page);out_unacct_blocks:shmem_inode_unacct_blocks(inode,1);-gotoout;+returnret;}#endif /* CONFIG_USERFAULTFD */
From: Axel Rasmussen <axelrasmussen@google.com> Date: 2021-05-03 18:08:28
This is a preparatory commit. In the future, we want to be able to setup
alias mappings for area_src and area_dst in the shmem test, like we do
in the hugetlb_shared test. With a VMA obtained via
mmap(MAP_ANONYMOUS | MAP_SHARED), it isn't clear how to do this.
So, mmap() with an fd, so we can create alias mappings. Use memfd_create
instead of actually passing in a tmpfs path like hugetlb does, since
it's more convenient / simpler to run, and works just as well.
Future commits will:
1. Setup the alias mappings.
2. Extend our tests to actually take advantage of this, to test new
userfaultfd behavior being introduced in this series.
Also, a small fix in the area we're changing: when the hugetlb setup
fails in main(), pass in the right argv[] so we actually print out the
hugetlb file path.
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
---
tools/testing/selftests/vm/userfaultfd.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
From: Axel Rasmussen <axelrasmussen@google.com> Date: 2021-05-03 18:08:28
Previously, we just allocated two shm areas: area_src and area_dst. With
this commit, change this so we also allocate area_src_alias, and
area_dst_alias.
area_*_alias and area_* (respectively) point to the same underlying
physical pages, but are different VMAs. In a future commit in this
series, we'll leverage this setup to exercise minor fault handling
support for shmem, just like we do in the hugetlb_shared test.
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
---
tools/testing/selftests/vm/userfaultfd.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
@@ -278,13 +278,29 @@ static void shmem_release_pages(char *rel_area)staticvoidshmem_allocate_area(void**alloc_area){-unsignedlongoffset=-alloc_area==(void**)&area_src?0:nr_pages*page_size;+void*area_alias=NULL;+boolis_src=alloc_area==(void**)&area_src;+unsignedlongoffset=is_src?0:nr_pages*page_size;*alloc_area=mmap(NULL,nr_pages*page_size,PROT_READ|PROT_WRITE,MAP_SHARED,shm_fd,offset);if(*alloc_area==MAP_FAILED)err("mmap of memfd failed");++area_alias=mmap(NULL,nr_pages*page_size,PROT_READ|PROT_WRITE,+MAP_SHARED,shm_fd,offset);+if(area_alias==MAP_FAILED)+err("mmap of memfd alias failed");++if(is_src)+area_src_alias=area_alias;+else+area_dst_alias=area_alias;+}++staticvoidshmem_alias_mapping(__u64*start,size_tlen,unsignedlongoffset)+{+*start=(unsignedlong)area_dst_alias+offset;}structuffd_test_ops{
From: Axel Rasmussen <axelrasmussen@google.com> Date: 2021-05-03 18:08:30
Currently, the context (fds, mmap-ed areas, etc.) are global. Each test
mutates this state in some way, in some cases really "clobbering it"
(e.g., the events test mremap-ing area_dst over the top of area_src, or
the minor faults tests overwriting the count_verify values in the test
areas). We run the tests in a particular order, each test is careful to
make the right assumptions about its starting state, etc.
But, this is fragile. It's better for a test's success or failure to not
depend on what some other prior test case did to the global state.
To that end, clear and reinitialize the test context at the start of
each test case, so whatever prior test cases did doesn't affect future
tests.
This is particularly relevant to this series because the events test's
mremap of area_dst screws up assumptions the minor fault test was
relying on. This wasn't a problem for hugetlb, as we don't mremap in
that case.
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
---
tools/testing/selftests/vm/userfaultfd.c | 215 ++++++++++++-----------
1 file changed, 116 insertions(+), 99 deletions(-)
@@ -89,7 +89,8 @@ static int shm_fd;staticinthuge_fd;staticchar*huge_fd_off0;staticunsignedlonglong*count_verify;-staticintuffd,uffd_flags,finished,*pipefd;+staticintuffd=-1;+staticintuffd_flags,finished,*pipefd;staticchar*area_src,*area_src_alias,*area_dst,*area_dst_alias;staticchar*zeropage;pthread_attr_tattr;
@@ -342,6 +343,111 @@ static struct uffd_test_ops hugetlb_uffd_test_ops = {staticstructuffd_test_ops*uffd_test_ops;+staticvoiduserfaultfd_open(uint64_t*features)+{+structuffdio_apiuffdio_api;++uffd=syscall(__NR_userfaultfd,O_CLOEXEC|O_NONBLOCK|UFFD_USER_MODE_ONLY);+if(uffd<0)+err("userfaultfd syscall not available in this kernel");+uffd_flags=fcntl(uffd,F_GETFD,NULL);++uffdio_api.api=UFFD_API;+uffdio_api.features=*features;+if(ioctl(uffd,UFFDIO_API,&uffdio_api))+err("UFFDIO_API failed.\nPlease make sure to "+"run with either root or ptrace capability.");+if(uffdio_api.api!=UFFD_API)+err("UFFDIO_API error: %"PRIu64,(uint64_t)uffdio_api.api);++*features=uffdio_api.features;+}++staticinlinevoidmunmap_area(void**area)+{+if(*area)+if(munmap(*area,nr_pages*page_size))+err("munmap");++*area=NULL;+}++staticvoiduffd_test_ctx_clear(void)+{+size_ti;++if(pipefd){+for(i=0;i<nr_cpus*2;++i){+if(close(pipefd[i]))+err("close pipefd");+}+free(pipefd);+pipefd=NULL;+}++if(count_verify){+free(count_verify);+count_verify=NULL;+}++if(uffd!=-1){+if(close(uffd))+err("close uffd");+uffd=-1;+}++huge_fd_off0=NULL;+munmap_area((void**)&area_src);+munmap_area((void**)&area_src_alias);+munmap_area((void**)&area_dst);+munmap_area((void**)&area_dst_alias);+}++staticvoiduffd_test_ctx_init_ext(uint64_t*features)+{+unsignedlongnr,cpu;++uffd_test_ctx_clear();++uffd_test_ops->allocate_area((void**)&area_src);+uffd_test_ops->allocate_area((void**)&area_dst);++uffd_test_ops->release_pages(area_src);+uffd_test_ops->release_pages(area_dst);++userfaultfd_open(features);++count_verify=malloc(nr_pages*sizeof(unsignedlonglong));+if(!count_verify)+err("count_verify");++for(nr=0;nr<nr_pages;nr++){+*area_mutex(area_src,nr)=+(pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER;+count_verify[nr]=*area_count(area_src,nr)=1;+/*+*Inthetransitionbetween255to256,powerpcwill+*readoutoforderinmy_bcmpandseebothbytesas+*zero,soleaveaplaceholderbelowalwaysnon-zero+*afterthecount,toavoidmy_bcmptotriggerfalse+*positives.+*/+*(area_count(area_src,nr)+1)=1;+}++pipefd=malloc(sizeof(int)*nr_cpus*2);+if(!pipefd)+err("pipefd");+for(cpu=0;cpu<nr_cpus;cpu++)+if(pipe2(&pipefd[cpu*2],O_CLOEXEC|O_NONBLOCK))+err("pipe");+}++staticinlinevoiduffd_test_ctx_init(uint64_tfeatures)+{+uffd_test_ctx_init_ext(&features);+}+staticintmy_bcmp(char*str1,char*str2,size_tn){unsignedlongi;
@@ -726,40 +832,6 @@ static int stress(struct uffd_stats *uffd_stats)return0;}-staticintuserfaultfd_open_ext(uint64_t*features)-{-structuffdio_apiuffdio_api;--uffd=syscall(__NR_userfaultfd,O_CLOEXEC|O_NONBLOCK|UFFD_USER_MODE_ONLY);-if(uffd<0){-fprintf(stderr,-"userfaultfd syscall not available in this kernel\n");-return1;-}-uffd_flags=fcntl(uffd,F_GETFD,NULL);--uffdio_api.api=UFFD_API;-uffdio_api.features=*features;-if(ioctl(uffd,UFFDIO_API,&uffdio_api)){-fprintf(stderr,"UFFDIO_API failed.\nPlease make sure to "-"run with either root or ptrace capability.\n");-return1;-}-if(uffdio_api.api!=UFFD_API){-fprintf(stderr,"UFFDIO_API error: %"PRIu64"\n",-(uint64_t)uffdio_api.api);-return1;-}--*features=uffdio_api.features;-return0;-}--staticintuserfaultfd_open(uint64_tfeatures)-{-returnuserfaultfd_open_ext(&features);-}-sigjmp_bufjbuf,*sigbuf;staticvoidsighndl(intsig,siginfo_t*siginfo,void*ptr)
@@ -868,6 +940,8 @@ static int faulting_process(int signal_test)MREMAP_MAYMOVE|MREMAP_FIXED,area_src);if(area_dst==MAP_FAILED)err("mremap");+/* Reset area_src since we just clobbered it */+area_src=NULL;for(;nr<nr_pages;nr++){count=*area_count(area_dst,nr);
@@ -961,10 +1035,8 @@ static int userfaultfd_zeropage_test(void)printf("testing UFFDIO_ZEROPAGE: ");fflush(stdout);-uffd_test_ops->release_pages(area_dst);+uffd_test_ctx_init(0);-if(userfaultfd_open(0))-return1;uffdio_register.range.start=(unsignedlong)area_dst;uffdio_register.range.len=nr_pages*page_size;uffdio_register.mode=UFFDIO_REGISTER_MODE_MISSING;
@@ -981,7 +1053,6 @@ static int userfaultfd_zeropage_test(void)if(my_bcmp(area_dst,zeropage,page_size))err("zeropage is not zero");-close(uffd);printf("done.\n");return0;}
@@ -1037,8 +1106,6 @@ static int userfaultfd_events_test(void)if(pthread_join(uffd_mon,NULL))return1;-close(uffd);-uffd_stats_report(&stats,1);returnstats.missing_faults!=nr_pages;
@@ -1058,11 +1125,9 @@ static int userfaultfd_sig_test(void)printf("testing signal delivery: ");fflush(stdout);-uffd_test_ops->release_pages(area_dst);-features=UFFD_FEATURE_EVENT_FORK|UFFD_FEATURE_SIGBUS;-if(userfaultfd_open(features))-return1;+uffd_test_ctx_init(features);+fcntl(uffd,F_SETFL,uffd_flags|O_NONBLOCK);uffdio_register.range.start=(unsignedlong)area_dst;
@@ -1103,7 +1168,6 @@ static int userfaultfd_sig_test(void)printf("done.\n");if(userfaults)err("Signal test failed, userfaults: %ld",userfaults);-close(uffd);returnuserfaults!=0;}
@@ -1126,10 +1190,7 @@ static int userfaultfd_minor_test(void)printf("testing minor faults: ");fflush(stdout);-uffd_test_ops->release_pages(area_dst);--if(userfaultfd_open_ext(&features))-return1;+uffd_test_ctx_init_ext(&features);/* If kernel reports the feature isn't supported, skip the test. */if(!(features&UFFD_FEATURE_MINOR_HUGETLBFS)){printf("skipping test due to lack of feature support\n");
@@ -1183,8 +1244,6 @@ static int userfaultfd_minor_test(void)if(pthread_join(uffd_mon,NULL))return1;-close(uffd);-uffd_stats_report(&stats,1);returnstats.missing_faults!=0||stats.minor_faults!=nr_pages;
@@ -1196,50 +1255,9 @@ static int userfaultfd_stress(void)char*tmp_area;unsignedlongnr;structuffdio_registeruffdio_register;-unsignedlongcpu;structuffd_statsuffd_stats[nr_cpus];-uffd_test_ops->allocate_area((void**)&area_src);-if(!area_src)-return1;-uffd_test_ops->allocate_area((void**)&area_dst);-if(!area_dst)-return1;--if(userfaultfd_open(0))-return1;--count_verify=malloc(nr_pages*sizeof(unsignedlonglong));-if(!count_verify){-perror("count_verify");-return1;-}--for(nr=0;nr<nr_pages;nr++){-*area_mutex(area_src,nr)=(pthread_mutex_t)-PTHREAD_MUTEX_INITIALIZER;-count_verify[nr]=*area_count(area_src,nr)=1;-/*-*Inthetransitionbetween255to256,powerpcwill-*readoutoforderinmy_bcmpandseebothbytesas-*zero,soleaveaplaceholderbelowalwaysnon-zero-*afterthecount,toavoidmy_bcmptotriggerfalse-*positives.-*/-*(area_count(area_src,nr)+1)=1;-}--pipefd=malloc(sizeof(int)*nr_cpus*2);-if(!pipefd){-perror("pipefd");-return1;-}-for(cpu=0;cpu<nr_cpus;cpu++){-if(pipe2(&pipefd[cpu*2],O_CLOEXEC|O_NONBLOCK)){-perror("pipe");-return1;-}-}+uffd_test_ctx_init(0);if(posix_memalign(&area,page_size,page_size))err("out of memory");
@@ -1360,7 +1378,6 @@ static int userfaultfd_stress(void)uffd_stats_report(uffd_stats,nr_cpus);}-close(uffd);returnuserfaultfd_zeropage_test()||userfaultfd_sig_test()||userfaultfd_events_test()||userfaultfd_minor_test();}
From: Axel Rasmussen <axelrasmussen@google.com> Date: 2021-05-03 18:08:32
Enable test_uffdio_minor for test_type == TEST_SHMEM, and modify the
test slightly to pass in / check for the right feature flags.
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
---
tools/testing/selftests/vm/userfaultfd.c | 29 ++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
@@ -1182,7 +1194,7 @@ static int userfaultfd_minor_test(void)void*expected_page;charc;structuffd_statsstats={0};-uint64_tfeatures=UFFD_FEATURE_MINOR_HUGETLBFS;+uint64_treq_features,features_out;if(!test_uffdio_minor)return0;
@@ -1190,9 +1202,17 @@ static int userfaultfd_minor_test(void)printf("testing minor faults: ");fflush(stdout);-uffd_test_ctx_init_ext(&features);-/* If kernel reports the feature isn't supported, skip the test. */-if(!(features&UFFD_FEATURE_MINOR_HUGETLBFS)){+if(test_type==TEST_HUGETLB)+req_features=UFFD_FEATURE_MINOR_HUGETLBFS;+elseif(test_type==TEST_SHMEM)+req_features=UFFD_FEATURE_MINOR_SHMEM;+else+return1;++features_out=req_features;+uffd_test_ctx_init_ext(&features_out);+/* If kernel reports required features aren't supported, skip test. */+if((features_out&req_features)!=req_features){printf("skipping test due to lack of feature support\n");fflush(stdout);return0;