Skip to contentSkip to conversation

userfaultfd05: allow TCONF when UFFD-WP is unsupported

PATCH In review Li Wang via ltp 3 participants 5 messages Jan 22 – Jan 23

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 userfaultfd05: allow TCONF when UFFD-WP is unsupported

On system without enable CONFIG_HAVE_ARCH_USERFAULTFD_WP kernel option, test will fail like below:

userfaultfd05.c:95: TBROK: ioctl(3,((((2U|1U) << (((0+8)+8)+14)) |

    (((0xAA)) << (0+8)) | ((((0x3F))) << 0) |
    ((((sizeof(struct uffdio_api)))) << ((0+8)+8)))),...)

failed: EINVAL (22)

The original test uses SAFE_IOCTL macro, which prematurely triggers TBROK and prevents the test from verifying UFFD_FEATURE_PAGEFAULT_FLAG_WP.

Cc Christian Amann <[email protected]>
Cc Ricardo Branco <[email protected]>
---
 testcases/kernel/syscalls/userfaultfd/userfaultfd05.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
testcases/kernel/syscalls/userfaultfd/userfaultfd05.c +4 -4
index c4edc2529..9cb0bb08f 100644
@@ -92,11 +92,11 @@ static void run(void)
 
 	uffdio_api.api = UFFD_API;
 	uffdio_api.features = UFFD_FEATURE_PAGEFAULT_FLAG_WP;
-	SAFE_IOCTL(uffd, UFFDIO_API, &uffdio_api);
+	if (ioctl(uffd, UFFDIO_API, &uffdio_api) < 0) {
+		if (!(uffdio_api.features & UFFD_FEATURE_PAGEFAULT_FLAG_WP))
+			tst_brk(TCONF, "UFFD write-protect unsupported");
 
-	if (!(uffdio_api.features & UFFD_FEATURE_PAGEFAULT_FLAG_WP)) {
-		tst_brk(TCONF, "UFFD write-protect unsupported");
-		return;
+		tst_brk(TBROK | TERRNO, "ioctl_userfaultfd failed");
 	}
 
 	uffdio_register.range.start = (unsigned long) page;
Signature · 5 lines
2.52.0


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

Hi Li,

Quoted 10 lines

On system without enable CONFIG_HAVE_ARCH_USERFAULTFD_WP kernel option, test will fail like below:

userfaultfd05.c:95: TBROK: ioctl(3,((((2U|1U) << (((0+8)+8)+14)) |

    (((0xAA)) << (0+8)) | ((((0x3F))) << 0) |
    ((((sizeof(struct uffdio_api)))) << ((0+8)+8)))),...)

failed: EINVAL (22)

The original test uses SAFE_IOCTL macro, which prematurely triggers TBROK and prevents the test from verifying UFFD_FEATURE_PAGEFAULT_FLAG_WP.

Good catch. I don't have any kernel without UFFD_FEATURE_PAGEFAULT_FLAG_WP, therefore I didn't notice.

Fixes efd8e51008 ("userfaultfd: Add test using UFFDIO_WRITEPROTECT")
Quoted 14 lines
Cc Christian Amann <[email protected]>
Cc Ricardo Branco <[email protected]>
---
 testcases/kernel/syscalls/userfaultfd/userfaultfd05.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
testcases/kernel/syscalls/userfaultfd/userfaultfd05.c +0 -0
index c4edc2529..9cb0bb08f 100644
@@ -92,11 +92,11 @@ static void run(void)
 
 	uffdio_api.api = UFFD_API;

testcases/kernel/syscalls/userfaultfd/userfaultfd05.c static void run(void) · line 99

Quoted 10 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd05.c +4 -4
 	uffdio_api.features = UFFD_FEATURE_PAGEFAULT_FLAG_WP;
-	SAFE_IOCTL(uffd, UFFDIO_API, &uffdio_api);
+	if (ioctl(uffd, UFFDIO_API, &uffdio_api) < 0) {
+		if (!(uffdio_api.features & UFFD_FEATURE_PAGEFAULT_FLAG_WP))
+			tst_brk(TCONF, "UFFD write-protect unsupported");
 
-	if (!(uffdio_api.features & UFFD_FEATURE_PAGEFAULT_FLAG_WP)) {
-		tst_brk(TCONF, "UFFD write-protect unsupported");
-		return;
+		tst_brk(TBROK | TERRNO, "ioctl_userfaultfd failed");

very nit: I would write "ioctl() on userfaultfd failed"? I was thinking what ioctl_userfaultfd is, but ok, there is man ioctl_userfaultfd(2).

Kind regards,
Petr

Quoted 3 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd05.c +0 -0
 	}
 
 	uffdio_register.range.start = (unsigned long) page;
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#2 lore raw
Quoted 11 lines
Quoted 10 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd05.c +3 -1
@@ -92,11 +92,11 @@ static void run(void)
 
      uffdio_api.api = UFFD_API;
      uffdio_api.features = UFFD_FEATURE_PAGEFAULT_FLAG_WP;
-     SAFE_IOCTL(uffd, UFFDIO_API, &uffdio_api);
+     if (ioctl(uffd, UFFDIO_API, &uffdio_api) < 0) {
+             if (!(uffdio_api.features & UFFD_FEATURE_PAGEFAULT_FLAG_WP))
+                     tst_brk(TCONF, "UFFD write-protect unsupported");
Quoted 7 lines

testcases/kernel/syscalls/userfaultfd/userfaultfd05.c static void run(void) · line 99

Quoted 4 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd05.c +1 -3
-     if (!(uffdio_api.features & UFFD_FEATURE_PAGEFAULT_FLAG_WP)) {
-             tst_brk(TCONF, "UFFD write-protect unsupported");
-             return;
+             tst_brk(TBROK | TERRNO, "ioctl_userfaultfd failed");

very nit: I would write "ioctl() on userfaultfd failed"? I was thinking what ioctl_userfaultfd is, but ok, there is man ioctl_userfaultfd(2).

Sure, patch megerd as you suggested, thanks!

Signature · 6 lines
Regards,
Li Wang


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp
Acked-by on v1 1/1
#3 lore raw
In reply to Li Wang via ltp
Quoted 11 lines · Li Wang
testcases/kernel/syscalls/userfaultfd/userfaultfd05.c +2 -1
index c4edc2529..9cb0bb08f 100644
@@ -92,11 +92,11 @@ static void run(void)
 
  	uffdio_api.api = UFFD_API;
  	uffdio_api.features = UFFD_FEATURE_PAGEFAULT_FLAG_WP;
-	SAFE_IOCTL(uffd, UFFDIO_API, &uffdio_api);
+	if (ioctl(uffd, UFFDIO_API, &uffdio_api) < 0) {
+		if (!(uffdio_api.features & UFFD_FEATURE_PAGEFAULT_FLAG_WP))

testcases/kernel/syscalls/userfaultfd/userfaultfd05.c static void run(void)

Quoted 10 lines
testcases/kernel/syscalls/userfaultfd/userfaultfd05.c +2 -4
+			tst_brk(TCONF, "UFFD write-protect unsupported");
 
-	if (!(uffdio_api.features & UFFD_FEATURE_PAGEFAULT_FLAG_WP)) {
-		tst_brk(TCONF, "UFFD write-protect unsupported");
-		return;
+		tst_brk(TBROK | TERRNO, "ioctl_userfaultfd failed");
  	}
 
  	uffdio_register.range.start = (unsigned long) page;
-- 2.52.0
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
#4 lore raw

Hi Ricardo, Petr,

Thanks for reviewing the patch, but unfortunately it is not sufficient for all kernels.

In newer pre-release testing, ioctl(UFFDIO_API) behaves differently when UFFD write-protect is unsupported. For example, on RHEL10 it returns -1 (EINVAL), while on RHEL9 it returns 0.

I think we need an additional follow-up fix:
https://lists.linux.it/pipermail/ltp/2026-January/046268.html

--
Regards,
Li Wang

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