Commit f9aad622 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Andrew Morton
Browse files

mm: rename GENERIC_PTDUMP and PTDUMP_CORE 

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: default avatarAnshuman 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 3f548724

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm64/include/asm/ptdump.h

+2 −2
Original line number Diff line number Diff line
@@ -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 */

arch/arm64/kvm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/arm64/mm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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