* + mm-define-general-function-pxd_init.patch added to mm-unstable branch
@ 2024-10-14 20:12 Andrew Morton
2024-10-15 2:20 ` Huacai Chen
0 siblings, 1 reply; 7+ messages in thread
From: Andrew Morton @ 2024-10-14 20:12 UTC (permalink / raw)
To: mm-commits, vincenzo.frascino, tsbogend, ryabinin.a.a, kernel,
glider, dvyukov, chenhuacai, andreyknvl, maobibo, akpm
The patch titled
Subject: mm: define general function pXd_init()
has been added to the -mm mm-unstable branch. Its filename is
mm-define-general-function-pxd_init.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-define-general-function-pxd_init.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Bibo Mao <maobibo@loongson.cn>
Subject: mm: define general function pXd_init()
Date: Fri, 11 Oct 2024 17:33:18 +0800
pmd_init() and pud_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.
Link: https://lkml.kernel.org/r/20241011093318.519432-1-maobibo@loongson.cn
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: WANG Xuerui <kernel@xen0n.name>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
arch/loongarch/include/asm/pgtable.h | 2 ++
arch/mips/include/asm/pgtable-64.h | 2 ++
include/linux/mm.h | 2 --
include/linux/pgtable.h | 14 ++++++++++++++
mm/kasan/init.c | 8 --------
mm/sparse-vmemmap.c | 8 --------
6 files changed, 18 insertions(+), 18 deletions(-)
--- a/arch/loongarch/include/asm/pgtable.h~mm-define-general-function-pxd_init
+++ a/arch/loongarch/include/asm/pgtable.h
@@ -267,7 +267,9 @@ extern void set_pmd_at(struct mm_struct
* 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);
/*
--- a/arch/mips/include/asm/pgtable-64.h~mm-define-general-function-pxd_init
+++ a/arch/mips/include/asm/pgtable-64.h
@@ -316,7 +316,9 @@ static inline pmd_t *pud_pgtable(pud_t p
* 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);
/*
--- a/include/linux/mm.h~mm-define-general-function-pxd_init
+++ a/include/linux/mm.h
@@ -3821,8 +3821,6 @@ void *sparse_buffer_alloc(unsigned long
struct page * __populate_section_memmap(unsigned long pfn,
unsigned long nr_pages, int nid, struct vmem_altmap *altmap,
struct dev_pagemap *pgmap);
-void pmd_init(void *addr);
-void pud_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);
--- a/include/linux/pgtable.h~mm-define-general-function-pxd_init
+++ a/include/linux/pgtable.h
@@ -90,6 +90,20 @@ static inline unsigned long pud_index(un
#define pgd_index(a) (((a) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))
#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)
{
--- a/mm/kasan/init.c~mm-define-general-function-pxd_init
+++ a/mm/kasan/init.c
@@ -139,10 +139,6 @@ static int __ref zero_pmd_populate(pud_t
return 0;
}
-void __weak __meminit pmd_init(void *addr)
-{
-}
-
static int __ref zero_pud_populate(p4d_t *p4d, unsigned long addr,
unsigned long end)
{
@@ -181,10 +177,6 @@ static int __ref zero_pud_populate(p4d_t
return 0;
}
-void __weak __meminit pud_init(void *addr)
-{
-}
-
static int __ref zero_p4d_populate(pgd_t *pgd, unsigned long addr,
unsigned long end)
{
--- a/mm/sparse-vmemmap.c~mm-define-general-function-pxd_init
+++ a/mm/sparse-vmemmap.c
@@ -196,10 +196,6 @@ pmd_t * __meminit vmemmap_pmd_populate(p
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);
@@ -213,10 +209,6 @@ pud_t * __meminit vmemmap_pud_populate(p
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);
_
Patches currently in -mm which might be from maobibo@loongson.cn are
mm-define-general-function-pxd_init.patch
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: + mm-define-general-function-pxd_init.patch added to mm-unstable branch
2024-10-14 20:12 + mm-define-general-function-pxd_init.patch added to mm-unstable branch Andrew Morton
@ 2024-10-15 2:20 ` Huacai Chen
2024-10-15 2:59 ` maobibo
0 siblings, 1 reply; 7+ messages in thread
From: Huacai Chen @ 2024-10-15 2:20 UTC (permalink / raw)
To: Andrew Morton
Cc: mm-commits, vincenzo.frascino, tsbogend, ryabinin.a.a, kernel,
glider, dvyukov, andreyknvl, maobibo
Hi, Andrew,
On Tue, Oct 15, 2024 at 4:12 AM Andrew Morton <akpm@linux-foundation.org> wrote:
>
>
> The patch titled
> Subject: mm: define general function pXd_init()
> has been added to the -mm mm-unstable branch. Its filename is
> mm-define-general-function-pxd_init.patch
>
> This patch will shortly appear at
> https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-define-general-function-pxd_init.patch
>
> This patch will later appear in the mm-unstable branch at
> git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
>
> Before you just go and hit "reply", please:
> a) Consider who else should be cc'ed
> b) Prefer to cc a suitable mailing list as well
> c) Ideally: find the original patch on the mailing list and do a
> reply-to-all to that, adding suitable additional cc's
>
> *** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
>
> The -mm tree is included into linux-next via the mm-everything
> branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
> and is updated there every 2-3 working days
>
> ------------------------------------------------------
> From: Bibo Mao <maobibo@loongson.cn>
> Subject: mm: define general function pXd_init()
> Date: Fri, 11 Oct 2024 17:33:18 +0800
>
> pmd_init() and pud_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.
>
> Link: https://lkml.kernel.org/r/20241011093318.519432-1-maobibo@loongson.cn
> Signed-off-by: Bibo Mao <maobibo@loongson.cn>
> Cc: Alexander Potapenko <glider@google.com>
> Cc: Andrey Konovalov <andreyknvl@gmail.com>
> Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
> Cc: Dmitry Vyukov <dvyukov@google.com>
> Cc: Huacai Chen <chenhuacai@kernel.org>
> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
> Cc: WANG Xuerui <kernel@xen0n.name>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
>
> arch/loongarch/include/asm/pgtable.h | 2 ++
> arch/mips/include/asm/pgtable-64.h | 2 ++
> include/linux/mm.h | 2 --
> include/linux/pgtable.h | 14 ++++++++++++++
> mm/kasan/init.c | 8 --------
> mm/sparse-vmemmap.c | 8 --------
> 6 files changed, 18 insertions(+), 18 deletions(-)
>
> --- a/arch/loongarch/include/asm/pgtable.h~mm-define-general-function-pxd_init
> +++ a/arch/loongarch/include/asm/pgtable.h
> @@ -267,7 +267,9 @@ extern void set_pmd_at(struct mm_struct
> * 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);
>
> /*
> --- a/arch/mips/include/asm/pgtable-64.h~mm-define-general-function-pxd_init
> +++ a/arch/mips/include/asm/pgtable-64.h
> @@ -316,7 +316,9 @@ static inline pmd_t *pud_pgtable(pud_t p
> * 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);
>
> /*
> --- a/include/linux/mm.h~mm-define-general-function-pxd_init
> +++ a/include/linux/mm.h
> @@ -3821,8 +3821,6 @@ void *sparse_buffer_alloc(unsigned long
> struct page * __populate_section_memmap(unsigned long pfn,
> unsigned long nr_pages, int nid, struct vmem_altmap *altmap,
> struct dev_pagemap *pgmap);
> -void pmd_init(void *addr);
> -void pud_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);
> --- a/include/linux/pgtable.h~mm-define-general-function-pxd_init
> +++ a/include/linux/pgtable.h
> @@ -90,6 +90,20 @@ static inline unsigned long pud_index(un
> #define pgd_index(a) (((a) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))
> #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
For the fallback implementation, from other examples, it seems we
usually don't need something like "#define pmd_init pmd_init".
Huacai
> +
> #ifndef pte_offset_kernel
> static inline pte_t *pte_offset_kernel(pmd_t *pmd, unsigned long address)
> {
> --- a/mm/kasan/init.c~mm-define-general-function-pxd_init
> +++ a/mm/kasan/init.c
> @@ -139,10 +139,6 @@ static int __ref zero_pmd_populate(pud_t
> return 0;
> }
>
> -void __weak __meminit pmd_init(void *addr)
> -{
> -}
> -
> static int __ref zero_pud_populate(p4d_t *p4d, unsigned long addr,
> unsigned long end)
> {
> @@ -181,10 +177,6 @@ static int __ref zero_pud_populate(p4d_t
> return 0;
> }
>
> -void __weak __meminit pud_init(void *addr)
> -{
> -}
> -
> static int __ref zero_p4d_populate(pgd_t *pgd, unsigned long addr,
> unsigned long end)
> {
> --- a/mm/sparse-vmemmap.c~mm-define-general-function-pxd_init
> +++ a/mm/sparse-vmemmap.c
> @@ -196,10 +196,6 @@ pmd_t * __meminit vmemmap_pmd_populate(p
> 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);
> @@ -213,10 +209,6 @@ pud_t * __meminit vmemmap_pud_populate(p
> 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);
> _
>
> Patches currently in -mm which might be from maobibo@loongson.cn are
>
> mm-define-general-function-pxd_init.patch
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: + mm-define-general-function-pxd_init.patch added to mm-unstable branch
2024-10-15 2:20 ` Huacai Chen
@ 2024-10-15 2:59 ` maobibo
2024-10-18 3:20 ` Huacai Chen
0 siblings, 1 reply; 7+ messages in thread
From: maobibo @ 2024-10-15 2:59 UTC (permalink / raw)
To: Huacai Chen, Andrew Morton
Cc: mm-commits, vincenzo.frascino, tsbogend, ryabinin.a.a, kernel,
glider, dvyukov, andreyknvl
On 2024/10/15 上午10:20, Huacai Chen wrote:
> Hi, Andrew,
>
> On Tue, Oct 15, 2024 at 4:12 AM Andrew Morton <akpm@linux-foundation.org> wrote:
>>
>>
>> The patch titled
>> Subject: mm: define general function pXd_init()
>> has been added to the -mm mm-unstable branch. Its filename is
>> mm-define-general-function-pxd_init.patch
>>
>> This patch will shortly appear at
>> https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-define-general-function-pxd_init.patch
>>
>> This patch will later appear in the mm-unstable branch at
>> git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
>>
>> Before you just go and hit "reply", please:
>> a) Consider who else should be cc'ed
>> b) Prefer to cc a suitable mailing list as well
>> c) Ideally: find the original patch on the mailing list and do a
>> reply-to-all to that, adding suitable additional cc's
>>
>> *** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
>>
>> The -mm tree is included into linux-next via the mm-everything
>> branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
>> and is updated there every 2-3 working days
>>
>> ------------------------------------------------------
>> From: Bibo Mao <maobibo@loongson.cn>
>> Subject: mm: define general function pXd_init()
>> Date: Fri, 11 Oct 2024 17:33:18 +0800
>>
>> pmd_init() and pud_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.
>>
>> Link: https://lkml.kernel.org/r/20241011093318.519432-1-maobibo@loongson.cn
>> Signed-off-by: Bibo Mao <maobibo@loongson.cn>
>> Cc: Alexander Potapenko <glider@google.com>
>> Cc: Andrey Konovalov <andreyknvl@gmail.com>
>> Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
>> Cc: Dmitry Vyukov <dvyukov@google.com>
>> Cc: Huacai Chen <chenhuacai@kernel.org>
>> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
>> Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
>> Cc: WANG Xuerui <kernel@xen0n.name>
>> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>> ---
>>
>> arch/loongarch/include/asm/pgtable.h | 2 ++
>> arch/mips/include/asm/pgtable-64.h | 2 ++
>> include/linux/mm.h | 2 --
>> include/linux/pgtable.h | 14 ++++++++++++++
>> mm/kasan/init.c | 8 --------
>> mm/sparse-vmemmap.c | 8 --------
>> 6 files changed, 18 insertions(+), 18 deletions(-)
>>
>> --- a/arch/loongarch/include/asm/pgtable.h~mm-define-general-function-pxd_init
>> +++ a/arch/loongarch/include/asm/pgtable.h
>> @@ -267,7 +267,9 @@ extern void set_pmd_at(struct mm_struct
>> * 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);
>>
>> /*
>> --- a/arch/mips/include/asm/pgtable-64.h~mm-define-general-function-pxd_init
>> +++ a/arch/mips/include/asm/pgtable-64.h
>> @@ -316,7 +316,9 @@ static inline pmd_t *pud_pgtable(pud_t p
>> * 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);
>>
>> /*
>> --- a/include/linux/mm.h~mm-define-general-function-pxd_init
>> +++ a/include/linux/mm.h
>> @@ -3821,8 +3821,6 @@ void *sparse_buffer_alloc(unsigned long
>> struct page * __populate_section_memmap(unsigned long pfn,
>> unsigned long nr_pages, int nid, struct vmem_altmap *altmap,
>> struct dev_pagemap *pgmap);
>> -void pmd_init(void *addr);
>> -void pud_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);
>> --- a/include/linux/pgtable.h~mm-define-general-function-pxd_init
>> +++ a/include/linux/pgtable.h
>> @@ -90,6 +90,20 @@ static inline unsigned long pud_index(un
>> #define pgd_index(a) (((a) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))
>> #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
> For the fallback implementation, from other examples, it seems we
> usually don't need something like "#define pmd_init pmd_init".
However for some examples it is used actually, such as:
#ifndef pmd_index
static inline unsigned long pmd_index(unsigned long address)
{
return (address >> PMD_SHIFT) & (PTRS_PER_PMD - 1);
}
#define pmd_index pmd_index
#endif
#ifndef pud_index
static inline unsigned long pud_index(unsigned long address)
{
return (address >> PUD_SHIFT) & (PTRS_PER_PUD - 1);
}
#define pud_index pud_index
#endif
Regards
Bibo Mao
>
> Huacai
>
>> +
>> #ifndef pte_offset_kernel
>> static inline pte_t *pte_offset_kernel(pmd_t *pmd, unsigned long address)
>> {
>> --- a/mm/kasan/init.c~mm-define-general-function-pxd_init
>> +++ a/mm/kasan/init.c
>> @@ -139,10 +139,6 @@ static int __ref zero_pmd_populate(pud_t
>> return 0;
>> }
>>
>> -void __weak __meminit pmd_init(void *addr)
>> -{
>> -}
>> -
>> static int __ref zero_pud_populate(p4d_t *p4d, unsigned long addr,
>> unsigned long end)
>> {
>> @@ -181,10 +177,6 @@ static int __ref zero_pud_populate(p4d_t
>> return 0;
>> }
>>
>> -void __weak __meminit pud_init(void *addr)
>> -{
>> -}
>> -
>> static int __ref zero_p4d_populate(pgd_t *pgd, unsigned long addr,
>> unsigned long end)
>> {
>> --- a/mm/sparse-vmemmap.c~mm-define-general-function-pxd_init
>> +++ a/mm/sparse-vmemmap.c
>> @@ -196,10 +196,6 @@ pmd_t * __meminit vmemmap_pmd_populate(p
>> 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);
>> @@ -213,10 +209,6 @@ pud_t * __meminit vmemmap_pud_populate(p
>> 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);
>> _
>>
>> Patches currently in -mm which might be from maobibo@loongson.cn are
>>
>> mm-define-general-function-pxd_init.patch
>>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: + mm-define-general-function-pxd_init.patch added to mm-unstable branch
2024-10-15 2:59 ` maobibo
@ 2024-10-18 3:20 ` Huacai Chen
2024-10-18 3:50 ` maobibo
0 siblings, 1 reply; 7+ messages in thread
From: Huacai Chen @ 2024-10-18 3:20 UTC (permalink / raw)
To: maobibo
Cc: Andrew Morton, mm-commits, vincenzo.frascino, tsbogend,
ryabinin.a.a, kernel, glider, dvyukov, andreyknvl
Hi, Andrew,
Please drop this patch temporary because I applied another Bibo's
patch which causes conflict in linux-next:
https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git/commit/?h=loongarch-next&id=15832255e84494853f543b4c70ced50afc403067
That patch is urgent and should be merged in 6.12 as soon as possible,
while this refactoring patch is in mm-unstable and target for 6.13.
Bibo will update this patch to V2 later. Thanks.
Huacai
On Tue, Oct 15, 2024 at 11:00 AM maobibo <maobibo@loongson.cn> wrote:
>
>
>
> On 2024/10/15 上午10:20, Huacai Chen wrote:
> > Hi, Andrew,
> >
> > On Tue, Oct 15, 2024 at 4:12 AM Andrew Morton <akpm@linux-foundation.org> wrote:
> >>
> >>
> >> The patch titled
> >> Subject: mm: define general function pXd_init()
> >> has been added to the -mm mm-unstable branch. Its filename is
> >> mm-define-general-function-pxd_init.patch
> >>
> >> This patch will shortly appear at
> >> https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-define-general-function-pxd_init.patch
> >>
> >> This patch will later appear in the mm-unstable branch at
> >> git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
> >>
> >> Before you just go and hit "reply", please:
> >> a) Consider who else should be cc'ed
> >> b) Prefer to cc a suitable mailing list as well
> >> c) Ideally: find the original patch on the mailing list and do a
> >> reply-to-all to that, adding suitable additional cc's
> >>
> >> *** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
> >>
> >> The -mm tree is included into linux-next via the mm-everything
> >> branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
> >> and is updated there every 2-3 working days
> >>
> >> ------------------------------------------------------
> >> From: Bibo Mao <maobibo@loongson.cn>
> >> Subject: mm: define general function pXd_init()
> >> Date: Fri, 11 Oct 2024 17:33:18 +0800
> >>
> >> pmd_init() and pud_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.
> >>
> >> Link: https://lkml.kernel.org/r/20241011093318.519432-1-maobibo@loongson.cn
> >> Signed-off-by: Bibo Mao <maobibo@loongson.cn>
> >> Cc: Alexander Potapenko <glider@google.com>
> >> Cc: Andrey Konovalov <andreyknvl@gmail.com>
> >> Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
> >> Cc: Dmitry Vyukov <dvyukov@google.com>
> >> Cc: Huacai Chen <chenhuacai@kernel.org>
> >> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> >> Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
> >> Cc: WANG Xuerui <kernel@xen0n.name>
> >> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> >> ---
> >>
> >> arch/loongarch/include/asm/pgtable.h | 2 ++
> >> arch/mips/include/asm/pgtable-64.h | 2 ++
> >> include/linux/mm.h | 2 --
> >> include/linux/pgtable.h | 14 ++++++++++++++
> >> mm/kasan/init.c | 8 --------
> >> mm/sparse-vmemmap.c | 8 --------
> >> 6 files changed, 18 insertions(+), 18 deletions(-)
> >>
> >> --- a/arch/loongarch/include/asm/pgtable.h~mm-define-general-function-pxd_init
> >> +++ a/arch/loongarch/include/asm/pgtable.h
> >> @@ -267,7 +267,9 @@ extern void set_pmd_at(struct mm_struct
> >> * 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);
> >>
> >> /*
> >> --- a/arch/mips/include/asm/pgtable-64.h~mm-define-general-function-pxd_init
> >> +++ a/arch/mips/include/asm/pgtable-64.h
> >> @@ -316,7 +316,9 @@ static inline pmd_t *pud_pgtable(pud_t p
> >> * 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);
> >>
> >> /*
> >> --- a/include/linux/mm.h~mm-define-general-function-pxd_init
> >> +++ a/include/linux/mm.h
> >> @@ -3821,8 +3821,6 @@ void *sparse_buffer_alloc(unsigned long
> >> struct page * __populate_section_memmap(unsigned long pfn,
> >> unsigned long nr_pages, int nid, struct vmem_altmap *altmap,
> >> struct dev_pagemap *pgmap);
> >> -void pmd_init(void *addr);
> >> -void pud_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);
> >> --- a/include/linux/pgtable.h~mm-define-general-function-pxd_init
> >> +++ a/include/linux/pgtable.h
> >> @@ -90,6 +90,20 @@ static inline unsigned long pud_index(un
> >> #define pgd_index(a) (((a) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))
> >> #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
> > For the fallback implementation, from other examples, it seems we
> > usually don't need something like "#define pmd_init pmd_init".
> However for some examples it is used actually, such as:
>
> #ifndef pmd_index
> static inline unsigned long pmd_index(unsigned long address)
> {
> return (address >> PMD_SHIFT) & (PTRS_PER_PMD - 1);
> }
> #define pmd_index pmd_index
> #endif
>
> #ifndef pud_index
> static inline unsigned long pud_index(unsigned long address)
> {
> return (address >> PUD_SHIFT) & (PTRS_PER_PUD - 1);
> }
> #define pud_index pud_index
> #endif
>
> Regards
> Bibo Mao
> >
> > Huacai
> >
> >> +
> >> #ifndef pte_offset_kernel
> >> static inline pte_t *pte_offset_kernel(pmd_t *pmd, unsigned long address)
> >> {
> >> --- a/mm/kasan/init.c~mm-define-general-function-pxd_init
> >> +++ a/mm/kasan/init.c
> >> @@ -139,10 +139,6 @@ static int __ref zero_pmd_populate(pud_t
> >> return 0;
> >> }
> >>
> >> -void __weak __meminit pmd_init(void *addr)
> >> -{
> >> -}
> >> -
> >> static int __ref zero_pud_populate(p4d_t *p4d, unsigned long addr,
> >> unsigned long end)
> >> {
> >> @@ -181,10 +177,6 @@ static int __ref zero_pud_populate(p4d_t
> >> return 0;
> >> }
> >>
> >> -void __weak __meminit pud_init(void *addr)
> >> -{
> >> -}
> >> -
> >> static int __ref zero_p4d_populate(pgd_t *pgd, unsigned long addr,
> >> unsigned long end)
> >> {
> >> --- a/mm/sparse-vmemmap.c~mm-define-general-function-pxd_init
> >> +++ a/mm/sparse-vmemmap.c
> >> @@ -196,10 +196,6 @@ pmd_t * __meminit vmemmap_pmd_populate(p
> >> 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);
> >> @@ -213,10 +209,6 @@ pud_t * __meminit vmemmap_pud_populate(p
> >> 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);
> >> _
> >>
> >> Patches currently in -mm which might be from maobibo@loongson.cn are
> >>
> >> mm-define-general-function-pxd_init.patch
> >>
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: + mm-define-general-function-pxd_init.patch added to mm-unstable branch
2024-10-18 3:20 ` Huacai Chen
@ 2024-10-18 3:50 ` maobibo
2024-10-18 9:48 ` Huacai Chen
0 siblings, 1 reply; 7+ messages in thread
From: maobibo @ 2024-10-18 3:50 UTC (permalink / raw)
To: Huacai Chen
Cc: Andrew Morton, mm-commits, vincenzo.frascino, tsbogend,
ryabinin.a.a, kernel, glider, dvyukov, andreyknvl
On 2024/10/18 上午11:20, Huacai Chen wrote:
> Hi, Andrew,
>
> Please drop this patch temporary because I applied another Bibo's
> patch which causes conflict in linux-next:
> https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git/commit/?h=loongarch-next&id=15832255e84494853f543b4c70ced50afc403067
>
> That patch is urgent and should be merged in 6.12 as soon as possible,
> while this refactoring patch is in mm-unstable and target for 6.13.
>
> Bibo will update this patch to V2 later. Thanks.
No, it is not urgent since it exists for years. We need know HW details
and give proper solution.
Huacai,
Obviously you do not know LoongArch MM subsystem, I am doubt about your
ability on it. Please hold on until it is verified on more HW platforms.
Regards
Bibo Mao
>
> Huacai
>
> On Tue, Oct 15, 2024 at 11:00 AM maobibo <maobibo@loongson.cn> wrote:
>>
>>
>>
>> On 2024/10/15 上午10:20, Huacai Chen wrote:
>>> Hi, Andrew,
>>>
>>> On Tue, Oct 15, 2024 at 4:12 AM Andrew Morton <akpm@linux-foundation.org> wrote:
>>>>
>>>>
>>>> The patch titled
>>>> Subject: mm: define general function pXd_init()
>>>> has been added to the -mm mm-unstable branch. Its filename is
>>>> mm-define-general-function-pxd_init.patch
>>>>
>>>> This patch will shortly appear at
>>>> https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-define-general-function-pxd_init.patch
>>>>
>>>> This patch will later appear in the mm-unstable branch at
>>>> git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
>>>>
>>>> Before you just go and hit "reply", please:
>>>> a) Consider who else should be cc'ed
>>>> b) Prefer to cc a suitable mailing list as well
>>>> c) Ideally: find the original patch on the mailing list and do a
>>>> reply-to-all to that, adding suitable additional cc's
>>>>
>>>> *** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
>>>>
>>>> The -mm tree is included into linux-next via the mm-everything
>>>> branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
>>>> and is updated there every 2-3 working days
>>>>
>>>> ------------------------------------------------------
>>>> From: Bibo Mao <maobibo@loongson.cn>
>>>> Subject: mm: define general function pXd_init()
>>>> Date: Fri, 11 Oct 2024 17:33:18 +0800
>>>>
>>>> pmd_init() and pud_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.
>>>>
>>>> Link: https://lkml.kernel.org/r/20241011093318.519432-1-maobibo@loongson.cn
>>>> Signed-off-by: Bibo Mao <maobibo@loongson.cn>
>>>> Cc: Alexander Potapenko <glider@google.com>
>>>> Cc: Andrey Konovalov <andreyknvl@gmail.com>
>>>> Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
>>>> Cc: Dmitry Vyukov <dvyukov@google.com>
>>>> Cc: Huacai Chen <chenhuacai@kernel.org>
>>>> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
>>>> Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
>>>> Cc: WANG Xuerui <kernel@xen0n.name>
>>>> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>>>> ---
>>>>
>>>> arch/loongarch/include/asm/pgtable.h | 2 ++
>>>> arch/mips/include/asm/pgtable-64.h | 2 ++
>>>> include/linux/mm.h | 2 --
>>>> include/linux/pgtable.h | 14 ++++++++++++++
>>>> mm/kasan/init.c | 8 --------
>>>> mm/sparse-vmemmap.c | 8 --------
>>>> 6 files changed, 18 insertions(+), 18 deletions(-)
>>>>
>>>> --- a/arch/loongarch/include/asm/pgtable.h~mm-define-general-function-pxd_init
>>>> +++ a/arch/loongarch/include/asm/pgtable.h
>>>> @@ -267,7 +267,9 @@ extern void set_pmd_at(struct mm_struct
>>>> * 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);
>>>>
>>>> /*
>>>> --- a/arch/mips/include/asm/pgtable-64.h~mm-define-general-function-pxd_init
>>>> +++ a/arch/mips/include/asm/pgtable-64.h
>>>> @@ -316,7 +316,9 @@ static inline pmd_t *pud_pgtable(pud_t p
>>>> * 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);
>>>>
>>>> /*
>>>> --- a/include/linux/mm.h~mm-define-general-function-pxd_init
>>>> +++ a/include/linux/mm.h
>>>> @@ -3821,8 +3821,6 @@ void *sparse_buffer_alloc(unsigned long
>>>> struct page * __populate_section_memmap(unsigned long pfn,
>>>> unsigned long nr_pages, int nid, struct vmem_altmap *altmap,
>>>> struct dev_pagemap *pgmap);
>>>> -void pmd_init(void *addr);
>>>> -void pud_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);
>>>> --- a/include/linux/pgtable.h~mm-define-general-function-pxd_init
>>>> +++ a/include/linux/pgtable.h
>>>> @@ -90,6 +90,20 @@ static inline unsigned long pud_index(un
>>>> #define pgd_index(a) (((a) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))
>>>> #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
>>> For the fallback implementation, from other examples, it seems we
>>> usually don't need something like "#define pmd_init pmd_init".
>> However for some examples it is used actually, such as:
>>
>> #ifndef pmd_index
>> static inline unsigned long pmd_index(unsigned long address)
>> {
>> return (address >> PMD_SHIFT) & (PTRS_PER_PMD - 1);
>> }
>> #define pmd_index pmd_index
>> #endif
>>
>> #ifndef pud_index
>> static inline unsigned long pud_index(unsigned long address)
>> {
>> return (address >> PUD_SHIFT) & (PTRS_PER_PUD - 1);
>> }
>> #define pud_index pud_index
>> #endif
>>
>> Regards
>> Bibo Mao
>>>
>>> Huacai
>>>
>>>> +
>>>> #ifndef pte_offset_kernel
>>>> static inline pte_t *pte_offset_kernel(pmd_t *pmd, unsigned long address)
>>>> {
>>>> --- a/mm/kasan/init.c~mm-define-general-function-pxd_init
>>>> +++ a/mm/kasan/init.c
>>>> @@ -139,10 +139,6 @@ static int __ref zero_pmd_populate(pud_t
>>>> return 0;
>>>> }
>>>>
>>>> -void __weak __meminit pmd_init(void *addr)
>>>> -{
>>>> -}
>>>> -
>>>> static int __ref zero_pud_populate(p4d_t *p4d, unsigned long addr,
>>>> unsigned long end)
>>>> {
>>>> @@ -181,10 +177,6 @@ static int __ref zero_pud_populate(p4d_t
>>>> return 0;
>>>> }
>>>>
>>>> -void __weak __meminit pud_init(void *addr)
>>>> -{
>>>> -}
>>>> -
>>>> static int __ref zero_p4d_populate(pgd_t *pgd, unsigned long addr,
>>>> unsigned long end)
>>>> {
>>>> --- a/mm/sparse-vmemmap.c~mm-define-general-function-pxd_init
>>>> +++ a/mm/sparse-vmemmap.c
>>>> @@ -196,10 +196,6 @@ pmd_t * __meminit vmemmap_pmd_populate(p
>>>> 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);
>>>> @@ -213,10 +209,6 @@ pud_t * __meminit vmemmap_pud_populate(p
>>>> 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);
>>>> _
>>>>
>>>> Patches currently in -mm which might be from maobibo@loongson.cn are
>>>>
>>>> mm-define-general-function-pxd_init.patch
>>>>
>>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: + mm-define-general-function-pxd_init.patch added to mm-unstable branch
2024-10-18 3:50 ` maobibo
@ 2024-10-18 9:48 ` Huacai Chen
0 siblings, 0 replies; 7+ messages in thread
From: Huacai Chen @ 2024-10-18 9:48 UTC (permalink / raw)
To: maobibo
Cc: Andrew Morton, mm-commits, vincenzo.frascino, tsbogend,
ryabinin.a.a, kernel, glider, dvyukov, andreyknvl
On Fri, Oct 18, 2024 at 11:50 AM maobibo <maobibo@loongson.cn> wrote:
>
>
>
> On 2024/10/18 上午11:20, Huacai Chen wrote:
> > Hi, Andrew,
> >
> > Please drop this patch temporary because I applied another Bibo's
> > patch which causes conflict in linux-next:
> > https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git/commit/?h=loongarch-next&id=15832255e84494853f543b4c70ced50afc403067
> >
> > That patch is urgent and should be merged in 6.12 as soon as possible,
> > while this refactoring patch is in mm-unstable and target for 6.13.
> >
> > Bibo will update this patch to V2 later. Thanks.
> No, it is not urgent since it exists for years. We need know HW details
> and give proper solution.
It has existed for years but just be found recently. A bug is usually
urgent and should be fixed asap.
>
> Huacai,
>
> Obviously you do not know LoongArch MM subsystem, I am doubt about your
> ability on it. Please hold on until it is verified on more HW platforms.
Of course I can't know everything, but at least I have double checked
every line of a patch. This is why I can find the mistake about KASAN
in your patch but you cannot (though you are the author).
Huacai
>
> Regards
> Bibo Mao
> >
> > Huacai
> >
> > On Tue, Oct 15, 2024 at 11:00 AM maobibo <maobibo@loongson.cn> wrote:
> >>
> >>
> >>
> >> On 2024/10/15 上午10:20, Huacai Chen wrote:
> >>> Hi, Andrew,
> >>>
> >>> On Tue, Oct 15, 2024 at 4:12 AM Andrew Morton <akpm@linux-foundation.org> wrote:
> >>>>
> >>>>
> >>>> The patch titled
> >>>> Subject: mm: define general function pXd_init()
> >>>> has been added to the -mm mm-unstable branch. Its filename is
> >>>> mm-define-general-function-pxd_init.patch
> >>>>
> >>>> This patch will shortly appear at
> >>>> https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-define-general-function-pxd_init.patch
> >>>>
> >>>> This patch will later appear in the mm-unstable branch at
> >>>> git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
> >>>>
> >>>> Before you just go and hit "reply", please:
> >>>> a) Consider who else should be cc'ed
> >>>> b) Prefer to cc a suitable mailing list as well
> >>>> c) Ideally: find the original patch on the mailing list and do a
> >>>> reply-to-all to that, adding suitable additional cc's
> >>>>
> >>>> *** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
> >>>>
> >>>> The -mm tree is included into linux-next via the mm-everything
> >>>> branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
> >>>> and is updated there every 2-3 working days
> >>>>
> >>>> ------------------------------------------------------
> >>>> From: Bibo Mao <maobibo@loongson.cn>
> >>>> Subject: mm: define general function pXd_init()
> >>>> Date: Fri, 11 Oct 2024 17:33:18 +0800
> >>>>
> >>>> pmd_init() and pud_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.
> >>>>
> >>>> Link: https://lkml.kernel.org/r/20241011093318.519432-1-maobibo@loongson.cn
> >>>> Signed-off-by: Bibo Mao <maobibo@loongson.cn>
> >>>> Cc: Alexander Potapenko <glider@google.com>
> >>>> Cc: Andrey Konovalov <andreyknvl@gmail.com>
> >>>> Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
> >>>> Cc: Dmitry Vyukov <dvyukov@google.com>
> >>>> Cc: Huacai Chen <chenhuacai@kernel.org>
> >>>> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> >>>> Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
> >>>> Cc: WANG Xuerui <kernel@xen0n.name>
> >>>> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> >>>> ---
> >>>>
> >>>> arch/loongarch/include/asm/pgtable.h | 2 ++
> >>>> arch/mips/include/asm/pgtable-64.h | 2 ++
> >>>> include/linux/mm.h | 2 --
> >>>> include/linux/pgtable.h | 14 ++++++++++++++
> >>>> mm/kasan/init.c | 8 --------
> >>>> mm/sparse-vmemmap.c | 8 --------
> >>>> 6 files changed, 18 insertions(+), 18 deletions(-)
> >>>>
> >>>> --- a/arch/loongarch/include/asm/pgtable.h~mm-define-general-function-pxd_init
> >>>> +++ a/arch/loongarch/include/asm/pgtable.h
> >>>> @@ -267,7 +267,9 @@ extern void set_pmd_at(struct mm_struct
> >>>> * 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);
> >>>>
> >>>> /*
> >>>> --- a/arch/mips/include/asm/pgtable-64.h~mm-define-general-function-pxd_init
> >>>> +++ a/arch/mips/include/asm/pgtable-64.h
> >>>> @@ -316,7 +316,9 @@ static inline pmd_t *pud_pgtable(pud_t p
> >>>> * 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);
> >>>>
> >>>> /*
> >>>> --- a/include/linux/mm.h~mm-define-general-function-pxd_init
> >>>> +++ a/include/linux/mm.h
> >>>> @@ -3821,8 +3821,6 @@ void *sparse_buffer_alloc(unsigned long
> >>>> struct page * __populate_section_memmap(unsigned long pfn,
> >>>> unsigned long nr_pages, int nid, struct vmem_altmap *altmap,
> >>>> struct dev_pagemap *pgmap);
> >>>> -void pmd_init(void *addr);
> >>>> -void pud_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);
> >>>> --- a/include/linux/pgtable.h~mm-define-general-function-pxd_init
> >>>> +++ a/include/linux/pgtable.h
> >>>> @@ -90,6 +90,20 @@ static inline unsigned long pud_index(un
> >>>> #define pgd_index(a) (((a) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))
> >>>> #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
> >>> For the fallback implementation, from other examples, it seems we
> >>> usually don't need something like "#define pmd_init pmd_init".
> >> However for some examples it is used actually, such as:
> >>
> >> #ifndef pmd_index
> >> static inline unsigned long pmd_index(unsigned long address)
> >> {
> >> return (address >> PMD_SHIFT) & (PTRS_PER_PMD - 1);
> >> }
> >> #define pmd_index pmd_index
> >> #endif
> >>
> >> #ifndef pud_index
> >> static inline unsigned long pud_index(unsigned long address)
> >> {
> >> return (address >> PUD_SHIFT) & (PTRS_PER_PUD - 1);
> >> }
> >> #define pud_index pud_index
> >> #endif
> >>
> >> Regards
> >> Bibo Mao
> >>>
> >>> Huacai
> >>>
> >>>> +
> >>>> #ifndef pte_offset_kernel
> >>>> static inline pte_t *pte_offset_kernel(pmd_t *pmd, unsigned long address)
> >>>> {
> >>>> --- a/mm/kasan/init.c~mm-define-general-function-pxd_init
> >>>> +++ a/mm/kasan/init.c
> >>>> @@ -139,10 +139,6 @@ static int __ref zero_pmd_populate(pud_t
> >>>> return 0;
> >>>> }
> >>>>
> >>>> -void __weak __meminit pmd_init(void *addr)
> >>>> -{
> >>>> -}
> >>>> -
> >>>> static int __ref zero_pud_populate(p4d_t *p4d, unsigned long addr,
> >>>> unsigned long end)
> >>>> {
> >>>> @@ -181,10 +177,6 @@ static int __ref zero_pud_populate(p4d_t
> >>>> return 0;
> >>>> }
> >>>>
> >>>> -void __weak __meminit pud_init(void *addr)
> >>>> -{
> >>>> -}
> >>>> -
> >>>> static int __ref zero_p4d_populate(pgd_t *pgd, unsigned long addr,
> >>>> unsigned long end)
> >>>> {
> >>>> --- a/mm/sparse-vmemmap.c~mm-define-general-function-pxd_init
> >>>> +++ a/mm/sparse-vmemmap.c
> >>>> @@ -196,10 +196,6 @@ pmd_t * __meminit vmemmap_pmd_populate(p
> >>>> 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);
> >>>> @@ -213,10 +209,6 @@ pud_t * __meminit vmemmap_pud_populate(p
> >>>> 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);
> >>>> _
> >>>>
> >>>> Patches currently in -mm which might be from maobibo@loongson.cn are
> >>>>
> >>>> mm-define-general-function-pxd_init.patch
> >>>>
> >>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* + mm-define-general-function-pxd_init.patch added to mm-unstable branch
@ 2024-11-05 3:03 Andrew Morton
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Morton @ 2024-11-05 3:03 UTC (permalink / raw)
To: mm-commits, vincenzo.frascino, tsbogend, ryabinin.a.a, kernel,
glider, dvyukov, chenhuacai, andreyknvl, maobibo, akpm
The patch titled
Subject: mm: define general function pXd_init()
has been added to the -mm mm-unstable branch. Its filename is
mm-define-general-function-pxd_init.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-define-general-function-pxd_init.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Bibo Mao <maobibo@loongson.cn>
Subject: mm: define general function pXd_init()
Date: Mon, 4 Nov 2024 15:07:12 +0800
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.
Link: https://lkml.kernel.org/r/20241104070712.52902-1-maobibo@loongson.cn
Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Huacai Chen <chenhuacai@loongson.cn>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: WANG Xuerui <kernel@xen0n.name>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
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(-)
--- a/arch/loongarch/include/asm/pgtable.h~mm-define-general-function-pxd_init
+++ a/arch/loongarch/include/asm/pgtable.h
@@ -268,8 +268,11 @@ extern void set_pmd_at(struct mm_struct
*/
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
--- a/arch/mips/include/asm/pgtable-64.h~mm-define-general-function-pxd_init
+++ a/arch/mips/include/asm/pgtable-64.h
@@ -317,7 +317,9 @@ static inline pmd_t *pud_pgtable(pud_t p
*/
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
--- a/include/linux/mm.h~mm-define-general-function-pxd_init
+++ a/include/linux/mm.h
@@ -3819,9 +3819,6 @@ void *sparse_buffer_alloc(unsigned long
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);
--- a/include/linux/pgtable.h~mm-define-general-function-pxd_init
+++ a/include/linux/pgtable.h
@@ -90,6 +90,27 @@ static inline unsigned long pud_index(un
#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)
{
--- a/mm/kasan/init.c~mm-define-general-function-pxd_init
+++ a/mm/kasan/init.c
@@ -106,10 +106,6 @@ static void __ref zero_pte_populate(pmd_
}
}
-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
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
return 0;
}
-void __weak __meminit pud_init(void *addr)
-{
-}
-
static int __ref zero_p4d_populate(pgd_t *pgd, unsigned long addr,
unsigned long end)
{
--- a/mm/sparse-vmemmap.c~mm-define-general-function-pxd_init
+++ a/mm/sparse-vmemmap.c
@@ -184,10 +184,6 @@ static void * __meminit vmemmap_alloc_bl
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(p
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(p
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);
_
Patches currently in -mm which might be from maobibo@loongson.cn are
mm-define-general-function-pxd_init.patch
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-11-05 3:03 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-14 20:12 + mm-define-general-function-pxd_init.patch added to mm-unstable branch Andrew Morton
2024-10-15 2:20 ` Huacai Chen
2024-10-15 2:59 ` maobibo
2024-10-18 3:20 ` Huacai Chen
2024-10-18 3:50 ` maobibo
2024-10-18 9:48 ` Huacai Chen
-- strict thread matches above, loose matches on Subject: below --
2024-11-05 3:03 Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.