Skip to contentSkip to conversation

selftests-x86-test_mremap_vdso-skip-if-vdso-is-msealed.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Apr 1, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: selftests: x86: test_mremap_vdso: skip if vdso is msealed
has been removed from the -mm tree. Its filename was
selftests-x86-test_mremap_vdso-skip-if-vdso-is-msealed.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Jeff Xu <[email protected]>
Subject: selftests: x86: test_mremap_vdso: skip if vdso is msealed
Date: Wed, 5 Mar 2025 02:17:06 +0000

Add code to detect if the vdso is memory sealed, skip the test if it is.

Cc Adhemerval Zanella <[email protected]>
Cc Alexander Mikhalitsyn <[email protected]>
Cc Alexey Dobriyan <[email protected]>
Cc Andrei Vagin <[email protected]>
Cc Anna-Maria Behnsen <[email protected]>
Cc Ard Biesheuvel <[email protected]>
Cc Benjamin Berg <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Dave Hansen <[email protected]>
Cc David Rientjes <[email protected]>
Cc David S. Miller <[email protected]>
Cc Elliot Hughes <[email protected]>
Cc Florian Faineli <[email protected]>
Cc Greg Ungerer <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Helge Deller <[email protected]>
Cc Hyeonggon Yoo <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jann Horn <[email protected]>
Cc Jason A. Donenfeld <[email protected]>
Cc Johannes Berg <[email protected]>
Cc Jorge Lucangeli Obes <[email protected]>
Cc Linus Waleij <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Matthew Wilcow (Oracle) <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Miguel Ojeda <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Oleg Nesterov <[email protected]>
Cc Pedro Falcato <[email protected]>
Cc Peter Xu <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc Stephen Röttger <[email protected]>
Cc Thomas Weißschuh <[email protected]>
Cc Vlastimil Babka <[email protected]>

---

 tools/testing/selftests/x86/test_mremap_vdso.c |   43 +++++++++++++++
 1 file changed, 43 insertions(+)
tools/testing/selftests/x86/test_mremap_vdso.c renamed from tools/testing/selftests/x86/test_mremap_vdso.c~selftests-x86-test_mremap_vdso-skip-if-vdso-is-msealed +43 -0
@@ -14,6 +14,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
+#include <stdbool.h>
 
 #include <sys/mman.h>
 #include <sys/auxv.h>
@@ -55,13 +56,55 @@ static int try_to_remap(void *vdso_addr,
 
 }
 
+#define VDSO_NAME "[vdso]"
+#define VMFLAGS "VmFlags:"
+#define MSEAL_FLAGS "sl"
+#define MAX_LINE_LEN 512
+
+bool vdso_sealed(FILE *maps)
+{
+	char line[MAX_LINE_LEN];
+	bool has_vdso = false;
+
+	while (fgets(line, sizeof(line), maps)) {
+		if (strstr(line, VDSO_NAME))
+			has_vdso = true;
+
+		if (has_vdso && !strncmp(line, VMFLAGS, strlen(VMFLAGS))) {
+			if (strstr(line, MSEAL_FLAGS))
+				return true;
+
+			return false;
+		}
+	}
+
+	return false;
+}
+
 int main(int argc, char **argv, char **envp)
 {
 	pid_t child;
+	FILE *maps;
 
 	ksft_print_header();
 	ksft_set_plan(1);
 
+	maps = fopen("/proc/self/smaps", "r");
+	if (!maps) {
+		ksft_test_result_skip(
+			"Could not open /proc/self/smaps, errno=%d\n",
+			 errno);
+
+		return 0;
+	}
+
+	if (vdso_sealed(maps)) {
+		ksft_test_result_skip("vdso is sealed\n");
+		return 0;
+	}
+
+	fclose(maps);
+
 	child = fork();
 	if (child == -1)
 		ksft_exit_fail_msg("failed to fork (%d): %m\n", errno);

_

Patches currently in -mm which might be from [email protected] are