From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA58EC021BF for ; Wed, 26 Feb 2025 12:34:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 807426B008A; Wed, 26 Feb 2025 07:34:11 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7B9826B008C; Wed, 26 Feb 2025 07:34:11 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6307E6B008A; Wed, 26 Feb 2025 07:34:11 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 468806B0085 for ; Wed, 26 Feb 2025 07:34:11 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 59A3B12129A for ; Wed, 26 Feb 2025 12:33:46 +0000 (UTC) X-FDA: 83162037252.30.842AF5B Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) by imf07.hostedemail.com (Postfix) with ESMTP id 2ABAE40019 for ; Wed, 26 Feb 2025 12:33:43 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740573224; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=82g+h+XLZ6dPMWF8j10vwuVPT88jBYJj0+fN9e1vvvI=; b=qSmlapyZv+Sqhgl2smPGozqq3AIYLVZJQtfvLVxHNM2v1RqKUOehyPfuOnDgCumG+ol8Up Ro3jJCTXrc26jYCv6enegIcpgZuIwrqgHdwfVpHo+HzrdOO0KWnsloIxUpVG9ZjBVNOa4X piulldXvlJhb6/q1uYaXI9xfd0EAhcM= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of christophe.leroy@csgroup.eu designates 93.17.235.10 as permitted sender) smtp.mailfrom=christophe.leroy@csgroup.eu; dmarc=pass (policy=quarantine) header.from=csgroup.eu ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740573224; a=rsa-sha256; cv=none; b=SGi3AZgvt483jmzBIbgc10r9M9Q+OQ1tNO/pW9+RSAn3QpJx2rfiTGhwSZYVvdgApcPbLy I7vvl0tdjbXeMSlgMHJgSr1QhWeUnqME6bSNjgwyQ7Yf8l34he0F7SMYsyUpYqN5TwBj4M NvqjaRvWXsLsgKt4gfivcOrQmI/rxVU= Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4Z2v5y6mnsz9sSV; Wed, 26 Feb 2025 13:33:42 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase2.c-s.fr ([172.26.127.65]) by localhost (pegase2.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qyUIDGDd7YTt; Wed, 26 Feb 2025 13:33:42 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase2.c-s.fr (Postfix) with ESMTP id 4Z2v5y5KZYz9sST; Wed, 26 Feb 2025 13:33:42 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 73A718B78B; Wed, 26 Feb 2025 13:33:42 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id 3SfOeDrhQ9ie; Wed, 26 Feb 2025 13:33:42 +0100 (CET) Received: from [10.25.207.138] (unknown [10.25.207.138]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 20F848B77C; Wed, 26 Feb 2025 13:33:42 +0100 (CET) Message-ID: <4f69c6de-0359-4a20-892b-073b93bd6035@csgroup.eu> Date: Wed, 26 Feb 2025 13:33:41 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH V3 5/5] mm: Rename GENERIC_PTDUMP and PTDUMP_CORE To: Anshuman Khandual , linux-mm@kvack.org Cc: Andrew Morton , Mark Rutland , kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, Catalin Marinas , Will Deacon , Jonathan Corbet , Marc Zyngier , Michael Ellerman , Nicholas Piggin , Paul Walmsley , Palmer Dabbelt , Heiko Carstens , Vasily Gorbik , Thomas Gleixner , Ingo Molnar References: <20250226122404.1927473-1-anshuman.khandual@arm.com> <20250226122404.1927473-6-anshuman.khandual@arm.com> Content-Language: fr-FR From: Christophe Leroy In-Reply-To: <20250226122404.1927473-6-anshuman.khandual@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 2ABAE40019 X-Stat-Signature: gso1kxs58zx96wwxnnbntyw3bq6anwrk X-HE-Tag: 1740573223-775881 X-HE-Meta: U2FsdGVkX1/fictenO2+Nludgp42yrQJazz0D0bpdro/ju5GmH7DvB5TP9PQUJYUF+gC4+iZYD1fBtiADBIN25D3NTutOtnO+FzCs9ocfPnSX2jaHfE0fuDOHSTiQdHIdt8Chf6AE+VJYDyPsjWV9HQ1MgMlZG/eS84C4MxaRC7iqTccMBjOXmhAjbsKf+eZWfB027pucGMCZE8T3VL+A0194sQo5RN9wnqiUufBVyzYpMiy6C66p6nKxAt0SiXJscNnbhDz50+C+xye0ZeVMWSCKyAkyVTWzddSHBg93QHGwuWRbYdCPdf35BsykTOnLTfL3cIdBpL0njbd2mco5foXDW/HNBJgYPH2bKHENskR/4SEE2vJCz9tT57yXjUB2MpWjA2pviLRuTnt3ZnCGKeTs3viXnpfVHtgHoHI0Hn5mCSL0RoBDKQmCbu4mmfoVPHsrNNSaocxjskt54+szDMczqghWmIC2lh1VU299nuXsHzK9E9qejmQS52IRE/yM+mOVN3F4wAI5SmFdDDHUNfW4v8WAw7MkUSgG96y0GUGauAWlewtqwVEaOLhf1zuzUbRGI4pt6JBg1jRywPytrVrTVtto+/EDFS18jxFiNTi5MeA1KH3DRhsvpo+bdL49/wMvu1WJOcR+6R8K6poKppPeTEr9tVqfJmH6jGXorkKhejndIJEc4pWfYUXDx0Y5RPHk9dW702XNI+EsHZlZnj1JHtCe6JLG80zBu/l6M3p1N2jeWXmezCtFkz2p7MqP7RFYIIqCCTTAfcsPBeKoOKHEdjq5G2zz7ZZEDLri6vuaGK1iLkfnFw4a+HWK63pO290hK+O8sgau/qHXAs8v6nDdUsldvsRm6DUvdONOUB0WoJWs1M+WydRU4AJ5yhlA4qCEJjCb39hiolD2PSaCGmmrqzVN4zvj2fznMlAxMAn9CCXQqn/s7Cb44gxRbuLXkUamW25FDM3mpOR8G9 w12edj0E FLw7waNrmhrNZ5dz07FG9hCYFlsvg65WcXEiG7H6rXY3xT1hljfZDEUqa7Y+CULZKUj0Bg9Im7Y1kpVoM97aBb+t4O8QcY7rLaBeelIOidzMpi1ohrbifC+8MWV/fHD51BXD2rGh1ISSSRGP1wMcE6lAbFSM6VpNrWxefzBQhaWvxV4OzG1HRVDY4g8D6lCcShs7fKNdV6UGjWgd4BFTBxOiv/huCCvdBz8As0gahF5Sa141PJd06giF9vva45aavukTRezOCBuLvt00gLW7n7Z08FuJf27HTfVU0UiDDA8C6HGaoqMfh+EebQt5wA8IPq3UlpnlWznFVQJ9eokvuDaIiwY+i2iiFB2M9HC41A+EHVB7DFvxcslXStREj2UTtY6wP5Ks1TxJCpvjOMZE4hw7bHXcfIIbHyARhCy0/VLV2cAf6e+rpMpQNRqvhabL8VADgRb3ux6VGLMJs9TbtDmcjWzezVjSzUSccFG1bUo5mjA0yhyGCH6RKsqG9DK5yCU0Kt6HNHFTj9RPQBxQ6gRTwqoLguKXrmoHZ3vilaFMP5/ydhy6jWPuM1ZcdfyDPufyn2zS5CVkS5qu8AQQJpyRVn0soHv88/NV6hNQC6C43qHZVywp/7ski0m/omSSM7eChPlKZVb2MjKN1CKuDU7yxaom72sHoOOk+NwTKrVRAh/fhhFktrc8VSeGJ0kocE/hH1AfKNv/rJZ3GCpDTZ/KqqUOxZhJuZ7/xHyWOdCG+eZNJRDUp3w4V9sJFSLOaRVbOu95N7lQJjUQ7Yt3YJ79ntkltQ5hmM7oXHOB9o6pOa/IVNXmpUNpOwCBnA1xteBCaG6RBDcbtfP/jLrmwcCbQp6Q3zuufUdAMHIV9TQ+dr3YbaE5FwIZKHj7z0uXaIqMrNWk/Z394lcM= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Le 26/02/2025 à 13:24, Anshuman Khandual a écrit : > 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. > > Cc: Catalin Marinas > Cc: Will Deacon > Cc: Jonathan Corbet > Cc: Marc Zyngier > Cc: Michael Ellerman > Cc: Nicholas Piggin > Cc: Paul Walmsley > Cc: Palmer Dabbelt > Cc: Heiko Carstens > Cc: Vasily Gorbik > Cc: Thomas Gleixner > Cc: Ingo Molnar > Cc: Andrew Morton > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-doc@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Cc: kvmarm@lists.linux.dev > Cc: linuxppc-dev@lists.ozlabs.org > Cc: linux-riscv@lists.infradead.org > Cc: linux-s390@vger.kernel.org > Cc: linux-mm@kvack.org > Signed-off-by: Anshuman Khandual Reviewed-by: Christophe Leroy (powerpc) > --- > arch/arm64/Kconfig | 2 +- > arch/arm64/include/asm/ptdump.h | 4 ++-- > arch/arm64/kvm/Kconfig | 4 ++-- > arch/arm64/mm/Makefile | 2 +- > arch/powerpc/Kconfig | 2 +- > arch/powerpc/mm/Makefile | 2 +- > arch/riscv/Kconfig | 2 +- > arch/riscv/mm/Makefile | 2 +- > arch/s390/Kconfig | 2 +- > arch/s390/mm/Makefile | 2 +- > arch/x86/Kconfig | 2 +- > arch/x86/Kconfig.debug | 2 +- > arch/x86/mm/Makefile | 2 +- > mm/Kconfig.debug | 12 ++++++------ > mm/Makefile | 2 +- > 15 files changed, 22 insertions(+), 22 deletions(-) > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index 940343beb3d4..5cf688ee01b7 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -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 > diff --git a/arch/arm64/include/asm/ptdump.h b/arch/arm64/include/asm/ptdump.h > index 6cf4aae05219..b2931d1ae0fb 100644 > --- a/arch/arm64/include/asm/ptdump.h > +++ b/arch/arm64/include/asm/ptdump.h > @@ -7,7 +7,7 @@ > > #include > > -#ifdef CONFIG_PTDUMP_CORE > +#ifdef CONFIG_PTDUMP > > #include > #include > @@ -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 */ > diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig > index ead632ad01b4..096e45acadb2 100644 > --- a/arch/arm64/kvm/Kconfig > +++ b/arch/arm64/kvm/Kconfig > @@ -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 > diff --git a/arch/arm64/mm/Makefile b/arch/arm64/mm/Makefile > index fc92170a8f37..c26489cf96cd 100644 > --- a/arch/arm64/mm/Makefile > +++ b/arch/arm64/mm/Makefile > @@ -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 > diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig > index 424f188e62d9..6f1ae41dcf85 100644 > --- a/arch/powerpc/Kconfig > +++ b/arch/powerpc/Kconfig > @@ -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 > diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile > index 0fe2f085c05a..8c1582b2987d 100644 > --- a/arch/powerpc/mm/Makefile > +++ b/arch/powerpc/mm/Makefile > @@ -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/ > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index 7612c52e9b1e..353cf41d01f4 100644 > --- a/arch/riscv/Kconfig > +++ b/arch/riscv/Kconfig > @@ -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 > diff --git a/arch/riscv/mm/Makefile b/arch/riscv/mm/Makefile > index cbe4d775ef56..b916a68d324a 100644 > --- a/arch/riscv/mm/Makefile > +++ b/arch/riscv/mm/Makefile > @@ -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 > diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig > index 9c9ec08d78c7..dd9dd2f8e673 100644 > --- a/arch/s390/Kconfig > +++ b/arch/s390/Kconfig > @@ -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 > diff --git a/arch/s390/mm/Makefile b/arch/s390/mm/Makefile > index f6c2db7a8669..9726b91fe7e4 100644 > --- a/arch/s390/mm/Makefile > +++ b/arch/s390/mm/Makefile > @@ -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 > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index be2c311f5118..39ecafffc7e3 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -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 > @@ -174,7 +175,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 > diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug > index 1eb4d23cdaae..c95c3aaadf97 100644 > --- a/arch/x86/Kconfig.debug > +++ b/arch/x86/Kconfig.debug > @@ -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 > diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile > index 690fbf48e853..e0c99a8760ca 100644 > --- a/arch/x86/mm/Makefile > +++ b/arch/x86/mm/Makefile > @@ -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 > diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug > index a51a1149909a..32b65073d0cc 100644 > --- a/mm/Kconfig.debug > +++ b/mm/Kconfig.debug > @@ -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 > diff --git a/mm/Makefile b/mm/Makefile > index 850386a67b3e..26dfecd4d396 100644 > --- a/mm/Makefile > +++ b/mm/Makefile > @@ -138,7 +138,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