"Christophe Leroy (CS GROUP)" <[email protected]> writes: > Le 13/11/2026 à 13:31, Ritesh Harjani (IBM) a écrit : >> commit 2e83e2ce34ff ("arch, mm: promote DEBUG_WX to CHECK_WX"), made >> CHECK_WX default STRICT_KERNEL_RWX. >> >> Now on powerpc, when we boot with CONFIG_KPROBES=y and CONFIG_MODULES=n, >> we can see the following warning splat at boot: >> >> powerpc/mm: Found insecure W+X mapping at address >> 000000002ea08992/0xc008000000000000 >> WARNING: arch/powerpc/mm/ptdump/ptdump.c:194 at note_page+0x4dc/0x4fc, >> CPU#0: swapper/0/1 >> NIP [c0000000000ac204] note_page+0x4dc/0x4fc >> LR [c0000000000ac200] note_page+0x4d8/0x4fc >> Call Trace: >> note_page+0x4d8/0x4fc (unreliable) >> ptdump_pte_entry+0x70/0x94 >> walk_pte_range_inner+0x15c/0x260 >> walk_pgd_range+0x6d8/0xd5c >> walk_page_range_debug+0xa4/0xf0 >> ptdump_walk_pgd+0xec/0x304 >> ptdump_check_wx+0xd8/0x154 >> kernel_init+0x94/0x26c >> ret_from_kernel_user_thread+0x14/0x1c >> Checked W+X mappings: FAILED, 1 W+X pages found >> >> This happens because CHECK_WX noted a writeable + executable mapping. >> >> This happens because execmem_arch_setup(), checks for >> struct_modules_rwx_enabled(), while kprobes depenency on modules was >> earlier removed via commit: >> 7582b7be16d0 ("kprobes: remove dependency on CONFIG_MODULES") >> Since the insn slots are only written with patch_instruction(), which >> does not need this mapping to be writable. This patch fixes it by >> checking for strict_kernel_rwx_enabled() instead. >> >> Fixes: 7582b7be16d0 ("kprobes: remove dependency on CONFIG_MODULES") >> Signed-off-by: Ritesh Harjani (IBM) <[email protected]> >> --- >> arch/powerpc/mm/mem.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c >> index b617b69452cd..77b63b52d8f2 100644 >> --- a/arch/powerpc/mm/mem.c >> +++ b/arch/powerpc/mm/mem.c >> @@ -388,7 +388,7 @@ static void prealloc_execmem_pgtable(void) { } >> >> struct execmem_info __init *execmem_arch_setup(void) >> { >> - pgprot_t kprobes_prot = strict_module_rwx_enabled() ? PAGE_KERNEL_ROX : >> PAGE_KERNEL_EXEC; >> + pgprot_t kprobes_prot = strict_kernel_rwx_enabled() ? PAGE_KERNEL_ROX : >> PAGE_KERNEL_EXEC; >> pgprot_t prot = strict_module_rwx_enabled() ? PAGE_KERNEL : >> PAGE_KERNEL_EXEC; > > Looking at this, I'd use PAGE_KERNEL_X instead of PAGE_KERNEL_EXEC. > > Then we could get rid of PAGE_KERNEL_EXEC completely for powerpc. >
I think it's best if we keep the definition of PAGE_KERNEL_EXEC on powerpc as PAGE_KERNEL_X, I think the core expects the arch to define this, if not, then it defaults to PAGE_KERNEL e.g. see this: include/linux/pgtable.h: #ifndef PAGE_KERNEL_EXEC # define PAGE_KERNEL_EXEC PAGE_KERNEL #endif Also mm/execmem references PAGE_KERNEL_EXEC in __execmem_init(). Although it references only when execmem_arch_setup() is not defined by the arch (which is not true for powerpc). However, even though nothing breaks today, but later if there are other users of PAGE_KERNEL_EXEC, then PAGE_KERNEL does not have X (execute) bit enabled, so it might break in future. Plus looking at above, I believe there is no harm in keeping it - since core expects the platform to define it's own definition - due to all the other references it has. Thoughts? However, if you still think we should remove it (?) - then I feel let's do that as a separate cleanup patch. Since this keeps the usage of EXEC same between prot and kprobes_prot variables in patch-1, which we also need to backport. Thanks for the quick reviews! -ritesh
