From patchwork Mon Nov 4 07:07:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bibo mao X-Patchwork-Id: 13860978 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 33B56D111B3 for ; Mon, 4 Nov 2024 07:07:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 985E16B0083; Mon, 4 Nov 2024 02:07:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9369F6B0085; Mon, 4 Nov 2024 02:07:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7FE286B0088; Mon, 4 Nov 2024 02:07:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 633EC6B0083 for ; Mon, 4 Nov 2024 02:07:42 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0B11C140ED6 for ; Mon, 4 Nov 2024 07:07:42 +0000 (UTC) X-FDA: 82747531146.06.C792A73 Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by imf19.hostedemail.com (Postfix) with ESMTP id 36AE31A000E for ; Mon, 4 Nov 2024 07:06:57 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; spf=pass (imf19.hostedemail.com: domain of maobibo@loongson.cn designates 114.242.206.163 as permitted sender) smtp.mailfrom=maobibo@loongson.cn; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730704012; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references; bh=KGtT4PaLokwZPOqhhQ14keJTwFnPjx9OHr8psNQu1K0=; b=uUsdc4hvK5Az6g4ax8vJ7woRMQSYEzCE4ueR58cp9fDH08iaSc5KBobpJ4KWPcQ3SGP8MF wOap058ZHSdLBLgwhWFnAJ5ggwwZz/DfJ9goQsDXY9RxquG88ylf1Re8WC9Ni1d8/QJoZY syLEcUnB9H/LQkueRvuq/5EHp28msfs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730704012; a=rsa-sha256; cv=none; b=sdIuFqIXmAVkBdOpyNd78pAm/Fk0WY1+EIMdT8+eP7UDdyUVD7Xn2XX7X+eed6cbfCoUZ8 jGbDEzOQo2EmL7hOxL5Ok/BkDGPwBS9HXeKPseEgp18g2Eq2ukPFB5yK5Q3I1AGhadZSy8 SluLko824GRSi6Y7TRz+KwlwRQCyHSI= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; spf=pass (imf19.hostedemail.com: domain of maobibo@loongson.cn designates 114.242.206.163 as permitted sender) smtp.mailfrom=maobibo@loongson.cn; dmarc=none Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8CxieCzcihn4rwtAA--.25992S3; Mon, 04 Nov 2024 15:07:31 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowMAxreCxcihnbNE9AA--.30183S2; Mon, 04 Nov 2024 15:07:30 +0800 (CST) From: Bibo Mao To: Huacai Chen , Thomas Bogendoerfer , Andrew Morton , Andrey Ryabinin Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, kasan-dev@googlegroups.com, Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , WANG Xuerui , Huacai Chen Subject: [PATCH v3] mm: define general function pXd_init() Date: Mon, 4 Nov 2024 15:07:12 +0800 Message-Id: <20241104070712.52902-1-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-CM-TRANSID: qMiowMAxreCxcihnbNE9AA--.30183S2 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== X-Stat-Signature: 3b61cehoxmkjr4tkow7ohyk4n5xathtd X-Rspam-User: X-Rspamd-Queue-Id: 36AE31A000E X-Rspamd-Server: rspam02 X-HE-Tag: 1730704017-252182 X-HE-Meta: U2FsdGVkX194nHw+SUh1US3EJqPCwubHHgtloGOVHOsLjdIMEyNDH90va4iQxNefjg9ep9WqiUvc5eqB54A4JHOaFvecFjf0iZCS31QM+7CHw8nTDm8QcW/QEnwLyaNO7yaf5t23v8egjdPUyTjFYrBifK9+b5yg5WOPudieOx2E6blAKfKu6YZc0EbU+HWW7S7BpdARtNiXXoQP2ku+Ci6USMIEED1pelvkcFU/HzV6Tu4kaEoKQiNi+jZNJNm0/CYjKZi2AFXmSz3UM1klKrmtk7XMaPd4NDY7FfD66PY2iz1Fbww7iCPgm2NX6kVVfjz2TF2upOOrQUNk/KwIU6/p0eqrEFEYdRG7/PQZ/T2mM+kk49hf4TonDiX/IKF4SX5OcB3vAfD6R3lK4gM+Gw5WlhpxJmGSb/IawoTudqFDeSSzUOSqpHI37j4ImiTS8dw9nU3zxgZv4f5Tm6Juv8KCCcIeEYYpmwVc2cRYol0Z098W7/KqyChxjNz+xbNRlrGsYV88ufKGniSVQw/juJEJmHGgdVuf5s80u3jUsOlxPhtHcxLpVFANjGINITb2q2TSCblMZKFSG7spXu4zoiPdbbdOHl13FTsS+4aOMXE4vPoaOGA5darW8KlMCpmuW0b0mwca3IjoUUaR5BBnODpDGdV+X0gd+hjvA5BK/nHIx5C0k84sUk/DZfxAg9kc3m6xljjk85LEQ4zVyqBS5Jdby7WetPTAQmwJ1qNe3H9WwCwY1O0tv6C1q6bg+eiXsdN+QxaV1TMxRyH5xgbFG4dAX3kjOjzY+sXr4e1PVIXMWxT61dPb34qccMk/kX53GSh+gG8jnxrsOFBcc0fKdYeH+5sZn7KvjDxHYX04uOlU/QoNsrZULF6E28ZipiI2neg6+jB8H/fkY39Au6iAB9Tv388MYcrwm4TfYSkleeoc3hsjsJU/yJP0Ft5Iwu4XAgVmlZwliy1UFGe1z7p vR0CjONd Wzwzx/rP+CotUvEF/9ibSSv0qihXhNRnrx2DKuxc7+ZNoXLj58aLrbZDEzIN//up+0KYhBMbsecJ8aVqPmxGLpJe302ljrZMfjjK82Y0y0BZZj2y38U2LBinpZ5CS6AkXL5tBn+GIzKQaCVsldo43JJwqY6t9DyRYuCCW 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: Function pud_init(), pmd_init() and kernel_pte_init() are duplicated defined in file kasan.c and sparse-vmemmap.c as weak functions. Move them to generic header file pgtable.h, architecture can redefine them. Reviewed-by: Huacai Chen Signed-off-by: Bibo Mao --- v2 ... v3: 1. Define macro pxd_init after function pxd_init() is declared. v1 ... v2: 1. Add general function definition about kernel_pte_init(). --- arch/loongarch/include/asm/pgtable.h | 3 +++ arch/mips/include/asm/pgtable-64.h | 2 ++ include/linux/mm.h | 3 --- include/linux/pgtable.h | 21 +++++++++++++++++++++ mm/kasan/init.c | 12 ------------ mm/sparse-vmemmap.c | 12 ------------ 6 files changed, 26 insertions(+), 27 deletions(-) base-commit: a8cc7432728d019a10cb412401ebc15ed7504289 diff --git a/arch/loongarch/include/asm/pgtable.h b/arch/loongarch/include/asm/pgtable.h index 20714b73f14c..da346733a1da 100644 --- a/arch/loongarch/include/asm/pgtable.h +++ b/arch/loongarch/include/asm/pgtable.h @@ -268,8 +268,11 @@ extern void set_pmd_at(struct mm_struct *mm, unsigned long addr, pmd_t *pmdp, pm */ extern void pgd_init(void *addr); extern void pud_init(void *addr); +#define pud_init pud_init extern void pmd_init(void *addr); +#define pmd_init pmd_init extern void kernel_pte_init(void *addr); +#define kernel_pte_init kernel_pte_init /* * Encode/decode swap entries and swap PTEs. Swap PTEs are all PTEs that diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h index 401c1d9e4409..6e854bb11f37 100644 --- a/arch/mips/include/asm/pgtable-64.h +++ b/arch/mips/include/asm/pgtable-64.h @@ -317,7 +317,9 @@ static inline pmd_t *pud_pgtable(pud_t pud) */ extern void pgd_init(void *addr); extern void pud_init(void *addr); +#define pud_init pud_init extern void pmd_init(void *addr); +#define pmd_init pmd_init /* * Encode/decode swap entries and swap PTEs. Swap PTEs are all PTEs that diff --git a/include/linux/mm.h b/include/linux/mm.h index 61fff5d34ed5..651bdc1bef48 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3818,9 +3818,6 @@ void *sparse_buffer_alloc(unsigned long size); struct page * __populate_section_memmap(unsigned long pfn, unsigned long nr_pages, int nid, struct vmem_altmap *altmap, struct dev_pagemap *pgmap); -void pud_init(void *addr); -void pmd_init(void *addr); -void kernel_pte_init(void *addr); pgd_t *vmemmap_pgd_populate(unsigned long addr, int node); p4d_t *vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node); pud_t *vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node); diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index e8b2ac6bd2ae..adee214c21f8 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -90,6 +90,27 @@ static inline unsigned long pud_index(unsigned long address) #define pgd_index(a) (((a) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1)) #endif +#ifndef kernel_pte_init +static inline void kernel_pte_init(void *addr) +{ +} +#define kernel_pte_init kernel_pte_init +#endif + +#ifndef pmd_init +static inline void pmd_init(void *addr) +{ +} +#define pmd_init pmd_init +#endif + +#ifndef pud_init +static inline void pud_init(void *addr) +{ +} +#define pud_init pud_init +#endif + #ifndef pte_offset_kernel static inline pte_t *pte_offset_kernel(pmd_t *pmd, unsigned long address) { diff --git a/mm/kasan/init.c b/mm/kasan/init.c index ac607c306292..ced6b29fcf76 100644 --- a/mm/kasan/init.c +++ b/mm/kasan/init.c @@ -106,10 +106,6 @@ static void __ref zero_pte_populate(pmd_t *pmd, unsigned long addr, } } -void __weak __meminit kernel_pte_init(void *addr) -{ -} - static int __ref zero_pmd_populate(pud_t *pud, unsigned long addr, unsigned long end) { @@ -145,10 +141,6 @@ static int __ref zero_pmd_populate(pud_t *pud, unsigned long addr, return 0; } -void __weak __meminit pmd_init(void *addr) -{ -} - static int __ref zero_pud_populate(p4d_t *p4d, unsigned long addr, unsigned long end) { @@ -187,10 +179,6 @@ static int __ref zero_pud_populate(p4d_t *p4d, unsigned long addr, return 0; } -void __weak __meminit pud_init(void *addr) -{ -} - static int __ref zero_p4d_populate(pgd_t *pgd, unsigned long addr, unsigned long end) { diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index c0388b2e959d..cec67c5f37d8 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -184,10 +184,6 @@ static void * __meminit vmemmap_alloc_block_zero(unsigned long size, int node) return p; } -void __weak __meminit kernel_pte_init(void *addr) -{ -} - pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node) { pmd_t *pmd = pmd_offset(pud, addr); @@ -201,10 +197,6 @@ pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node) return pmd; } -void __weak __meminit pmd_init(void *addr) -{ -} - pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node) { pud_t *pud = pud_offset(p4d, addr); @@ -218,10 +210,6 @@ pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node) return pud; } -void __weak __meminit pud_init(void *addr) -{ -} - p4d_t * __meminit vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node) { p4d_t *p4d = p4d_offset(pgd, addr);