mm-ptdump-have-ptdump_check_wx-return-bool.patch removed from -mm tree
The quilt patch titled
Subject: mm: ptdump: have ptdump_check_wx() return bool
has been removed from the -mm tree. Its filename was
mm-ptdump-have-ptdump_check_wx-return-bool.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: mm: ptdump: have ptdump_check_wx() return bool
Date: Tue, 30 Jan 2024 11:34:35 +0100
Have ptdump_check_wx() return true when the check is successful or false otherwise.
[[email protected]: fix a couple of build issues (x86_64 allmodconfig)]
Link https://lkml.kernel.org/r/7943149fe955458cb7b57cd483bf41a3aad94684.1706610398.git.christophe.leroy@csgroup.eu open here
Signed-off-by Christophe Leroy <[email protected]>
Cc Albert Ou <[email protected]>
Cc Alexander Gordeev <[email protected]>
Cc Alexandre Ghiti <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc "Aneesh Kumar K.V (IBM)" <[email protected]>
Cc Borislav Petkov (AMD) <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Christian Borntraeger <[email protected]>
Cc Dave Hansen <[email protected]>
Cc Gerald Schaefer <[email protected]>
Cc Greg KH <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Kees Cook <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc "Naveen N. Rao" <[email protected]>
Cc Nicholas Piggin <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Phong Tran <[email protected]>
Cc Russell King <[email protected]>
Cc Steven Price <[email protected]>
Cc Sven Schnelle <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Vasily Gorbik <[email protected]>
Cc Will Deacon <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/arm64/mm/ptdump.c | 11 ++++++++--- arch/powerpc/mm/ptdump/ptdump.c | 13 +++++++++---- arch/riscv/mm/ptdump.c | 11 ++++++++--- arch/s390/mm/dump_pagetables.c | 13 +++++++++---- arch/x86/include/asm/pgtable.h | 2 +- arch/x86/mm/dump_pagetables.c | 23 ++++++++++++++--------- include/linux/ptdump.h | 5 ++++- 7 files changed, 53 insertions(+), 25 deletions(-)
arch/arm64/mm/ptdump.c renamed from arch/arm64/mm/ptdump.c~mm-ptdump-have-ptdump_check_wx-return-bool +8 -3
@@ -345,7 +345,7 @@ static struct ptdump_info kernel_ptdump_ .base_addr = PAGE_OFFSET, }; -void ptdump_check_wx (void ) +bool ptdump_check_wx (void ) {struct pg_state st = { .seq =NULL ,
@@ -366,11 +366,16 @@ void ptdump_check_wx(void)ptdump_walk_pgd (&st.ptdump, &init_mm,NULL ); -if (st.wx_pages || st.uxn_pages) +if (st.wx_pages || st.uxn_pages) {pr_warn ("Checked W+X mappings: FAILED, %lu W+X pages found, %lu non-UXN pages found\n" , st.wx_pages, st.uxn_pages); -else + +return false; + }else {pr_info ("Checked W+X mappings: passed, no W+X pages found\n" ); + +return true; + } }static int __init ptdump_init (void )
arch/powerpc/mm/ptdump/ptdump.c renamed from arch/powerpc/mm/ptdump/ptdump.c~mm-ptdump-have-ptdump_check_wx-return-bool +9 -4
@@ -327,7 +327,7 @@ static void __init build_pgtable_complet pg_level[i].mask |= pg_level[i].flag[j].mask; } -void ptdump_check_wx (void ) +bool ptdump_check_wx (void ) {struct pg_state st = { .seq =NULL ,
@@ -344,15 +344,20 @@ void ptdump_check_wx(void) };if (IS_ENABLED (CONFIG_PPC_BOOK3S_64 ) && !mmu_has_feature (MMU_FTR_KERNEL_RO )) -return ; +return true;ptdump_walk_pgd (&st.ptdump, &init_mm,NULL ); -if (st.wx_pages) +if (st.wx_pages) {pr_warn ("Checked W+X mappings: FAILED, %lu W+X pages found\n" , st.wx_pages); -else + +return false; + }else {pr_info ("Checked W+X mappings: passed, no W+X pages found\n" ); + +return true; + } }static int __init ptdump_init (void )
arch/riscv/mm/ptdump.c renamed from arch/riscv/mm/ptdump.c~mm-ptdump-have-ptdump_check_wx-return-bool +8 -3
@@ -335,7 +335,7 @@ static void ptdump_walk(struct seq_fileptdump_walk_pgd (&st.ptdump, pinfo->mm,NULL ); } -void ptdump_check_wx (void ) +bool ptdump_check_wx (void ) {struct pg_state st = { .seq =NULL ,
@@ -356,11 +356,16 @@ void ptdump_check_wx(void)ptdump_walk_pgd (&st.ptdump, &init_mm,NULL ); -if (st.wx_pages) +if (st.wx_pages) {pr_warn ("Checked W+X mappings: failed, %lu W+X pages found\n" , st.wx_pages); -else + +return false; + }else {pr_info ("Checked W+X mappings: passed, no W+X pages found\n" ); + +return true; + } }static int ptdump_show (struct seq_file *m,void *v)
arch/s390/mm/dump_pagetables.c renamed from arch/s390/mm/dump_pagetables.c~mm-ptdump-have-ptdump_check_wx-return-bool +9 -4
@@ -192,7 +192,7 @@ static void note_page(struct ptdump_stat } } -void ptdump_check_wx (void ) +bool ptdump_check_wx (void ) {struct pg_state st = { .ptdump = {
@@ -215,14 +215,19 @@ void ptdump_check_wx(void) };if (!MACHINE_HAS_NX ) -return ; +return true;ptdump_walk_pgd (&st.ptdump, &init_mm,NULL ); -if (st.wx_pages) +if (st.wx_pages) {pr_warn ("Checked W+X mappings: FAILED, %lu W+X pages found\n" , st.wx_pages); -else + +return false; + }else {pr_info ("Checked W+X mappings: passed, no %sW+X pages found\n" , (nospec_uses_trampoline () || !static_key_enabled (&cpu_has_bear)) ?"unexpected " :"" ); + +return true; + } }#ifdef CONFIG_PTDUMP_DEBUGFS
arch/x86/include/asm/pgtable.h renamed from arch/x86/include/asm/pgtable.h~mm-ptdump-have-ptdump_check_wx-return-bool +1 -1
@@ -31,7 +31,7 @@ struct seq_file;void ptdump_walk_pgd_level (struct seq_file *m,struct mm_struct *mm);void ptdump_walk_pgd_level_debugfs (struct seq_file *m,struct mm_struct *mm,bool user); -void ptdump_walk_pgd_level_checkwx (void ); +bool ptdump_walk_pgd_level_checkwx (void );#define ptdump_check_wx ptdump_walk_pgd_level_checkwxvoid ptdump_walk_user_pgd_level_checkwx (void );
arch/x86/mm/dump_pagetables.c renamed from arch/x86/mm/dump_pagetables.c~mm-ptdump-have-ptdump_check_wx-return-bool +14 -9
@@ -362,9 +362,9 @@ static void note_page(struct ptdump_stat } } -static void ptdump_walk_pgd_level_core (struct seq_file *m, -struct mm_struct *mm,pgd_t *pgd, -bool checkwx,bool dmesg) +bool ptdump_walk_pgd_level_core (struct seq_file *m, +struct mm_struct *mm,pgd_t *pgd, +bool checkwx,bool dmesg) { const struct ptdump_range ptdump_ranges[] = {#ifdef CONFIG_X86_64
@@ -391,12 +391,17 @@ static void ptdump_walk_pgd_level_core(sptdump_walk_pgd (&st.ptdump, mm, pgd);if (!checkwx) -return ; -if (st.wx_pages) +return true; +if (st.wx_pages) {pr_info ("x86/mm: Checked W+X mappings: FAILED, %lu W+X pages found.\n" , st.wx_pages); -else + +return false; + }else {pr_info ("x86/mm: Checked W+X mappings: passed, no W+X pages found.\n" ); + +return true; + } }void ptdump_walk_pgd_level (struct seq_file *m,struct mm_struct *mm)
@@ -431,12 +436,12 @@ void ptdump_walk_user_pgd_level_checkwx(#endif } -void ptdump_walk_pgd_level_checkwx (void ) +bool ptdump_walk_pgd_level_checkwx (void ) {if (!(__supported_pte_mask & _PAGE_NX)) -return ; +return true; -ptdump_walk_pgd_level_core (NULL , &init_mm,INIT_PGD , true, false); +return ptdump_walk_pgd_level_core (NULL , &init_mm,INIT_PGD , true, false); }static int __init pt_dump_init (void )
include/linux/ptdump.h renamed from include/linux/ptdump.h~mm-ptdump-have-ptdump_check_wx-return-bool +4 -1
@@ -18,8 +18,11 @@ struct ptdump_state {const struct ptdump_range *range; }; +bool ptdump_walk_pgd_level_core (struct seq_file *m, +struct mm_struct *mm,pgd_t *pgd, +bool checkwx,bool dmesg);void ptdump_walk_pgd (struct ptdump_state *st,struct mm_struct *mm,pgd_t *pgd); -void ptdump_check_wx (void ); +bool ptdump_check_wx (void );static inline void debug_checkwx (void ) {
_
Patches currently in -mm which might be from [email protected] are