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 C2CD2D5CC86 for ; Wed, 30 Oct 2024 10:18:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4E3B18D0002; Wed, 30 Oct 2024 06:18:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 46B748D0001; Wed, 30 Oct 2024 06:18:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2BD968D0002; Wed, 30 Oct 2024 06:18:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 08DF98D0001 for ; Wed, 30 Oct 2024 06:18:35 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id AB0B2C0A79 for ; Wed, 30 Oct 2024 10:18:34 +0000 (UTC) X-FDA: 82729868592.23.43A2DE3 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf26.hostedemail.com (Postfix) with ESMTP id 49F39140025 for ; Wed, 30 Oct 2024 10:18:13 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=QmLBYLiQ; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of chenhuacai@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chenhuacai@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730283457; a=rsa-sha256; cv=none; b=wkaopVv5+BkkKNv4W03GA4ozXy+RQPdT1kCL9AcubSMG5hnyk7110M5GG5G8+HofcufWgB tuFfOQiqAaL00fNffgTfL3ye1wVfaEjIadqbo0T3F99TdBb97RnZss/lrVSGFahe357MeY H1+ztJkVE4lXwU3ZjUeh3k3LE+Ml/A4= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=QmLBYLiQ; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of chenhuacai@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chenhuacai@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730283457; 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:dkim-signature; bh=wKc28QdF+vvrcEl4ukrPCmM1V6U1/x4aUsBDxFh3gv0=; b=kpjs3QV/3p/+UzYVxvJqrYvJSV1UIuIF83vMwegsnopmzmIEaMQqSeW5XxLmqepoTZ4Spv OV4av7lq3u/PDBWAjHZ1BMZGD6NmwMVenm57zx/dOcOrXVyVMN9DwOR3r659QUU6eVHA9B ljajy1e/dsBv1Mf7yb6abbeuJoZ3l4o= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 982875C6047 for ; Wed, 30 Oct 2024 10:17:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D42DC4CEEF for ; Wed, 30 Oct 2024 10:18:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730283511; bh=t+xHN4yo8SpZkvNHOi0SdTDVZvJ6vp92lqDwZm0EdZc=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=QmLBYLiQPYapLCrCW6LjVF3/vceyiJ2GZb3Y1HbV7W+pc3t8QZ5lpi923mNr9sm7f nyvjnseZRo/MwsxYaWWYytCHdJCv952UC2gq3qmj8RR0q+16NO2TGWNdqWZZiG5pv/ aesIPF8UgtMWv2A46FcI0jSkOMH9/BWH8XlqMJYLMxy/ZZqcd217bpZYlUut5COB5k JeJN4ehrkCl1dvCKXanY/MGO4W8DVLzcdC38EqXmh/GLfGkZjp/hNR+/lfBfrnqycG USfM3/+EwbX4CYkVUP6oWyitWY7yQKXvlpXxNEKZe0gIffDjAWyrC7sT5F1thQgunp iZmusiXaQwmtA== Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-a9acafdb745so133191866b.0 for ; Wed, 30 Oct 2024 03:18:30 -0700 (PDT) X-Forwarded-Encrypted: i=1; AJvYcCUHRWTpv5na244J2NLkf4YiXQ9o2dNME2i6gn2lXhyXtVXSPJ1e7ZRc5Y1LG0H+BjTnMIQh85Xudw==@kvack.org X-Gm-Message-State: AOJu0Yw1v4EryMca/vVRDR1YLdbVO+G1XZH5b/jJMLrClAIuBOx9bNca rwkr2S/A9F5GBbE/LPFMVhmopBf6J1Xb/v5Fz31KNTJvRqiifkhDeUfnHXv5TSs0Dj0kRdqtsB0 VAskwqptytXbSzAyVDs+SPPr+aVo= X-Google-Smtp-Source: AGHT+IGAc6JnsOtXiiVNTGb3faYWlCbREMz3guhUI9jKNulZYKGz8L3DUoumQNWcke9Qq+sg7an5RaH7LNbOJB0dqU4= X-Received: by 2002:a17:906:730b:b0:a9a:c57f:964b with SMTP id a640c23a62f3a-a9e40bc5d44mr134325766b.8.1730283509388; Wed, 30 Oct 2024 03:18:29 -0700 (PDT) MIME-Version: 1.0 References: <20241030063905.2434824-1-maobibo@loongson.cn> In-Reply-To: <20241030063905.2434824-1-maobibo@loongson.cn> From: Huacai Chen Date: Wed, 30 Oct 2024 18:18:16 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v2] mm: define general function pXd_init() To: Bibo Mao Cc: Thomas Bogendoerfer , Andrew Morton , Andrey Ryabinin , 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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Queue-Id: 49F39140025 X-Rspamd-Server: rspam01 X-Stat-Signature: wyhu64orjf4z94jq3x6t8w33wuue8ofu X-HE-Tag: 1730283493-952981 X-HE-Meta: U2FsdGVkX1/K/PKAP2ODO6YcUc79hIk003WHf54RUTBrSI5lsGJ6JT/2r6AQSbVD7HemQav+pONqpdQwkg2kqSTRyf/12QE+1qzjwjreHiH9OlV4jCh6CXy8HLfwG9OsbxfcMO4t+yEOxAgDze4lNToNPHCymE04nc6Hu/Jhmousghx28X/vszFHMMAs7jaUaxfExfyhTHu9ywSCere9FBFIJvylVDrRniA8Wn7058pP2wJQ2IHODEoZlO++fYFGfpRN84mnokWJjfWm7pfJACGfTmZ2RtyWlCaGUhi7Qo+BtjOpyF/4U4Gyu9wm5cZyTrve9H6NyDW5wseLvaRntaFxwAwsDv4neg9TwowkQ+ZCKIeY8DtWijgzFCwa+CdryWu2Hpl1r9kT+MoValeYP7vLy7nieubrGVaKP7DDhgSY9x3vG9WReLkhlXJhqv/dHFtJ3UMyRkQkeU9qQHJUpvlTUmKWqyiDjDpiFQWTaCkIXIOoB0K6vaGKPyW9msLlWBYZzw2vhrQHRhWAYj1jq300UCPjdallmsza1edh5l1Ae2DUe+C0AHIFM0lTgNY3spI890xIAH1ZPm93HuYTFrz3MipO78sRp0napBhJlffk9H+dZosDguzX3ajOCRjrx98tp3n8kJ0nPjouTx4SXKwI9+b99/yLcavFTIq2aoG0rpBQ/xp9CmNjAQJwWXc5qamcrqfWv/wWPqM2p/3Rg/Yiurn4mSOytIgnUh814roUMcEEJ8WUceRsFfls4gvXteQHiHh5ysugtRzPP68G6MHv3ITmupzcQhZJX2SipriDrj4mWfFcHDMHwYz61AnQI+Ghnk9gfvutuDeJ1d2WD+cOtOrEFs99nVr5zRqxwvnhneVS++TLrgZv/69ILvoLMiYHbJZ+HiNkeENublEF009jPvNZMFItlnVy/aEn3l5HcLtIbAsqkwkCSNfQdvo6jfnjjcgGsGmWNz0Jc3j qpdV6hQO y2kigaGErrCFMmF3x7C7RGxNV5Dh4ZGlj5PYKSc+IRPYqfynt9NmOsTp+Hhze38l7ytCUiDWloCzOX+CFtIVPOtbi3Cog/M0yZXFmtrW3I5qx+q7ApqW+FGDQWWr3krjmy+MsC/1yVvMuVgkogMAnSKzwBdBH1385qOCnfgd7KyWOGdDwk7jrf+Zv4J78XVvp6sPNExGvT1nwY+EZ0/Pe7R78HWJ45JQuVnOaz4Lptl/Ouv7VseZBVoJFPvjZRyyPe8Y9+j7f3Tc5wqZbtdi9Oi4lsnAbW/VSXRGGl044+G8Aah/LhIODQBNMl8UeSWOV5WmljbFlZiJzWSDJe3FmMaTnIv2YA8bM4upO1GW1U2D2OlH+J9Hrn522rPYlv3VRfVuKJJWQDZDJUguTzp1GY5atLA== 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: Reviewed-by: Huacai Chen On Wed, Oct 30, 2024 at 2:39=E2=80=AFPM Bibo Mao wrot= e: > > 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. > > Signed-off-by: Bibo Mao > --- > 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(-) > > diff --git a/arch/loongarch/include/asm/pgtable.h b/arch/loongarch/includ= e/asm/pgtable.h > index 20714b73f14c..df5889d995f9 100644 > --- a/arch/loongarch/include/asm/pgtable.h > +++ b/arch/loongarch/include/asm/pgtable.h > @@ -267,8 +267,11 @@ extern void set_pmd_at(struct mm_struct *mm, unsigne= d long addr, pmd_t *pmdp, pm > * Initialize a new pgd / pud / pmd table with invalid pointers. > */ > extern void pgd_init(void *addr); > +#define pud_init pud_init > extern void pud_init(void *addr); > +#define pmd_init pmd_init > extern void pmd_init(void *addr); > +#define kernel_pte_init kernel_pte_init > extern void kernel_pte_init(void *addr); > > /* > diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/p= gtable-64.h > index 401c1d9e4409..45c8572a0462 100644 > --- a/arch/mips/include/asm/pgtable-64.h > +++ b/arch/mips/include/asm/pgtable-64.h > @@ -316,7 +316,9 @@ static inline pmd_t *pud_pgtable(pud_t pud) > * Initialize a new pgd / pud / pmd table with invalid pointers. > */ > extern void pgd_init(void *addr); > +#define pud_init pud_init > extern void pud_init(void *addr); > +#define pmd_init pmd_init > extern void pmd_init(void *addr); > > /* > 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 *altm= ap, > 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 ad= dress) > #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, unsi= gned 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, unsig= ned 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, unsig= ned 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(uns= igned 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, i= nt node) > { > pmd_t *pmd =3D pmd_offset(pud, addr); > @@ -201,10 +197,6 @@ pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, u= nsigned 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, i= nt node) > { > pud_t *pud =3D pud_offset(p4d, addr); > @@ -218,10 +210,6 @@ pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, u= nsigned 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, i= nt node) > { > p4d_t *p4d =3D p4d_offset(pgd, addr); > > base-commit: 81983758430957d9a5cb3333fe324fd70cf63e7e > -- > 2.39.3 >