arm64-mm-convert-mm-dumpc-to-use-walk_page_range.patch removed from -mm tree
The patch titled
Subject: arm64: mm: convert mm/dump.c to use walk_page_range()
has been removed from the -mm tree. Its filename was
arm64-mm-convert-mm-dumpc-to-use-walk_page_range.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Steven Price <[email protected]>
Subject: arm64: mm: convert mm/dump.c to use walk_page_range()
Now walk_page_range() can walk kernel page tables, we can switch the arm64 ptdump code over to using it, simplifying the code.
Signed-off-by Steven Price <[email protected]>
Reviewed-by Catalin Marinas <[email protected]>
Cc Albert Ou <[email protected]>
Cc Alexandre Ghiti <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Ard Biesheuvel <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Christian Borntraeger <[email protected]>
Cc Dave Hansen <[email protected]>
Cc David S. Miller <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc James Hogan <[email protected]>
Cc James Morse <[email protected]>
Cc Jerome Glisse <[email protected]>
Cc "Liang, Kan" <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Paul Burton <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Ralf Baechle <[email protected]>
Cc Russell King <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Vasily Gorbik <[email protected]>
Cc Vineet Gupta <[email protected]>
Cc Will Deacon <[email protected]>
Cc Zong Li <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/arm64/Kconfig | 1 arch/arm64/Kconfig.debug | 19 ---- arch/arm64/include/asm/ptdump.h | 8 - arch/arm64/mm/Makefile | 4 arch/arm64/mm/dump.c | 117 ++++++++------------------- arch/arm64/mm/mmu.c | 4 arch/arm64/mm/ptdump_debugfs.c | 2 drivers/firmware/efi/arm-runtime.c | 2 8 files changed, 50 insertions(+), 107 deletions(-)
arch/arm64/include/asm/ptdump.h renamed from arch/arm64/include/asm/ptdump.h~arm64-mm-convert-mm-dumpc-to-use-walk_page_range +4 -4
@@ -5,7 +5,7 @@#ifndef __ASM_PTDUMP_H#define __ASM_PTDUMP_H -#ifdef CONFIG_ARM64_PTDUMP_CORE +#ifdef CONFIG_PTDUMP_CORE #include <linux/mm_types.h> #include <linux/seq_file.h>
@@ -21,15 +21,15 @@ struct ptdump_info { unsigned long base_addr; }; -void ptdump_walk_pgd (struct seq_file *s,struct ptdump_info *info); -#ifdef CONFIG_ARM64_PTDUMP_DEBUGFS +void ptdump_walk (struct seq_file *s,struct ptdump_info *info); +#ifdef CONFIG_PTDUMP_DEBUGFS void ptdump_debugfs_register (struct ptdump_info *info,const char *name);#else static inline void ptdump_debugfs_register (struct ptdump_info *info,const char *name) { }#endif void ptdump_check_wx (void ); -#endif /* CONFIG_ARM64_PTDUMP_CORE */ +#endif /* CONFIG_PTDUMP_CORE */ #ifdef CONFIG_DEBUG_WX #define debug_checkwx () ptdump_check_wx()
arch/arm64/Kconfig renamed from arch/arm64/Kconfig~arm64-mm-convert-mm-dumpc-to-use-walk_page_range +1 -0
@@ -104,6 +104,7 @@ config ARM64 select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW_LEVEL select GENERIC_PCI_IOMAP + select GENERIC_PTDUMP select GENERIC_SCHED_CLOCK select GENERIC_SMP_IDLE_THREAD select GENERIC_STRNCPY_FROM_USER
arch/arm64/Kconfig.debug renamed from arch/arm64/Kconfig.debug~arm64-mm-convert-mm-dumpc-to-use-walk_page_range +1 -18
@@ -1,22 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only -config ARM64_PTDUMP_CORE - def_bool n - -config ARM64_PTDUMP_DEBUGFS - bool "Export kernel pagetable layout to userspace via debugfs" - depends on DEBUG_KERNEL - select ARM64_PTDUMP_CORE - select DEBUG_FS - help - Say Y here if you want to show the kernel pagetable layout in a - debugfs file. This information is only useful for kernel developers - who are working in architecture specific areas of the kernel. - It is probably not a good idea to enable this feature in a production - kernel. - - If in doubt, say N. - config PID_IN_CONTEXTIDR bool "Write the current PID to the CONTEXTIDR register" help
@@ -42,7 +25,7 @@ config ARM64_RANDOMIZE_TEXT_OFFSET config DEBUG_WX bool "Warn on W+X mappings at boot" - select ARM64_PTDUMP_CORE + select PTDUMP_CORE ---help--- Generate a warning if any W+X mappings are found at boot.
arch/arm64/mm/dump.c renamed from arch/arm64/mm/dump.c~arm64-mm-convert-mm-dumpc-to-use-walk_page_range +38 -79
166 lines not on this page · raw message
arch/arm64/mm/Makefile renamed from arch/arm64/mm/Makefile~arm64-mm-convert-mm-dumpc-to-use-walk_page_range +2 -2
@@ -4,8 +4,8 @@ obj-y := dma-mapping.o extable.o faul ioremap.o mmap.o pgd.o mmu.o \ context.o proc.o pageattr.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o -obj-$(CONFIG_ARM64_PTDUMP_CORE) += dump.o -obj-$(CONFIG_ARM64_PTDUMP_DEBUGFS) += ptdump_debugfs.o +obj-$(CONFIG_PTDUMP_CORE) += dump.o +obj-$(CONFIG_PTDUMP_DEBUGFS) += ptdump_debugfs.o obj-$(CONFIG_NUMA) += numa.o obj-$(CONFIG_DEBUG_VIRTUAL) += physaddr.o KASAN_SANITIZE_physaddr.o += n
arch/arm64/mm/mmu.c renamed from arch/arm64/mm/mmu.c~arm64-mm-convert-mm-dumpc-to-use-walk_page_range +2 -2
@@ -943,13 +943,13 @@ int __init arch_ioremap_pud_supported(vo* SW table walks can't handle removal of intermediate entries. */ return IS_ENABLED (CONFIG_ARM64_4K_PAGES ) && - !IS_ENABLED (CONFIG_ARM64_PTDUMP_DEBUGFS ); + !IS_ENABLED (CONFIG_PTDUMP_DEBUGFS ); }int __init arch_ioremap_pmd_supported (void ) {/* See arch_ioremap_pud_supported() */ -return !IS_ENABLED (CONFIG_ARM64_PTDUMP_DEBUGFS ); +return !IS_ENABLED (CONFIG_PTDUMP_DEBUGFS ); }int pud_set_huge (pud_t *pudp,phys_addr_t phys,pgprot_t prot)
arch/arm64/mm/ptdump_debugfs.c renamed from arch/arm64/mm/ptdump_debugfs.c~arm64-mm-convert-mm-dumpc-to-use-walk_page_range +1 -1
@@ -7,7 +7,7 @@static int ptdump_show (struct seq_file *m,void *v) {struct ptdump_info *info = m->private; -ptdump_walk_pgd (m, info); +ptdump_walk (m, info);return 0 ; }DEFINE_SHOW_ATTRIBUTE (ptdump);
drivers/firmware/efi/arm-runtime.c renamed from drivers/firmware/efi/arm-runtime.c~arm64-mm-convert-mm-dumpc-to-use-walk_page_range +1 -1
@@ -27,7 +27,7 @@extern u64 efi_system_table; -#ifdef CONFIG_ARM64_PTDUMP_DEBUGFS +#if defined(CONFIG_PTDUMP_DEBUGFS ) && defined(CONFIG_ARM64 )#include <asm/ptdump.h> static struct ptdump_info efi_ptdump_info = {
_
Patches currently in -mm which might be from [email protected] are