[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240801184408.00002e8b@Huawei.com>
Date: Thu, 1 Aug 2024 18:44:08 +0100
From: Jonathan Cameron <Jonathan.Cameron@...wei.com>
To: Mike Rapoport <rppt@...nel.org>
CC: <linux-kernel@...r.kernel.org>, Alexander Gordeev
<agordeev@...ux.ibm.com>, Andreas Larsson <andreas@...sler.com>, "Andrew
Morton" <akpm@...ux-foundation.org>, Arnd Bergmann <arnd@...db.de>, "Borislav
Petkov" <bp@...en8.de>, Catalin Marinas <catalin.marinas@....com>, Christophe
Leroy <christophe.leroy@...roup.eu>, Dan Williams <dan.j.williams@...el.com>,
Dave Hansen <dave.hansen@...ux.intel.com>, David Hildenbrand
<david@...hat.com>, "David S. Miller" <davem@...emloft.net>, Davidlohr Bueso
<dave@...olabs.net>, "Greg Kroah-Hartman" <gregkh@...uxfoundation.org>, Heiko
Carstens <hca@...ux.ibm.com>, Huacai Chen <chenhuacai@...nel.org>, Ingo
Molnar <mingo@...hat.com>, Jiaxun Yang <jiaxun.yang@...goat.com>, "John Paul
Adrian Glaubitz" <glaubitz@...sik.fu-berlin.de>, Jonathan Corbet
<corbet@....net>, Michael Ellerman <mpe@...erman.id.au>, Palmer Dabbelt
<palmer@...belt.com>, "Rafael J. Wysocki" <rafael@...nel.org>, Rob Herring
<robh@...nel.org>, Samuel Holland <samuel.holland@...ive.com>, Thomas
Bogendoerfer <tsbogend@...ha.franken.de>, Thomas Gleixner
<tglx@...utronix.de>, "Vasily Gorbik" <gor@...ux.ibm.com>, Will Deacon
<will@...nel.org>, Zi Yan <ziy@...dia.com>, <devicetree@...r.kernel.org>,
<linux-acpi@...r.kernel.org>, <linux-arch@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>, <linux-cxl@...r.kernel.org>,
<linux-doc@...r.kernel.org>, <linux-mips@...r.kernel.org>,
<linux-mm@...ck.org>, <linux-riscv@...ts.infradead.org>,
<linux-s390@...r.kernel.org>, <linux-sh@...r.kernel.org>,
<linuxppc-dev@...ts.ozlabs.org>, <loongarch@...ts.linux.dev>,
<nvdimm@...ts.linux.dev>, <sparclinux@...r.kernel.org>, <x86@...nel.org>
Subject: Re: [PATCH v3 02/26] MIPS: sgi-ip27: make NODE_DATA() the same as
on all other architectures
On Thu, 1 Aug 2024 09:08:02 +0300
Mike Rapoport <rppt@...nel.org> wrote:
> From: "Mike Rapoport (Microsoft)" <rppt@...nel.org>
>
> sgi-ip27 is the only system that defines NODE_DATA() differently than
> the rest of NUMA machines.
>
> Add node_data array of struct pglist pointers that will point to
> __node_data[node]->pglist and redefine NODE_DATA() to use node_data
> array.
>
> This will allow pulling declaration of node_data to the generic mm code
> in the next commit.
>
> Signed-off-by: Mike Rapoport (Microsoft) <rppt@...nel.org>
After staring for a while at the use made of the other part
of the __node_data I think what you have in this an the next
two patches is fine.
I'm far from convinced it was correct before though as
arch_refresh_node_data() called on offline nodes in free_area_init()
would have replaced __node_data with an allocation of
size pg_data_t but the hub_data(), visible below, is after that.
Maybe hub_data() as never called for offline nodes, but
I couldn't establish that.
After these patches the arch_refresh_node_data() generic
version will only be replacing the pointer in node_data
leaving the hub_data where it was in the first place and
thus is fine.
So with that in mind (and it could be completely wrong ;)
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@...wei.com>
> ---
> arch/mips/include/asm/mach-ip27/mmzone.h | 5 ++++-
> arch/mips/sgi-ip27/ip27-memory.c | 5 ++++-
> 2 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/arch/mips/include/asm/mach-ip27/mmzone.h b/arch/mips/include/asm/mach-ip27/mmzone.h
> index 08c36e50a860..629c3f290203 100644
> --- a/arch/mips/include/asm/mach-ip27/mmzone.h
> +++ b/arch/mips/include/asm/mach-ip27/mmzone.h
> @@ -22,7 +22,10 @@ struct node_data {
>
> extern struct node_data *__node_data[];
>
> -#define NODE_DATA(n) (&__node_data[(n)]->pglist)
> #define hub_data(n) (&__node_data[(n)]->hub)
>
> +extern struct pglist_data *node_data[];
> +
> +#define NODE_DATA(nid) (node_data[nid])
> +
> #endif /* _ASM_MACH_MMZONE_H */
> diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
> index b8ca94cfb4fe..c30ef6958b97 100644
> --- a/arch/mips/sgi-ip27/ip27-memory.c
> +++ b/arch/mips/sgi-ip27/ip27-memory.c
> @@ -34,8 +34,10 @@
> #define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT)
> #define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT)
>
> -struct node_data *__node_data[MAX_NUMNODES];
> +struct pglist_data *node_data[MAX_NUMNODES];
> +EXPORT_SYMBOL(node_data);
>
> +struct node_data *__node_data[MAX_NUMNODES];
> EXPORT_SYMBOL(__node_data);
>
> static u64 gen_region_mask(void)
> @@ -361,6 +363,7 @@ static void __init node_mem_init(nasid_t node)
> */
> __node_data[node] = __va(slot_freepfn << PAGE_SHIFT);
> memset(__node_data[node], 0, PAGE_SIZE);
> + node_data[node] = &__node_data[node]->pglist;
>
> NODE_DATA(node)->node_start_pfn = start_pfn;
> NODE_DATA(node)->node_spanned_pages = end_pfn - start_pfn;
Powered by blists - more mailing lists