[PATCH v1] arm64: pkeys: remove redundant WARN

Joey Gouly joey.gouly at arm.com
Tue Sep 10 03:50:04 PDT 2024


FEAT_PAN3 is present if FEAT_S1POE is, this WARN() was to represent that.
However execute_only_pkey() is always called by mmap(), even on a CPU without
POE support.

Rather than making the WARN() conditional, just delete it.

Reported-by: Naresh Kamboju <naresh.kamboju at linaro.org>
Link: https://lore.kernel.org/linux-arm-kernel/CA+G9fYvarKEPN3u1Ogw2pcw4h6r3OMzg+5qJpYkAXRunAEF_0Q@mail.gmail.com/
Signed-off-by: Joey Gouly <joey.gouly at arm.com>
Cc: Will Deacon <will at kernel.org>
Cc: Catalin Marinas <catalin.marinas at arm.com>
---
 arch/arm64/include/asm/pkeys.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm64/include/asm/pkeys.h b/arch/arm64/include/asm/pkeys.h
index 19eb1b12b7fc..0ca5f83ce148 100644
--- a/arch/arm64/include/asm/pkeys.h
+++ b/arch/arm64/include/asm/pkeys.h
@@ -37,8 +37,6 @@ static inline int arch_override_mprotect_pkey(struct vm_area_struct *vma,
 static inline int execute_only_pkey(struct mm_struct *mm)
 {
 	// Execute-only mappings are handled by EPAN/FEAT_PAN3.
-	WARN_ON_ONCE(!cpus_have_final_cap(ARM64_HAS_EPAN));
-
 	return -1;
 }
 
-- 
2.25.1




More information about the linux-arm-kernel mailing list