arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx.patch removed from -mm tree
The quilt patch titled
Subject: arm64, powerpc, riscv, s390, x86: ptdump: refactor CONFIG_DEBUG_WX
has been removed from the -mm tree. Its filename was
arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Christophe Leroy <[email protected]>
Subject: arm64, powerpc, riscv, s390, x86: ptdump: refactor CONFIG_DEBUG_WX
Date: Tue, 30 Jan 2024 11:34:33 +0100
All architectures using the core ptdump functionality also implement CONFIG_DEBUG_WX, and they all do it more or less the same way, with a function called debug_checkwx() that is called by mark_rodata_ro(), which is a substitute to ptdump_check_wx() when CONFIG_DEBUG_WX is set and a no-op otherwise.
Refactor by centrally defining debug_checkwx() in linux/ptdump.h and call debug_checkwx() immediately after calling mark_rodata_ro() instead of calling it at the end of every mark_rodata_ro().
On x86_32, mark_rodata_ro() first checks __supported_pte_mask has _PAGE_NX before calling debug_checkwx(). Now the check is inside the callee ptdump_walk_pgd_level_checkwx().
On powerpc_64, mark_rodata_ro() bails out early before calling ptdump_check_wx() when the MMU doesn't have KERNEL_RO feature. The check is now also done in ptdump_check_wx() as it is called outside mark_rodata_ro().
---
arch/arm64/include/asm/ptdump.h | 7 ------- arch/arm64/mm/mmu.c | 2 -- arch/powerpc/mm/mmu_decl.h | 6 ------ arch/powerpc/mm/pgtable_32.c | 4 ---- arch/powerpc/mm/pgtable_64.c | 3 --- arch/powerpc/mm/ptdump/ptdump.c | 3 +++ arch/riscv/include/asm/ptdump.h | 22 ---------------------- arch/riscv/mm/init.c | 3 --- arch/riscv/mm/ptdump.c | 1 - arch/s390/include/asm/ptdump.h | 14 -------------- arch/s390/mm/dump_pagetables.c | 1 - arch/s390/mm/init.c | 2 -- arch/x86/include/asm/pgtable.h | 3 +-- arch/x86/mm/dump_pagetables.c | 3 +++ arch/x86/mm/init_32.c | 2 -- arch/x86/mm/init_64.c | 2 -- include/linux/ptdump.h | 7 +++++++ init/main.c | 2 ++ 18 files changed, 16 insertions(+), 71 deletions(-)
arch/arm64/include/asm/ptdump.h renamed from arch/arm64/include/asm/ptdump.h~arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx +0 -7
@@ -29,13 +29,6 @@ void __init ptdump_debugfs_register(strustatic inline void ptdump_debugfs_register (struct ptdump_info *info,const char *name) { }#endif -void ptdump_check_wx (void );#endif /* CONFIG_PTDUMP_CORE */ -#ifdef CONFIG_DEBUG_WX -#define debug_checkwx () ptdump_check_wx() -#else -#define debug_checkwx () do { } while (0) -#endif -#endif /* __ASM_PTDUMP_H */
arch/arm64/mm/mmu.c renamed from arch/arm64/mm/mmu.c~arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx +0 -2
@@ -632,8 +632,6 @@ void mark_rodata_ro(void) section_size = (unsigned long )__init_begin - (unsigned long )__start_rodata;update_mapping_prot (__pa_symbol (__start_rodata), (unsigned long )__start_rodata, section_size,PAGE_KERNEL_RO ); - -debug_checkwx (); } static void __init map_kernel_segment(pgd_t *pgdp, void *va_start, void *va_end,
arch/powerpc/mm/mmu_decl.h renamed from arch/powerpc/mm/mmu_decl.h~arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx +0 -6
@@ -171,12 +171,6 @@ static inline void mmu_mark_rodata_ro(vovoid __init mmu_mapin_immr (void );#endif -#ifdef CONFIG_DEBUG_WX -void ptdump_check_wx (void ); -#else -static inline void ptdump_check_wx (void ) { } -#endif -static inline bool debug_pagealloc_enabled_or_kfence (void ) {return IS_ENABLED (CONFIG_KFENCE ) ||debug_pagealloc_enabled ();
arch/powerpc/mm/pgtable_32.c renamed from arch/powerpc/mm/pgtable_32.c~arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx +0 -4
@@ -153,7 +153,6 @@ void mark_rodata_ro(void)if (v_block_mapped ((unsigned long )_stext +1 )) {mmu_mark_rodata_ro (); -ptdump_check_wx ();return ; }
@@ -166,9 +165,6 @@ void mark_rodata_ro(void)PFN_DOWN ((unsigned long )_stext); set_memory_ro((unsigned long)_stext, numpages); - -// mark_initmem_nx() should have already run by now - ptdump_check_wx(); }#endif
arch/powerpc/mm/pgtable_64.c renamed from arch/powerpc/mm/pgtable_64.c~arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx +0 -3
@@ -150,9 +150,6 @@ void mark_rodata_ro(void)radix__mark_rodata_ro (); elsehash__mark_rodata_ro (); - -// mark_initmem_nx() should have already run by now -ptdump_check_wx (); }void mark_initmem_nx (void )
arch/powerpc/mm/ptdump/ptdump.c renamed from arch/powerpc/mm/ptdump/ptdump.c~arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx +3 -0
@@ -343,6 +343,9 @@ void ptdump_check_wx(void) } }; +if (IS_ENABLED (CONFIG_PPC_BOOK3S_64 ) && !mmu_has_feature (MMU_FTR_KERNEL_RO )) +return ; +ptdump_walk_pgd (&st.ptdump, &init_mm,NULL );if (st.wx_pages)
arch/riscv/include/asm/ptdump.h deleted +0 -22
@@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* -* Copyright (C) 2019 SiFive -*/ - -#ifndef _ASM_RISCV_PTDUMP_H -#define _ASM_RISCV_PTDUMP_H - -void ptdump_check_wx (void ); - -#ifdef CONFIG_DEBUG_WX -static inline void debug_checkwx (void ) -{ -ptdump_check_wx (); -} -#else -static inline void debug_checkwx (void ) -{ -} -#endif - -#endif /* _ASM_RISCV_PTDUMP_H */
arch/riscv/mm/init.c renamed from arch/riscv/mm/init.c~arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx +0 -3
@@ -29,7 +29,6 @@#include <asm/io.h> #include <asm/numa.h> #include <asm/pgtable.h> -#include <asm/ptdump.h> #include <asm/sections.h> #include <asm/soc.h> #include <asm/tlbflush.h>
@@ -723,8 +722,6 @@ void mark_rodata_ro(void)if (IS_ENABLED (CONFIG_64BIT ))set_kernel_memory (lm_alias (__start_rodata),lm_alias (_data), set_memory_ro); - - debug_checkwx(); }#else static __init pgprot_t pgprot_from_va (uintptr_t va)
arch/riscv/mm/ptdump.c renamed from arch/riscv/mm/ptdump.c~arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx +0 -1
@@ -9,7 +9,6 @@#include <linux/seq_file.h> #include <linux/ptdump.h> -#include <asm/ptdump.h> #include <linux/pgtable.h> #include <asm/kasan.h>
arch/s390/include/asm/ptdump.h deleted +0 -14
@@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ - -#ifndef _ASM_S390_PTDUMP_H -#define _ASM_S390_PTDUMP_H - -void ptdump_check_wx (void ); - -static inline void debug_checkwx (void ) -{ -if (IS_ENABLED (CONFIG_DEBUG_WX )) -ptdump_check_wx (); -} - -#endif /* _ASM_S390_PTDUMP_H */
arch/s390/mm/dump_pagetables.c renamed from arch/s390/mm/dump_pagetables.c~arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx +0 -1
@@ -6,7 +6,6 @@#include <linux/mm.h> #include <linux/kfence.h> #include <linux/kasan.h> -#include <asm/ptdump.h> #include <asm/kasan.h> #include <asm/abs_lowcore.h> #include <asm/nospec-branch.h>
arch/s390/mm/init.c renamed from arch/s390/mm/init.c~arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx +0 -2
@@ -37,7 +37,6 @@#include <asm/pgalloc.h> #include <asm/ctlreg.h> #include <asm/kfence.h> -#include <asm/ptdump.h> #include <asm/dma.h> #include <asm/abs_lowcore.h> #include <asm/tlb.h>
@@ -109,7 +108,6 @@ void mark_rodata_ro(void)__set_memory_ro (__start_ro_after_init, __end_ro_after_init);pr_info ("Write protected read-only-after-init data: %luk\n" , size >>10 ); -debug_checkwx (); }int set_memory_encrypted (unsigned long vaddr,int numpages)
arch/x86/include/asm/pgtable.h renamed from arch/x86/include/asm/pgtable.h~arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx +1 -2
@@ -32,6 +32,7 @@ void ptdump_walk_pgd_level(struct seq_fivoid ptdump_walk_pgd_level_debugfs (struct seq_file *m,struct mm_struct *mm,bool user);void ptdump_walk_pgd_level_checkwx (void ); +#define ptdump_check_wx ptdump_walk_pgd_level_checkwxvoid ptdump_walk_user_pgd_level_checkwx (void );/*
@@ -41,10 +42,8 @@ void ptdump_walk_user_pgd_level_checkwx(#define pgprot_decrypted (prot) __pgprot(cc_mkdec(pgprot_val(prot)))#ifdef CONFIG_DEBUG_WX -#define debug_checkwx () ptdump_walk_pgd_level_checkwx()#define debug_checkwx_user () ptdump_walk_user_pgd_level_checkwx()#else -#define debug_checkwx () do { } while (0)#define debug_checkwx_user () do { } while (0)#endif
arch/x86/mm/dump_pagetables.c renamed from arch/x86/mm/dump_pagetables.c~arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx +3 -0
@@ -433,6 +433,9 @@ void ptdump_walk_user_pgd_level_checkwx(void ptdump_walk_pgd_level_checkwx (void ) { +if (!(__supported_pte_mask & _PAGE_NX)) +return ; +ptdump_walk_pgd_level_core (NULL , &init_mm,INIT_PGD , true, false); }
arch/x86/mm/init_32.c renamed from arch/x86/mm/init_32.c~arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx +0 -2
@@ -800,6 +800,4 @@ void mark_rodata_ro(void)set_pages_ro (virt_to_page (start), size >>PAGE_SHIFT );#endif mark_nxdata_nx (); -if (__supported_pte_mask & _PAGE_NX) -debug_checkwx (); }
arch/x86/mm/init_64.c renamed from arch/x86/mm/init_64.c~arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx +0 -2
@@ -1412,8 +1412,6 @@ void mark_rodata_ro(void) (void *)text_end, (void *)rodata_start);free_kernel_image_pages ("unused kernel image (rodata/data gap)" , (void *)rodata_end, (void *)_sdata); - -debug_checkwx (); }/*
include/linux/ptdump.h renamed from include/linux/ptdump.h~arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx +7 -0
@@ -19,5 +19,12 @@ struct ptdump_state { };void ptdump_walk_pgd (struct ptdump_state *st,struct mm_struct *mm,pgd_t *pgd); +void ptdump_check_wx (void ); + +static inline void debug_checkwx (void ) +{ +if (IS_ENABLED (CONFIG_DEBUG_WX )) +ptdump_check_wx (); +}#endif /* _LINUX_PTDUMP_H */
init/main.c renamed from init/main.c~arm64-powerpc-riscv-s390-x86-ptdump-refactor-config_debug_wx +2 -0
@@ -99,6 +99,7 @@#include <linux/init_syscalls.h> #include <linux/stackdepot.h> #include <linux/randomize_kstack.h> +#include <linux/ptdump.h> #include <net/net_namespace.h> #include <asm/io.h>
@@ -1408,6 +1409,7 @@ static void mark_readonly(void)*/ rcu_barrier ();mark_rodata_ro (); +debug_checkwx ();rodata_test (); }else pr_info ("Kernel memory protection disabled.\n" );
_
Patches currently in -mm which might be from [email protected] are