]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
mm: rename GENERIC_PTDUMP and PTDUMP_CORE
authorAnshuman Khandual <anshuman.khandual@arm.com>
Wed, 26 Feb 2025 12:24:04 +0000 (17:54 +0530)
committerAndrew Morton <akpm@linux-foundation.org>
Tue, 4 Mar 2025 05:50:37 +0000 (21:50 -0800)
Platforms subscribe into generic ptdump implementation via GENERIC_PTDUMP.
But generic ptdump gets enabled via PTDUMP_CORE.  These configs
combination is confusing as they sound very similar and does not
differentiate between platform's feature subscription and feature
enablement for ptdump.  Rename the configs as ARCH_HAS_PTDUMP and PTDUMP
making it more clear and improve readability.

Link: https://lkml.kernel.org/r/20250226122404.1927473-6-anshuman.khandual@arm.com
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu> (powerpc)
Acked-by: Catalin Marinas <catalin.marinas@arm.com> [arm64]
Cc: Will Deacon <will@kernel.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Steven Price <steven.price@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
15 files changed:
arch/arm64/Kconfig
arch/arm64/include/asm/ptdump.h
arch/arm64/kvm/Kconfig
arch/arm64/mm/Makefile
arch/powerpc/Kconfig
arch/powerpc/mm/Makefile
arch/riscv/Kconfig
arch/riscv/mm/Makefile
arch/s390/Kconfig
arch/s390/mm/Makefile
arch/x86/Kconfig
arch/x86/Kconfig.debug
arch/x86/mm/Makefile
mm/Kconfig.debug
mm/Makefile

index 940343beb3d4cd6cd3a12567f33aeca135866bdd..5cf688ee01b7827af5ebaabdb01923b60f1d4152 100644 (file)
@@ -41,6 +41,7 @@ config ARM64
        select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS
        select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
        select ARCH_HAS_NONLEAF_PMD_YOUNG if ARM64_HAFT
+       select ARCH_HAS_PTDUMP
        select ARCH_HAS_PTE_DEVMAP
        select ARCH_HAS_PTE_SPECIAL
        select ARCH_HAS_HW_PTE_YOUNG
@@ -157,7 +158,6 @@ config ARM64
        select GENERIC_IRQ_SHOW_LEVEL
        select GENERIC_LIB_DEVMEM_IS_ALLOWED
        select GENERIC_PCI_IOMAP
-       select GENERIC_PTDUMP
        select GENERIC_SCHED_CLOCK
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_TIME_VSYSCALL
index 6cf4aae052191d869524069006df221643a66197..b2931d1ae0fb3022d377af920235de0ecba00c4b 100644 (file)
@@ -7,7 +7,7 @@
 
 #include <linux/ptdump.h>
 
-#ifdef CONFIG_PTDUMP_CORE
+#ifdef CONFIG_PTDUMP
 
 #include <linux/mm_types.h>
 #include <linux/seq_file.h>
@@ -70,6 +70,6 @@ static inline void ptdump_debugfs_register(struct ptdump_info *info,
 #else
 static inline void note_page(struct ptdump_state *pt_st, unsigned long addr,
                             int level, u64 val) { }
-#endif /* CONFIG_PTDUMP_CORE */
+#endif /* CONFIG_PTDUMP */
 
 #endif /* __ASM_PTDUMP_H */
index ead632ad01b4cce65b680f1cc85eea49e69c8fa3..096e45acadb2d5865e176ac911eaef5fa6404b20 100644 (file)
@@ -71,8 +71,8 @@ config PTDUMP_STAGE2_DEBUGFS
        depends on KVM
        depends on DEBUG_KERNEL
        depends on DEBUG_FS
-       depends on GENERIC_PTDUMP
-       select PTDUMP_CORE
+       depends on ARCH_HAS_PTDUMP
+       select PTDUMP
        default n
        help
          Say Y here if you want to show the stage-2 kernel pagetables
index fc92170a8f377c0a6822837f33c391b520499be4..c26489cf96cd908026eef239268b5556a5435aa4 100644 (file)
@@ -5,7 +5,7 @@ obj-y                           := dma-mapping.o extable.o fault.o init.o \
                                   context.o proc.o pageattr.o fixmap.o
 obj-$(CONFIG_ARM64_CONTPTE)    += contpte.o
 obj-$(CONFIG_HUGETLB_PAGE)     += hugetlbpage.o
-obj-$(CONFIG_PTDUMP_CORE)      += ptdump.o
+obj-$(CONFIG_PTDUMP)           += ptdump.o
 obj-$(CONFIG_PTDUMP_DEBUGFS)   += ptdump_debugfs.o
 obj-$(CONFIG_TRANS_TABLE)      += trans_pgd.o
 obj-$(CONFIG_TRANS_TABLE)      += trans_pgd-asm.o
index 424f188e62d9886ee7f6d2531547f09a0606747d..6f1ae41dcf8501fdb3f607ce2e1e54dccc35f580 100644 (file)
@@ -148,6 +148,7 @@ config PPC
        select ARCH_HAS_PHYS_TO_DMA
        select ARCH_HAS_PMEM_API
        select ARCH_HAS_PREEMPT_LAZY
+       select ARCH_HAS_PTDUMP
        select ARCH_HAS_PTE_DEVMAP              if PPC_BOOK3S_64
        select ARCH_HAS_PTE_SPECIAL
        select ARCH_HAS_SCALED_CPUTIME          if VIRT_CPU_ACCOUNTING_NATIVE && PPC_BOOK3S_64
@@ -206,7 +207,6 @@ config PPC
        select GENERIC_IRQ_SHOW
        select GENERIC_IRQ_SHOW_LEVEL
        select GENERIC_PCI_IOMAP                if PCI
-       select GENERIC_PTDUMP
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_TIME_VSYSCALL
        select GENERIC_VDSO_TIME_NS
index 0fe2f085c05ad34e4ce3bac05ca596c053ba664a..8c1582b2987d4aecfa139dc2f79c2f4c6cca6bee 100644 (file)
@@ -15,5 +15,5 @@ obj-$(CONFIG_NUMA) += numa.o
 obj-$(CONFIG_HUGETLB_PAGE)     += hugetlbpage.o
 obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o
 obj-$(CONFIG_PPC_COPRO_BASE)   += copro_fault.o
-obj-$(CONFIG_PTDUMP_CORE)      += ptdump/
+obj-$(CONFIG_PTDUMP)           += ptdump/
 obj-$(CONFIG_KASAN)            += kasan/
index 7612c52e9b1e35607f1dd4603a596416d3357a71..353cf41d01f4c5ff80b0221727834bb5091889d7 100644 (file)
@@ -43,6 +43,7 @@ config RISCV
        select ARCH_HAS_PMEM_API
        select ARCH_HAS_PREEMPT_LAZY
        select ARCH_HAS_PREPARE_SYNC_CORE_CMD
+       select ARCH_HAS_PTDUMP if MMU
        select ARCH_HAS_PTE_DEVMAP if 64BIT && MMU
        select ARCH_HAS_PTE_SPECIAL
        select ARCH_HAS_SET_DIRECT_MAP if MMU
@@ -112,7 +113,6 @@ config RISCV
        select GENERIC_IRQ_SHOW_LEVEL
        select GENERIC_LIB_DEVMEM_IS_ALLOWED
        select GENERIC_PCI_IOMAP
-       select GENERIC_PTDUMP if MMU
        select GENERIC_SCHED_CLOCK
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_TIME_VSYSCALL if MMU && 64BIT
index cbe4d775ef56c0dbd997163c32fdf8e5bc5a9908..b916a68d324ad7cfe2b18c49273edcd0ce89a03b 100644 (file)
@@ -19,7 +19,7 @@ obj-y += context.o
 obj-y += pmem.o
 
 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
-obj-$(CONFIG_PTDUMP_CORE) += ptdump.o
+obj-$(CONFIG_PTDUMP) += ptdump.o
 obj-$(CONFIG_KASAN)   += kasan_init.o
 
 ifdef CONFIG_KASAN
index 9c9ec08d78c71b4d227beeafab1b82d6434cb5c7..dd9dd2f8e673bdadc4bd41fc89826ad294f3ee8b 100644 (file)
@@ -96,6 +96,7 @@ config S390
        select ARCH_HAS_MEM_ENCRYPT
        select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS
        select ARCH_HAS_PREEMPT_LAZY
+       select ARCH_HAS_PTDUMP
        select ARCH_HAS_PTE_SPECIAL
        select ARCH_HAS_SCALED_CPUTIME
        select ARCH_HAS_SET_DIRECT_MAP
@@ -163,7 +164,6 @@ config S390
        select GENERIC_CPU_VULNERABILITIES
        select GENERIC_ENTRY
        select GENERIC_GETTIMEOFDAY
-       select GENERIC_PTDUMP
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_TIME_VSYSCALL
        select GENERIC_VDSO_TIME_NS
index f6c2db7a86690814e2e26bd5a0a4d0477d1b3648..9726b91fe7e412c65bb361eb0bdbe1d69974e8fc 100644 (file)
@@ -9,6 +9,6 @@ obj-y           += page-states.o pageattr.o pgtable.o pgalloc.o extable.o
 obj-$(CONFIG_CMM)              += cmm.o
 obj-$(CONFIG_DEBUG_VIRTUAL)    += physaddr.o
 obj-$(CONFIG_HUGETLB_PAGE)     += hugetlbpage.o
-obj-$(CONFIG_PTDUMP_CORE)      += dump_pagetables.o
+obj-$(CONFIG_PTDUMP)           += dump_pagetables.o
 obj-$(CONFIG_PGSTE)            += gmap.o
 obj-$(CONFIG_PFAULT)           += pfault.o
index 19773cd7161812c7fce1d4fb60c3fbb28b92d294..d05f26e301a988dec933f88797f3354d5b5382a9 100644 (file)
@@ -26,6 +26,7 @@ config X86_64
        depends on 64BIT
        # Options that are inherently 64-bit kernel only:
        select ARCH_HAS_GIGANTIC_PAGE
+       select ARCH_HAS_PTDUMP
        select ARCH_SUPPORTS_INT128 if CC_HAS_INT128
        select ARCH_SUPPORTS_PER_VMA_LOCK
        select ARCH_SUPPORTS_HUGE_PFNMAP if TRANSPARENT_HUGEPAGE
@@ -175,7 +176,6 @@ config X86
        select GENERIC_IRQ_RESERVATION_MODE
        select GENERIC_IRQ_SHOW
        select GENERIC_PENDING_IRQ              if SMP
-       select GENERIC_PTDUMP
        select GENERIC_SMP_IDLE_THREAD
        select GENERIC_TIME_VSYSCALL
        select GENERIC_GETTIMEOFDAY
index 1eb4d23cdaaea0f47580ab0e1d82ad05f13217ab..c95c3aaadf97c3daf2594265d0bdbfd59d6b4f04 100644 (file)
@@ -59,7 +59,7 @@ config EARLY_PRINTK_USB_XDBC
 config EFI_PGT_DUMP
        bool "Dump the EFI pagetable"
        depends on EFI
-       select PTDUMP_CORE
+       select PTDUMP
        help
          Enable this if you want to dump the EFI page table before
          enabling virtual mode. This can be used to debug miscellaneous
index 690fbf48e8538b62a176ce838820e363575b7897..e0c99a8760ca71ec40f8fdd425abebfa4d8ba654 100644 (file)
@@ -39,7 +39,7 @@ CFLAGS_fault.o := -I $(src)/../include/asm/trace
 obj-$(CONFIG_X86_32)           += pgtable_32.o iomap_32.o
 
 obj-$(CONFIG_HUGETLB_PAGE)     += hugetlbpage.o
-obj-$(CONFIG_PTDUMP_CORE)      += dump_pagetables.o
+obj-$(CONFIG_PTDUMP)           += dump_pagetables.o
 obj-$(CONFIG_PTDUMP_DEBUGFS)   += debug_pagetables.o
 
 obj-$(CONFIG_HIGHMEM)          += highmem_32.o
index a51a1149909aacf8bbb32e56aa8b71e0c3b56338..32b65073d0cccaf540e5def487a29f5066c987ed 100644 (file)
@@ -186,9 +186,9 @@ config ARCH_HAS_DEBUG_WX
 config DEBUG_WX
        bool "Warn on W+X mappings at boot"
        depends on ARCH_HAS_DEBUG_WX
-       depends on GENERIC_PTDUMP
+       depends on ARCH_HAS_PTDUMP
        depends on MMU
-       select PTDUMP_CORE
+       select PTDUMP
        help
          Generate a warning if any W+X mappings are found at boot.
 
@@ -213,18 +213,18 @@ config DEBUG_WX
 
          If in doubt, say "Y".
 
-config GENERIC_PTDUMP
+config ARCH_HAS_PTDUMP
        bool
 
-config PTDUMP_CORE
+config PTDUMP
        bool
 
 config PTDUMP_DEBUGFS
        bool "Export kernel pagetable layout to userspace via debugfs"
        depends on DEBUG_KERNEL
        depends on DEBUG_FS
-       depends on GENERIC_PTDUMP
-       select PTDUMP_CORE
+       depends on ARCH_HAS_PTDUMP
+       select PTDUMP
        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
index 84b1127e43a5438e1b0fb2a5f9143cd91af49966..e7f6bbf8ae5f7fd1c2c316ec8f1ce5b812c559a5 100644 (file)
@@ -139,7 +139,7 @@ obj-$(CONFIG_ZONE_DEVICE) += memremap.o
 obj-$(CONFIG_HMM_MIRROR) += hmm.o
 obj-$(CONFIG_MEMFD_CREATE) += memfd.o
 obj-$(CONFIG_MAPPING_DIRTY_HELPERS) += mapping_dirty_helpers.o
-obj-$(CONFIG_PTDUMP_CORE) += ptdump.o
+obj-$(CONFIG_PTDUMP) += ptdump.o
 obj-$(CONFIG_PAGE_REPORTING) += page_reporting.o
 obj-$(CONFIG_IO_MAPPING) += io-mapping.o
 obj-$(CONFIG_HAVE_BOOTMEM_INFO_NODE) += bootmem_info.o