The quilt patch titled
Subject: mm/uffd: hide PTE_MARKER option
has been removed from the -mm tree. Its filename was
mm-enable-pte-markers-by-default-fix.patch
This patch was dropped because it was folded into mm-enable-pte-markers-by-default.patch
------------------------------------------------------
From: Peter Xu <peterx@xxxxxxxxxx>
Subject: mm/uffd: hide PTE_MARKER option
The PTE_MARKER option should not need to be exposed to the kernel builder,
keep it internal and remove the prompt so it won't be seen.
Instead, make the PTE_MARKER_UFFD_WP option to explicitly choose
PTE_MARKER when necessary.
While PTE_MARKER_UFFD_WP will still prompt to user, change the wording so
that it'll not mention PTE_MARKER at all but renaming it to "Userfaultfd
write protection support for shmem/hugetlbfs".
Link: https://lkml.kernel.org/r/20220419202531.27415-1-peterx@xxxxxxxxxx
Signed-off-by: Peter Xu <peterx@xxxxxxxxxx>
Reported-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Acked-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/Kconfig | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/mm/Kconfig~mm-enable-pte-markers-by-default-fix
+++ a/mm/Kconfig
@@ -910,16 +910,16 @@ config ANON_VMA_NAME
difference in their name.
config PTE_MARKER
- bool "Marker PTEs support"
- default y
+ bool
help
Allows to create marker PTEs for file-backed memory.
config PTE_MARKER_UFFD_WP
- bool "Marker PTEs support for userfaultfd write protection"
+ bool "Userfaultfd write protection support for shmem/hugetlbfs"
default y
- depends on PTE_MARKER && HAVE_ARCH_USERFAULTFD_WP
+ depends on HAVE_ARCH_USERFAULTFD_WP
+ select PTE_MARKER
help
Allows to create marker PTEs for userfaultfd write protection
_
Patches currently in -mm which might be from peterx@xxxxxxxxxx are
mm-introduce-pte_marker-swap-entry.patch
mm-teach-core-mm-about-pte-markers.patch
mm-check-against-orig_pte-for-finish_fault.patch
mm-uffd-pte_marker_uffd_wp.patch
mm-uffd-pte_marker_uffd_wp-fix.patch
mm-shmem-take-care-of-uffdio_copy_mode_wp.patch
mm-shmem-handle-uffd-wp-special-pte-in-page-fault-handler.patch
mm-shmem-persist-uffd-wp-bit-across-zapping-for-file-backed.patch
mm-shmem-allow-uffd-wr-protect-none-pte-for-file-backed-mem.patch
mm-shmem-allows-file-back-mem-to-be-uffd-wr-protected-on-thps.patch
mm-shmem-handle-uffd-wp-during-fork.patch
mm-hugetlb-introduce-huge-pte-version-of-uffd-wp-helpers.patch
mm-hugetlb-hook-page-faults-for-uffd-write-protection.patch
mm-hugetlb-take-care-of-uffdio_copy_mode_wp.patch
mm-hugetlb-handle-uffdio_writeprotect.patch
mm-hugetlb-handle-pte-markers-in-page-faults.patch
mm-hugetlb-allow-uffd-wr-protect-none-ptes.patch
mm-hugetlb-only-drop-uffd-wp-special-pte-if-required.patch
mm-hugetlb-handle-uffd-wp-during-fork.patch
mm-khugepaged-dont-recycle-vma-pgtable-if-uffd-wp-registered.patch
mm-pagemap-recognize-uffd-wp-bit-for-shmem-hugetlbfs.patch
mm-uffd-enable-write-protection-for-shmem-hugetlbfs.patch
mm-enable-pte-markers-by-default.patch
selftests-uffd-enable-uffd-wp-for-shmem-hugetlbfs.patch
mm-uffd-move-userfaultfd-configs-into-mm.patch
