[043/192] userfaultfd/shmem: advertise shmem minor fault support

Commit Message

Andrew Morton July 1, 2021, 1:49 a.m. UTC

From: Axel Rasmussen <[e-mail]>
Subject: userfaultfd/shmem: advertise shmem minor fault support

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.

Link: https://lkml.kernel.org/r/[e-mail]
Signed-off-by: Axel Rasmussen <[e-mail]>
Acked-by: Hugh Dickins <[e-mail]>
Acked-by: Peter Xu <[e-mail]>
Cc: Alexander Viro <[e-mail]>
Cc: Andrea Arcangeli <[e-mail]>
Cc: Brian Geffon <[e-mail]>
Cc: "Dr . David Alan Gilbert" <[e-mail]>
Cc: Jerome Glisse <[e-mail]>
Cc: Joe Perches <[e-mail]>
Cc: Kirill A. Shutemov <[e-mail]>
Cc: Lokesh Gidra <[e-mail]>
Cc: Mike Kravetz <[e-mail]>
Cc: Mike Rapoport <[e-mail]>
Cc: Mina Almasry <[e-mail]>
Cc: Oliver Upton <[e-mail]>
Cc: Shaohua Li <[e-mail]>
Cc: Shuah Khan <[e-mail]>
Cc: Stephen Rothwell <[e-mail]>
Cc: Wang Qing <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 Documentation/admin-guide/mm/userfaultfd.rst |    3 ++-
 fs/userfaultfd.c                             |    3 ++-
 include/uapi/linux/userfaultfd.h             |    7 ++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

Patch

--- a/Documentation/admin-guide/mm/userfaultfd.rst~userfaultfd-shmem-advertise-shmem-minor-fault-support
+++ a/Documentation/admin-guide/mm/userfaultfd.rst
@@ -77,7 +77,8 @@  events, except page fault notifications,
 
 - ``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
--- a/fs/userfaultfd.c~userfaultfd-shmem-advertise-shmem-minor-fault-support
+++ a/fs/userfaultfd.c
@@ -1944,7 +1944,8 @@  static int userfaultfd_api(struct userfa
 	/* 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);
 #endif
 #ifndef CONFIG_HAVE_ARCH_USERFAULTFD_WP
 	uffdio_api.features &= ~UFFD_FEATURE_PAGEFAULT_FLAG_WP;
--- a/include/uapi/linux/userfaultfd.h~userfaultfd-shmem-advertise-shmem-minor-fault-support
+++ a/include/uapi/linux/userfaultfd.h
@@ -31,7 +31,8 @@ 
 			   UFFD_FEATURE_MISSING_SHMEM |		\
 			   UFFD_FEATURE_SIGBUS |		\
 			   UFFD_FEATURE_THREAD_ID |		\
-			   UFFD_FEATURE_MINOR_HUGETLBFS)
+			   UFFD_FEATURE_MINOR_HUGETLBFS |	\
+			   UFFD_FEATURE_MINOR_SHMEM)
 #define UFFD_API_IOCTLS				\
 	((__u64)1 << _UFFDIO_REGISTER |		\
 	 (__u64)1 << _UFFDIO_UNREGISTER |	\
@@ -185,6 +186,9 @@  struct uffdio_api {
 	 * UFFD_FEATURE_MINOR_HUGETLBFS indicates that minor faults
 	 * can be intercepted (via REGISTER_MODE_MINOR) for
 	 * hugetlbfs-backed pages.
+	 *
+	 * UFFD_FEATURE_MINOR_SHMEM indicates the same support as
+	 * UFFD_FEATURE_MINOR_HUGETLBFS, but for shmem-backed pages instead.
 	 */
 #define UFFD_FEATURE_PAGEFAULT_FLAG_WP		(1<<0)
 #define UFFD_FEATURE_EVENT_FORK			(1<<1)
@@ -196,6 +200,7 @@  struct uffdio_api {
 #define UFFD_FEATURE_SIGBUS			(1<<7)
 #define UFFD_FEATURE_THREAD_ID			(1<<8)
 #define UFFD_FEATURE_MINOR_HUGETLBFS		(1<<9)
+#define UFFD_FEATURE_MINOR_SHMEM		(1<<10)
 	__u64 features;
 
 	__u64 ioctls;