Skip to contentSkip to conversation

userfaultfd: Add tests for UFFDIO_RWPROTECT and UFFDIO_SET_MODE

PATCH Superseded Ricardo Branco 2 participants 2 messages Oct 24

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 userfaultfd: Add tests for UFFDIO_RWPROTECT and UFFDIO_SET_MODE

Add userfaultfd08 to exercise UFFDIO_RWPROTECT: a page is registered with UFFDIO_REGISTER_MODE_RWP, protected with UFFDIO_RWPROTECT_MODE_RWP, and a plain read from a second thread is verified to raise a UFFD_PAGEFAULT_FLAG_RWP fault (without UFFD_PAGEFAULT_FLAG_WRITE) that is resolved by clearing the RWP mode, preserving page contents.

Add userfaultfd09 to exercise UFFDIO_SET_MODE toggling UFFD_FEATURE_RWP_ASYNC at runtime: with async mode enabled at UFFDIO_API time, a protected page is accessed and auto-resolved with no fault message delivered; UFFDIO_SET_MODE then disables async mode, and the same access on a freshly protected page now blocks and is delivered as a fault, handled from a second thread as above.

Add the UFFDIO_RWPROTECT and UFFDIO_SET_MODE ioctls, their associated structs, and the UFFD_FEATURE_RWP/UFFD_FEATURE_RWP_ASYNC feature bits to lapi/userfaultfd.h for systems whose kernel headers predate them.

---
 configure.ac                                  |   2 +
 include/lapi/userfaultfd.h                    |  30 ++-
 runtest/syscalls                              |   2 +
 .../kernel/syscalls/userfaultfd/.gitignore    |   2 +
 .../kernel/syscalls/userfaultfd/Makefile      |   2 +
 .../syscalls/userfaultfd/userfaultfd08.c      | 148 +++++++++++++++
 .../syscalls/userfaultfd/userfaultfd09.c      | 179 ++++++++++++++++++
 7 files changed, 364 insertions(+), 1 deletion(-)
 create mode 100644 testcases/kernel/syscalls/userfaultfd/userfaultfd08.c
 create mode 100644 testcases/kernel/syscalls/userfaultfd/userfaultfd09.c
configure.ac +2 -0
index d75e94162..359a584f5 100644
@@ -298,6 +298,8 @@ AC_CHECK_TYPES([struct sockaddr_vm],,,[
 
 AC_CHECK_TYPES([struct uffdio_move],,,[#include <linux/userfaultfd.h>])
 AC_CHECK_TYPES([struct uffdio_poison],,,[#include <linux/userfaultfd.h>])
+AC_CHECK_TYPES([struct uffdio_rwprotect],,,[#include <linux/userfaultfd.h>])
+AC_CHECK_TYPES([struct uffdio_set_mode],,,[#include <linux/userfaultfd.h>])
 AC_CHECK_TYPES([struct uffdio_writeprotect],,,[#include <linux/userfaultfd.h>])
 
 AC_CHECK_TYPES([struct keyctl_dh_params, struct keyctl_kdf_params,
include/lapi/userfaultfd.h +29 -1
index 4a25e7338..36a28bd7a 100644
@@ -247,6 +247,34 @@ struct uffdio_poison {
 };
 #endif	/* HAVE_STRUCT_UFFDIO_POISON */
 
+#ifndef HAVE_STRUCT_UFFDIO_RWPROTECT
+#define UFFD_FEATURE_RWP			(1<<17)
+#define UFFD_FEATURE_RWP_ASYNC			(1<<18)
+#define UFFD_PAGEFAULT_FLAG_RWP			(1<<3)
+#define UFFDIO_REGISTER_MODE_RWP		((__u64)1<<3)
+#define _UFFDIO_RWPROTECT			(0x09)
+#define UFFDIO_RWPROTECT	_IOWR(UFFDIO, _UFFDIO_RWPROTECT, \
+				      struct uffdio_rwprotect)
+
+struct uffdio_rwprotect {
+	struct uffdio_range range;
+#define UFFDIO_RWPROTECT_MODE_RWP		((__u64)1<<0)
+#define UFFDIO_RWPROTECT_MODE_DONTWAKE		((__u64)1<<1)
+	__u64 mode;
+};
+#endif	/* HAVE_STRUCT_UFFDIO_RWPROTECT */
+
+#ifndef HAVE_STRUCT_UFFDIO_SET_MODE
+#define _UFFDIO_SET_MODE			(0x0A)
+#define UFFDIO_SET_MODE	_IOW(UFFDIO, _UFFDIO_SET_MODE, \
+				     struct uffdio_set_mode)
+
+struct uffdio_set_mode {
+	__u64 enable;
+	__u64 disable;
+};
+#endif	/* HAVE_STRUCT_UFFDIO_SET_MODE */
+
 #define SAFE_USERFAULTFD(flags, retry) \
 	safe_userfaultfd(__FILE__, __LINE__, (flags), (retry))
 
@@ -285,7 +313,7 @@ static inline void check_uffd_feature(uint64_t feature, const char *name)
 	struct uffdio_api uffdio_api = {};
 	int uffd;
 
-	uffd = SAFE_USERFAULTFD(O_CLOEXEC | O_NONBLOCK, false);
+	uffd = SAFE_USERFAULTFD(O_CLOEXEC | O_NONBLOCK, true);
 
 	uffdio_api.api = UFFD_API;
 	SAFE_IOCTL(uffd, UFFDIO_API, &uffdio_api);
runtest/syscalls +2 -0
index 2bdb4a9a2..e01c62d76 100644
@@ -1843,6 +1843,8 @@ userfaultfd04 userfaultfd04
 userfaultfd05 userfaultfd05
 userfaultfd06 userfaultfd06
 userfaultfd07 userfaultfd07
+userfaultfd08 userfaultfd08
+userfaultfd09 userfaultfd09
 
 ustat01 ustat01
 ustat02 ustat02
testcases/kernel/syscalls/userfaultfd/.gitignore +2 -0
index 3478a162e..7a9b2edb6 100644
@@ -5,3 +5,5 @@
 /userfaultfd05
 /userfaultfd06
 /userfaultfd07
+/userfaultfd08
+/userfaultfd09
testcases/kernel/syscalls/userfaultfd/Makefile +2 -0
index 257249e88..48fa533ad 100644
@@ -18,3 +18,5 @@ userfaultfd04: CFLAGS += -pthread
 userfaultfd05: CFLAGS += -pthread
 userfaultfd06: CFLAGS += -pthread
 userfaultfd07: CFLAGS += -pthread
+userfaultfd08: CFLAGS += -pthread
+userfaultfd09: CFLAGS += -pthread
testcases/kernel/syscalls/userfaultfd/userfaultfd08.c new file +148 -0

148 lines not on this page · raw message

testcases/kernel/syscalls/userfaultfd/userfaultfd09.c new file +179 -0

179 lines not on this page · raw message

Signature · 5 lines
2.56.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
#1 lore raw

Hi Ricardo,

include/lapi/userfaultfd.h static inline void check_uffd_feature(uint64_t feature, const char *name) · line 316

Quoted 5 lines · Ricardo Branco

userfaultfd: Add tests for UFFDIO_RWPROTECT and UFFDIO_SET_MODE

include/lapi/userfaultfd.h +1 -1
-	uffd = SAFE_USERFAULTFD(O_CLOEXEC | O_NONBLOCK, false);
+	uffd = SAFE_USERFAULTFD(O_CLOEXEC | O_NONBLOCK, true);

Medium: On Linux 5.2-5.10, without CAP_SYS_PTRACE and with vm.unprivileged_userfaultfd=0, the retry adds the unsupported UFFD_USER_MODE_ONLY flag and returns EINVAL, producing TBROK instead of TCONF. This also regresses existing callers such as userfaultfd05 on Linux 5.10. Handle EINVAL from the unsupported retry flag as TCONF while retaining the fallback for kernels that support it.

Verdict - Needs revision

---
Note:

The agent can sometimes produce false positives although often its findings are genuine. If you find issues with the review, please comment this email or ignore the suggestions.

Regards,
LTP AI Reviewer

Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp