Skip to contentSkip to conversation

selftests/mm: skip uffd tests in madv_guard if uffd is not present.

PATCH Superseded Zi Yan 3 participants 9 messages May 15, 2025

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Zi Yan

author
#0 lore raw

PATCH 1/2 selftests/mm: skip uffd tests in madv_guard if uffd is not present.

When userfaultfd is not compiled into kernel, userfaultfd() returns -1, causing uffd tests in madv_guard fail. Skip the tests instead.

---
 tools/testing/selftests/mm/guard-regions.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
tools/testing/selftests/mm/guard-regions.c +15 -2
index 0cd9d236649d..93af3d3760f9 100644
@@ -1453,8 +1453,21 @@ TEST_F(guard_regions, uffd)
 
 	/* Set up uffd. */
 	uffd = userfaultfd(0);
-	if (uffd == -1 && errno == EPERM)
-		ksft_exit_skip("No userfaultfd permissions, try running as root.\n");
+	if (uffd == -1) {
+		switch (errno) {
+		case EPERM:
+			SKIP(return, "No userfaultfd permissions, try running as root.");
+			break;
+		case ENOSYS:
+			SKIP(return, "userfaultfd is not supported/not enabled.");
+			break;
+		default:
+			ksft_exit_fail_msg("userfaultfd failed with %s\n",
+					   strerror(errno));
+			break;
+		}
+	}
+
 	ASSERT_NE(uffd, -1);
 
 	ASSERT_EQ(ioctl(uffd, UFFDIO_API, &api), 0);
Signature · 1 line
2.47.2
author
#1 lore raw

PATCH 2/2 selftests/mm: skip hugevm test if kernel config file is not present.

When running hugevm tests in a machine without kernel config present, e.g., a VM running a kernel without CONFIG_IKCONFIG_PROC nor /boot/config-*, skip hugevm tests, which reads kernel config to get page table level information.

---
 .../selftests/mm/va_high_addr_switch.sh       | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)
tools/testing/selftests/mm/va_high_addr_switch.sh +9 -17
index 1f92e8caceac..325de53966b6 100755
@@ -7,23 +7,20 @@
 # real test to check that the kernel is configured to support at least 5
 # pagetable levels.
 
-# 1 means the test failed
-exitcode=1
-
 # Kselftest framework requirement - SKIP code is 4.
 ksft_skip=4
 
-fail()
+skip()
 {
 	echo "$1"
-	exit $exitcode
+	exit $ksft_skip
 }
 
 check_supported_x86_64()
 {
 	local config="/proc/config.gz"
 	[[ -f "${config}" ]] || config="/boot/config-$(uname -r)"
-	[[ -f "${config}" ]] || fail "Cannot find kernel config in /proc or /boot"
+	[[ -f "${config}" ]] || skip "Cannot find kernel config in /proc or /boot"
 
 	# gzip -dcfq automatically handles both compressed and plaintext input.
 	# See man 1 gzip under '-f'.
@@ -33,11 +30,9 @@ check_supported_x86_64()
 		else {print 1}; exit}' /proc/cpuinfo 2>/dev/null)
 
 	if [[ "${pg_table_levels}" -lt 5 ]]; then
-		echo "$0: PGTABLE_LEVELS=${pg_table_levels}, must be >= 5 to run this test"
-		exit $ksft_skip
+		skip "$0: PGTABLE_LEVELS=${pg_table_levels}, must be >= 5 to run this test"
 	elif [[ "${cpu_supports_pl5}" -ne 0 ]]; then
-		echo "$0: CPU does not have the necessary la57 flag to support page table level 5"
-		exit $ksft_skip
+		skip "$0: CPU does not have the necessary la57 flag to support page table level 5"
 	fi
 }
 
@@ -45,24 +40,21 @@ check_supported_ppc64()
 {
 	local config="/proc/config.gz"
 	[[ -f "${config}" ]] || config="/boot/config-$(uname -r)"
-	[[ -f "${config}" ]] || fail "Cannot find kernel config in /proc or /boot"
+	[[ -f "${config}" ]] || skip "Cannot find kernel config in /proc or /boot"
 
 	local pg_table_levels=$(gzip -dcfq "${config}" | grep PGTABLE_LEVELS | cut -d'=' -f 2)
 	if [[ "${pg_table_levels}" -lt 5 ]]; then
-		echo "$0: PGTABLE_LEVELS=${pg_table_levels}, must be >= 5 to run this test"
-		exit $ksft_skip
+		skip "$0: PGTABLE_LEVELS=${pg_table_levels}, must be >= 5 to run this test"
 	fi
 
 	local mmu_support=$(grep -m1 "mmu" /proc/cpuinfo | awk '{print $3}')
 	if [[ "$mmu_support" != "radix" ]]; then
-		echo "$0: System does not use Radix MMU, required for 5-level paging"
-		exit $ksft_skip
+		skip "$0: System does not use Radix MMU, required for 5-level paging"
 	fi
 
 	local hugepages_total=$(awk '/HugePages_Total/ {print $2}' /proc/meminfo)
 	if [[ "${hugepages_total}" -eq 0 ]]; then
-		echo "$0: HugePages are not enabled, required for some tests"
-		exit $ksft_skip
+		skip "$0: HugePages are not enabled, required for some tests"
 	fi
 }
 
Signature · 1 line
2.47.2
Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] selftests/mm: skip hugevm test if kernel config file is not present.

Quoted 6 lines · Zi Yan

When running hugevm tests in a machine without kernel config present, e.g., a VM running a kernel without CONFIG_IKCONFIG_PROC nor /boot/config-*, skip hugevm tests, which reads kernel config to get page table level information.

Looks generally reasonable to me, but I'm not so familiar with this so,

Quoted 81 lines
---
 .../selftests/mm/va_high_addr_switch.sh       | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)
tools/testing/selftests/mm/va_high_addr_switch.sh +9 -18
index 1f92e8caceac..325de53966b6 100755
@@ -7,23 +7,20 @@
 # real test to check that the kernel is configured to support at least 5
 # pagetable levels.
 
-# 1 means the test failed
-exitcode=1
-
 # Kselftest framework requirement - SKIP code is 4.
 ksft_skip=4
 
-fail()
+skip()
 {
 	echo "$1"
-	exit $exitcode
+	exit $ksft_skip
 }
 
 check_supported_x86_64()
 {
 	local config="/proc/config.gz"
 	[[ -f "${config}" ]] || config="/boot/config-$(uname -r)"
-	[[ -f "${config}" ]] || fail "Cannot find kernel config in /proc or /boot"
+	[[ -f "${config}" ]] || skip "Cannot find kernel config in /proc or /boot"
 
 	# gzip -dcfq automatically handles both compressed and plaintext input.
 	# See man 1 gzip under '-f'.
@@ -33,11 +30,9 @@ check_supported_x86_64()
 		else {print 1}; exit}' /proc/cpuinfo 2>/dev/null)
 
 	if [[ "${pg_table_levels}" -lt 5 ]]; then
-		echo "$0: PGTABLE_LEVELS=${pg_table_levels}, must be >= 5 to run this test"
-		exit $ksft_skip
+		skip "$0: PGTABLE_LEVELS=${pg_table_levels}, must be >= 5 to run this test"
 	elif [[ "${cpu_supports_pl5}" -ne 0 ]]; then
-		echo "$0: CPU does not have the necessary la57 flag to support page table level 5"
-		exit $ksft_skip
+		skip "$0: CPU does not have the necessary la57 flag to support page table level 5"
 	fi
 }
 
@@ -45,24 +40,21 @@ check_supported_ppc64()
 {
 	local config="/proc/config.gz"
 	[[ -f "${config}" ]] || config="/boot/config-$(uname -r)"
-	[[ -f "${config}" ]] || fail "Cannot find kernel config in /proc or /boot"
+	[[ -f "${config}" ]] || skip "Cannot find kernel config in /proc or /boot"
 
 	local pg_table_levels=$(gzip -dcfq "${config}" | grep PGTABLE_LEVELS | cut -d'=' -f 2)
 	if [[ "${pg_table_levels}" -lt 5 ]]; then
-		echo "$0: PGTABLE_LEVELS=${pg_table_levels}, must be >= 5 to run this test"
-		exit $ksft_skip
+		skip "$0: PGTABLE_LEVELS=${pg_table_levels}, must be >= 5 to run this test"
 	fi
 
 	local mmu_support=$(grep -m1 "mmu" /proc/cpuinfo | awk '{print $3}')
 	if [[ "$mmu_support" != "radix" ]]; then
-		echo "$0: System does not use Radix MMU, required for 5-level paging"
-		exit $ksft_skip
+		skip "$0: System does not use Radix MMU, required for 5-level paging"
 	fi
 
 	local hugepages_total=$(awk '/HugePages_Total/ {print $2}' /proc/meminfo)
 	if [[ "${hugepages_total}" -eq 0 ]]; then
-		echo "$0: HugePages are not enabled, required for some tests"
-		exit $ksft_skip
+		skip "$0: HugePages are not enabled, required for some tests"
 	fi
 }
 
--

2.47.2

Acked-by
#3 lore raw

Re: [PATCH 2/2] selftests/mm: skip hugevm test if kernel config file is not present.

Quoted 11 lines · Lorenzo Stoakes
Quoted 6 lines · Zi Yan

When running hugevm tests in a machine without kernel config present, e.g., a VM running a kernel without CONFIG_IKCONFIG_PROC nor /boot/config-*, skip hugevm tests, which reads kernel config to get page table level information.

Looks generally reasonable to me, but I'm not so familiar with this so,

Same here. Although, despite this being worth patching, I do think we should document somewhere what the expectations are for mm selftests (in terms of kernel config, environment, libc, possibly even utilities present).

Signature · 1 line
Pedro
#4 lore raw
In reply to Zi Yan

Ah you got to this first :) thanks!

Could you do this with a cover letter though? It's really weird to have 2/2 reply to 1/2, I know sometimes people do that, but it's just odd, and it'd be good to have an overview, thanks!

Quoted 2 lines · Zi Yan

When userfaultfd is not compiled into kernel, userfaultfd() returns -1, causing uffd tests in madv_guard fail. Skip the tests instead.

'madv_guard'? I'd just say the guard_regions.uffd test to fail.

Quoted 11 lines
---
 tools/testing/selftests/mm/guard-regions.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
tools/testing/selftests/mm/guard-regions.c +0 -0
index 0cd9d236649d..93af3d3760f9 100644

tools/testing/selftests/mm/guard-regions.c TEST_F(guard_regions, uffd) · line 1457

Quoted 5 lines
tools/testing/selftests/mm/guard-regions.c +0 -2
@@ -1453,8 +1453,21 @@ TEST_F(guard_regions, uffd)
 
 	/* Set up uffd. */
 	uffd = userfaultfd(0);
-	if (uffd == -1 && errno == EPERM)
-		ksft_exit_skip("No userfaultfd permissions, try running as root.\n");

Let's just make this all part of the same switch please!

And while I originally used ksft_exit_skip(), I think we can just use the SKIP(return, ...) form here just fine to keep it consistent.

Quoted 19 lines
tools/testing/selftests/mm/guard-regions.c +15 -1
+	if (uffd == -1) {
+		switch (errno) {
+		case EPERM:
+			SKIP(return, "No userfaultfd permissions, try running as root.");
+			break;
+		case ENOSYS:
+			SKIP(return, "userfaultfd is not supported/not enabled.");
+			break;
+		default:
+			ksft_exit_fail_msg("userfaultfd failed with %s\n",
+					   strerror(errno));
+			break;
+		}
+	}
+
 	ASSERT_NE(uffd, -1);
 
 	ASSERT_EQ(ioctl(uffd, UFFDIO_API, &api), 0);
--
Quoted 2 lines

2.47.2

Thanks!

author
#5 lore raw
Quoted 11 lines · Lorenzo Stoakes

Ah you got to this first :) thanks!

Could you do this with a cover letter though? It's really weird to have 2/2 reply to 1/2, I know sometimes people do that, but it's just odd, and it'd be good to have an overview, thanks!

Quoted 2 lines · Zi Yan

When userfaultfd is not compiled into kernel, userfaultfd() returns -1, causing uffd tests in madv_guard fail. Skip the tests instead.

'madv_guard'? I'd just say the guard_regions.uffd test to fail.

Sure. Will change it.

Quoted 13 lines
Quoted 13 lines
---
 tools/testing/selftests/mm/guard-regions.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
tools/testing/selftests/mm/guard-regions.c +0 -0
index 0cd9d236649d..93af3d3760f9 100644
@@ -1453,8 +1453,21 @@ TEST_F(guard_regions, uffd)
 
Quoted 6 lines

tools/testing/selftests/mm/guard-regions.c TEST_F(guard_regions, uffd) · line 1457

Quoted 4 lines
tools/testing/selftests/mm/guard-regions.c +0 -2
 	/* Set up uffd. */
 	uffd = userfaultfd(0);
-	if (uffd == -1 && errno == EPERM)
-		ksft_exit_skip("No userfaultfd permissions, try running as root.\n");

Let's just make this all part of the same switch please!

What do you mean? EPERM is handled in the switch-case below.

Quoted 3 lines

And while I originally used ksft_exit_skip(), I think we can just use the SKIP(return, ...) form here just fine to keep it consistent.

Right. I am using SKIP below, since when I ran it, ksft_exit_skip() makes the whole test message inconsistent.

Quoted 18 lines
Quoted 18 lines
tools/testing/selftests/mm/guard-regions.c +15 -0
+	if (uffd == -1) {
+		switch (errno) {
+		case EPERM:
+			SKIP(return, "No userfaultfd permissions, try running as root.");
+			break;
+		case ENOSYS:
+			SKIP(return, "userfaultfd is not supported/not enabled.");
+			break;
+		default:
+			ksft_exit_fail_msg("userfaultfd failed with %s\n",
+					   strerror(errno));
+			break;
+		}
+	}
+
 	ASSERT_NE(uffd, -1);
 
Quoted 6 lines
Quoted 4 lines
tools/testing/selftests/mm/guard-regions.c +0 -1
 	ASSERT_EQ(ioctl(uffd, UFFDIO_API, &api), 0);
--

2.47.2

Thanks!

--
Best Regards,
Yan, Zi

Reviewed-by
#6 lore raw
Quoted 8 lines · Zi Yan
Quoted 6 lines · Lorenzo Stoakes

Ah you got to this first :) thanks!

Could you do this with a cover letter though? It's really weird to have 2/2 reply to 1/2, I know sometimes people do that, but it's just odd, and it'd be good to have an overview, thanks!

Quoted 10 lines
Quoted 5 lines · Zi Yan
Quoted 2 lines

When userfaultfd is not compiled into kernel, userfaultfd() returns -1, causing uffd tests in madv_guard fail. Skip the tests instead.

'madv_guard'? I'd just say the guard_regions.uffd test to fail.

Sure. Will change it.

Quoted 3 lines
Quoted 3 lines

Given I was being an idiot below, now the patch is fine as-is, just resend with the nitty commit message change and cover letter as a v2 and we should be good :)

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
---
 tools/testing/selftests/mm/guard-regions.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
tools/testing/selftests/mm/guard-regions.c +0 -0
index 0cd9d236649d..93af3d3760f9 100644
@@ -1453,8 +1453,21 @@ TEST_F(guard_regions, uffd)
 
Quoted 8 lines
Quoted 6 lines

tools/testing/selftests/mm/guard-regions.c TEST_F(guard_regions, uffd) · line 1457

Quoted 4 lines
tools/testing/selftests/mm/guard-regions.c +0 -2
 	/* Set up uffd. */
 	uffd = userfaultfd(0);
-	if (uffd == -1 && errno == EPERM)
-		ksft_exit_skip("No userfaultfd permissions, try running as root.\n");

Let's just make this all part of the same switch please!

What do you mean? EPERM is handled in the switch-case below.

Oh man, I'm the biggest idiot on Earth haha!

For some reason I read these '-'s as '+'s :))))

Yes please ignore the above, I therefore - like your approach - and am good with it.

Quoted 7 lines
Quoted 4 lines

And while I originally used ksft_exit_skip(), I think we can just use the SKIP(return, ...) form here just fine to keep it consistent.

Right. I am using SKIP below, since when I ran it, ksft_exit_skip() makes the whole test message inconsistent.

Yes, your confusion is warranted, I apparently can't read... :>) and indeed, agreed.

Thanks for doing this!

Quoted 30 lines
Quoted 19 lines
Quoted 19 lines
tools/testing/selftests/mm/guard-regions.c +15 -0
+	if (uffd == -1) {
+		switch (errno) {
+		case EPERM:
+			SKIP(return, "No userfaultfd permissions, try running as root.");
+			break;
+		case ENOSYS:
+			SKIP(return, "userfaultfd is not supported/not enabled.");
+			break;
+		default:
+			ksft_exit_fail_msg("userfaultfd failed with %s\n",
+					   strerror(errno));
+			break;
+		}
+	}
+
 	ASSERT_NE(uffd, -1);
 
Quoted 6 lines
Quoted 4 lines
tools/testing/selftests/mm/guard-regions.c +0 -1
 	ASSERT_EQ(ioctl(uffd, UFFDIO_API, &api), 0);
--

2.47.2

Thanks!

--
Best Regards,
Yan, Zi

author
#7 lore raw
Quoted 15 lines · Lorenzo Stoakes
Quoted 14 lines · Zi Yan
Quoted 11 lines · Lorenzo Stoakes

Ah you got to this first :) thanks!

Could you do this with a cover letter though? It's really weird to have 2/2 reply to 1/2, I know sometimes people do that, but it's just odd, and it'd be good to have an overview, thanks!

Quoted 2 lines · Zi Yan

When userfaultfd is not compiled into kernel, userfaultfd() returns -1, causing uffd tests in madv_guard fail. Skip the tests instead.

'madv_guard'? I'd just say the guard_regions.uffd test to fail.

Quoted 8 lines
Quoted 4 lines

Sure. Will change it.

Quoted 3 lines
Quoted 3 lines

Given I was being an idiot below, now the patch is fine as-is, just resend with the nitty commit message change and cover letter as a v2 and we should be good :)

Sure. I am also waiting for Adam's feedback on patch2 and will resend later.

Quoted 20 lines
Quoted 17 lines
Quoted 16 lines
Quoted 9 lines
---
 tools/testing/selftests/mm/guard-regions.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
tools/testing/selftests/mm/guard-regions.c +0 -0
index 0cd9d236649d..93af3d3760f9 100644

tools/testing/selftests/mm/guard-regions.c TEST_F(guard_regions, uffd) · line 1457

Quoted 5 lines
tools/testing/selftests/mm/guard-regions.c +0 -2
@@ -1453,8 +1453,21 @@ TEST_F(guard_regions, uffd)
 
 	/* Set up uffd. */
 	uffd = userfaultfd(0);
-	if (uffd == -1 && errno == EPERM)
-		ksft_exit_skip("No userfaultfd permissions, try running as root.\n");

Let's just make this all part of the same switch please!

Quoted 9 lines
Quoted 1 line

What do you mean? EPERM is handled in the switch-case below.

Oh man, I'm the biggest idiot on Earth haha!

For some reason I read these '-'s as '+'s :))))

Yes please ignore the above, I therefore - like your approach - and am good with it.

Yeah, I kinda figured when I read your message, but wanted to double check with you.

Quoted 5 lines
Quoted 5 lines
Quoted 4 lines

And while I originally used ksft_exit_skip(), I think we can just use the SKIP(return, ...) form here just fine to keep it consistent.

Quoted 8 lines
Quoted 2 lines

Right. I am using SKIP below, since when I ran it, ksft_exit_skip() makes the whole test message inconsistent.

Yes, your confusion is warranted, I apparently can't read... :>) and indeed, agreed.

Thanks for doing this!

Thank you for the review. :)

Quoted 27 lines
Quoted 27 lines
Quoted 25 lines
Quoted 21 lines
tools/testing/selftests/mm/guard-regions.c +15 -1
+	if (uffd == -1) {
+		switch (errno) {
+		case EPERM:
+			SKIP(return, "No userfaultfd permissions, try running as root.");
+			break;
+		case ENOSYS:
+			SKIP(return, "userfaultfd is not supported/not enabled.");
+			break;
+		default:
+			ksft_exit_fail_msg("userfaultfd failed with %s\n",
+					   strerror(errno));
+			break;
+		}
+	}
+
 	ASSERT_NE(uffd, -1);
 
 	ASSERT_EQ(ioctl(uffd, UFFDIO_API, &api), 0);
--
Quoted 2 lines

2.47.2

Thanks!

Quoted 3 lines
Quoted 3 lines

--
Best Regards,
Yan, Zi

--
Best Regards,
Yan, Zi