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

Signed-off-by: Zi Yan <z...@nvidia.com>
---
 tools/testing/selftests/mm/guard-regions.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/mm/guard-regions.c 
b/tools/testing/selftests/mm/guard-regions.c
index 0cd9d236649d..93af3d3760f9 100644
--- a/tools/testing/selftests/mm/guard-regions.c
+++ b/tools/testing/selftests/mm/guard-regions.c
@@ -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);
-- 
2.47.2


Reply via email to