The quilt patch titled
Subject: selftests:proc ProtectionKey check in smpas test
has been removed from the -mm tree. Its filename was
selftests-proc-protectionkey-check-in-smpas-test.patch
This patch was dropped because an alternative patch was or shall be merged
------------------------------------------------------
From: Swarup Laxman Kotiaklapudi <swarupkotikalapudi@xxxxxxxxx>
Subject: selftests:proc ProtectionKey check in smpas test
Date: Thu, 26 Oct 2023 01:06:27 +0530
Check ProtectionKey field in /proc/*/smaps output, if system supports
page-based memory permissions.
Link: https://lkml.kernel.org/r/20231025193627.316508-1-swarupkotikalapudi@xxxxxxxxx
Signed-off-by: Swarup Laxman Kotiaklapudi <swarupkotikalapudi@xxxxxxxxx>
Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Shuah Khan <shuah@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
tools/testing/selftests/proc/proc-empty-vm.c | 38 ++++++++++-------
1 file changed, 23 insertions(+), 15 deletions(-)
--- a/tools/testing/selftests/proc/proc-empty-vm.c~selftests-proc-protectionkey-check-in-smpas-test
+++ a/tools/testing/selftests/proc/proc-empty-vm.c
@@ -37,6 +37,7 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
+#include "../kselftest.h"
#ifdef __amd64__
#define TEST_VSYSCALL
@@ -83,10 +84,7 @@ static const char proc_pid_smaps_vsyscal
"SwapPss: 0 kB\n"
"Locked: 0 kB\n"
"THPeligible: 0\n"
-/*
- * "ProtectionKey:" field is conditional. It is possible to check it as well,
- * but I don't have such machine.
- */
+"ProtectionKey: 0\n"
;
static const char proc_pid_smaps_vsyscall_2[] =
@@ -113,10 +111,7 @@ static const char proc_pid_smaps_vsyscal
"SwapPss: 0 kB\n"
"Locked: 0 kB\n"
"THPeligible: 0\n"
-/*
- * "ProtectionKey:" field is conditional. It is possible to check it as well,
- * but I'm too tired.
- */
+"ProtectionKey: 0\n"
;
static void sigaction_SIGSEGV(int _, siginfo_t *__, void *___)
@@ -241,13 +236,26 @@ static int test_proc_pid_smaps(pid_t pid
} else {
ssize_t rv = read(fd, buf, sizeof(buf));
close(fd);
- if (g_vsyscall == 0) {
- assert(rv == 0);
- } else {
- size_t len = strlen(g_proc_pid_maps_vsyscall);
- /* TODO "ProtectionKey:" */
- assert(rv > len);
- assert(memcmp(buf, g_proc_pid_maps_vsyscall, len) == 0);
+ assert(rv >= 0);
+ assert(rv <= sizeof(buf));
+ if (g_vsyscall != 0) {
+ int pkey = pkey_alloc(0, 0);
+
+ if (pkey < 0) {
+ size_t len = strlen(g_proc_pid_maps_vsyscall);
+
+ assert(rv > len);
+ assert(memcmp(buf, g_proc_pid_maps_vsyscall, len) == 0);
+ } else {
+ pkey_free(pkey);
+ static const char * const S[] = {
+ "ProtectionKey: 0\n"
+ };
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(S); i++)
+ assert(memmem(buf, rv, S[i], strlen(S[i])));
+ }
}
return EXIT_SUCCESS;
}
_
Patches currently in -mm which might be from swarupkotikalapudi@xxxxxxxxx are
