]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
selftests/mm: rename pkey register macro
authorKevin Brodsky <kevin.brodsky@arm.com>
Mon, 9 Dec 2024 09:50:17 +0000 (09:50 +0000)
committerAndrew Morton <akpm@linux-foundation.org>
Tue, 14 Jan 2025 06:40:56 +0000 (22:40 -0800)
PKEY_ALLOW_ALL is meant to represent the pkey register value that allows
all accesses (enables all pkeys).  However its current naming suggests
that the value applies to *one* key only (like PKEY_DISABLE_ACCESS for
instance).

Rename PKEY_ALLOW_ALL to PKEY_REG_ALLOW_ALL to avoid such
misunderstanding.  This is consistent with the PKEY_REG_ALLOW_NONE macro
introduced by commit 6e182dc9f268 ("selftests/mm: Use generic pkey
register manipulation").

Link: https://lkml.kernel.org/r/20241209095019.1732120-13-kevin.brodsky@arm.com
Signed-off-by: Kevin Brodsky <kevin.brodsky@arm.com>
Cc: Aruna Ramakrishna <aruna.ramakrishna@oracle.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Joey Gouly <joey.gouly@arm.com>
Cc: Keith Lucas <keith.lucas@oracle.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
tools/testing/selftests/mm/pkey-arm64.h
tools/testing/selftests/mm/protection_keys.c

index 9897e31f16dd3d139d5c5dabb344b426497babb3..8e9685e03c441a364c511e51aa1da0b0f0d0f78a 100644 (file)
@@ -30,7 +30,7 @@
 #define NR_PKEYS               8
 #define NR_RESERVED_PKEYS      1 /* pkey-0 */
 
-#define PKEY_ALLOW_ALL         0x77777777
+#define PKEY_REG_ALLOW_ALL     0x77777777
 #define PKEY_REG_ALLOW_NONE    0x0
 
 #define PKEY_BITS_PER_PKEY     4
index 3688571e6b39ec23c8adc741f4d5defe94dbad2b..a4683f2476f2728d813a32ede08cf90dcca82f81 100644 (file)
@@ -396,7 +396,7 @@ static void signal_handler(int signum, siginfo_t *si, void *vucontext)
        /* restore access and let the faulting instruction continue */
        pkey_access_allow(siginfo_pkey);
 #elif defined(__aarch64__)
-       aarch64_write_signal_pkey(uctxt, PKEY_ALLOW_ALL);
+       aarch64_write_signal_pkey(uctxt, PKEY_REG_ALLOW_ALL);
 #endif /* arch */
        pkey_faults++;
        dprintf1("<<<<==================================================\n");
@@ -842,7 +842,7 @@ void expected_pkey_fault(int pkey)
         */
        if (__read_pkey_reg() != 0)
 #elif defined(__aarch64__)
-       if (__read_pkey_reg() != PKEY_ALLOW_ALL)
+       if (__read_pkey_reg() != PKEY_REG_ALLOW_ALL)
 #else
        if (__read_pkey_reg() != shadow_pkey_reg)
 #endif /* arch */