commit f3344f9364df8fd83f6a6bbfde8dcf4a1e7e687f
author Lokesh Gidra <lokeshgidra@google.com> Tue Nov 23 00:42:35 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 23 00:42:35 2021 +0000
tree 359ccc2ea89a421cde50b3d79aa7666a9bab8dad
parent 92ee68ac870a714601b6bb0b46dd741b1b7da309
parent e0d8eb1e96deaab4348650bc0ce2c6d7d35e96d4

Skip userfaultfd selftest if the syscall isn't available am: e0d8eb1e96

Original change: https://android-review.googlesource.com/c/platform/external/linux-kselftest/+/1899281

Change-Id: I0013aa28cd335d2bf66f514449d4530a87a6b406

android/patches/0019-userfaultfd.patch

diff --git a/android/patches/0019-userfaultfd.patch b/android/patches/0019-userfaultfd.patch
index 9c07018..67fe8ed 100644
--- a/android/patches/0019-userfaultfd.patch
+++ b/android/patches/0019-userfaultfd.patch
@@ -1,4 +1,3 @@
-diff -u b/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c
 --- b/tools/testing/selftests/vm/userfaultfd.c
 +++ b/tools/testing/selftests/vm/userfaultfd.c
 @@ -82,9 +82,11 @@
@@ -243,3 +242,20 @@
  	return userfaultfd_stress();
  }
  
+--- a/tools/testing/selftests/vm/userfaultfd.c
++++ b/tools/testing/selftests/vm/userfaultfd.c
+@@ -662,8 +662,13 @@ static int userfaultfd_open(int features)
+ 
+ 	uffd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK | UFFD_USER_MODE_ONLY);
+ 	if (uffd < 0) {
++		if (errno == ENOSYS) {
++			fprintf(stderr,
++				"userfaultfd syscall not available in this kernel\n");
++			exit(KSFT_PASS);
++		}
+ 		fprintf(stderr,
+-			"userfaultfd syscall not available in this kernel\n");
++			"userfaultfd syscall failed with errno: %d\n", errno);
+ 		return 1;
+ 	}
+ 	uffd_flags = fcntl(uffd, F_GETFD, NULL);

tools/testing/selftests/vm/userfaultfd.c

diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c
index 3e25afd..ffc78f3 100644
--- a/tools/testing/selftests/vm/userfaultfd.c
+++ b/tools/testing/selftests/vm/userfaultfd.c
@@ -662,8 +662,13 @@
 
 	uffd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK | UFFD_USER_MODE_ONLY);
 	if (uffd < 0) {
+		if (errno == ENOSYS) {
+			fprintf(stderr,
+				"userfaultfd syscall not available in this kernel\n");
+			exit(KSFT_PASS);
+		}
 		fprintf(stderr,
-			"userfaultfd syscall not available in this kernel\n");
+			"userfaultfd syscall failed with errno: %d\n", errno);
 		return 1;
 	}
 	uffd_flags = fcntl(uffd, F_GETFD, NULL);