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").

Signed-off-by: Kevin Brodsky <kevin.brod...@arm.com>
---
 tools/testing/selftests/mm/pkey-arm64.h      | 2 +-
 tools/testing/selftests/mm/protection_keys.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/mm/pkey-arm64.h 
b/tools/testing/selftests/mm/pkey-arm64.h
index 9897e31f16dd..8e9685e03c44 100644
--- a/tools/testing/selftests/mm/pkey-arm64.h
+++ b/tools/testing/selftests/mm/pkey-arm64.h
@@ -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
diff --git a/tools/testing/selftests/mm/protection_keys.c 
b/tools/testing/selftests/mm/protection_keys.c
index 3688571e6b39..a4683f2476f2 100644
--- a/tools/testing/selftests/mm/protection_keys.c
+++ b/tools/testing/selftests/mm/protection_keys.c
@@ -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 */
-- 
2.47.0


Reply via email to