Skip to contentSkip to conversation

proc: support proc-empty-vm test on i386

PATCH Applied Alexey Dobriyan 1 participant 2 messages Jun 30, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 proc: support proc-empty-vm test on i386

Unmap everything starting from 4GB length until it unmaps, otherwise test has to detect which virtual memory split kernel is using.

---
 tools/testing/selftests/proc/proc-empty-vm.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
tools/testing/selftests/proc/proc-empty-vm.c +16 -0
index 7588428b8fcd..3aea36c57800 100644
@@ -37,6 +37,10 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#ifdef __amd64__
+#define TEST_VSYSCALL
+#endif
+
 /*
  * 0: vsyscall VMA doesn't exist	vsyscall=none
  * 1: vsyscall VMA is --xp		vsyscall=xonly
@@ -119,6 +123,7 @@ static void sigaction_SIGSEGV(int _, siginfo_t *__, void *___)
 	_exit(EXIT_FAILURE);
 }
 
+#ifdef TEST_VSYSCALL
 static void sigaction_SIGSEGV_vsyscall(int _, siginfo_t *__, void *___)
 {
 	_exit(g_vsyscall);
@@ -170,6 +175,7 @@ static void vsyscall(void)
 		exit(1);
 	}
 }
+#endif
 
 static int test_proc_pid_maps(pid_t pid)
 {
@@ -299,7 +305,9 @@ int main(void)
 {
 	int rv = EXIT_SUCCESS;
 
+#ifdef TEST_VSYSCALL
 	vsyscall();
+#endif
 
 	switch (g_vsyscall) {
 	case 0:
@@ -346,6 +354,14 @@ int main(void)
 
 #ifdef __amd64__
 		munmap(NULL, ((size_t)1 << 47) - 4096);
+#elif defined __i386__
+		{
+			size_t len;
+
+			for (len = -4096;; len -= 4096) {
+				munmap(NULL, len);
+			}
+		}
 #else
 #error "implement 'unmap everything'"
 #endif
Signature · 1 line
2.40.1
#1 lore raw

PATCH 2/2 proc: skip proc-empty-vm on anything but amd64 and i386

This test is arch specific, requires "munmap everything" primitive.

---
 tools/testing/selftests/proc/proc-empty-vm.c | 7 +++++++
 1 file changed, 7 insertions(+)
tools/testing/selftests/proc/proc-empty-vm.c +7 -0
index 3aea36c57800..dfbcb3ce2194 100644
@@ -1,3 +1,4 @@
+#if defined __amd64__ || defined __i386__
 /*
  * Copyright (c) 2022 Alexey Dobriyan <[email protected]>
  *
@@ -402,3 +403,9 @@ int main(void)
 
 	return rv;
 }
+#else
+int main(void)
+{
+	return 4;
+}
+#endif
Signature · 1 line
2.40.1