Re: [PATCH v3 11/14] xen/asm-generic: introduce stub header numa.h

[Oleksii <oleksii.kurochko@xxxxxxxxx>]

Hello Michal,

On Fri, 2023-11-24 at 14:03 +0100, Michal Orzel wrote:
> 
> On 17/11/2023 13:24, Oleksii Kurochko wrote:
> > 
> > 
> > <asm/numa.h> is common through some archs so it is moved
> > to asm-generic.
> > 
> > Signed-off-by: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
> > ---
> > Changes in V3:
> >  - Remove old header inclusion in asm-generic numa.h and include
> >    <xen/mm-frame.h> and <xen/stdint.h>
> >  - Drop Arm and PPC's numa.h and use asm-generic version instead.
> > ---
> > Changes in V2:
> >         - update the commit message.
> >         - change u8 to uint8_t.
> >         - add ifnded CONFIG_NUMA.
> > ---
> >  xen/arch/arm/include/asm/Makefile             |  1 +
> >  xen/arch/ppc/include/asm/Makefile             |  1 +
> >  xen/arch/ppc/include/asm/numa.h               | 26 ---------------
> > ----
> >  .../asm => include/asm-generic}/numa.h        | 13 ++++++----
> >  4 files changed, 10 insertions(+), 31 deletions(-)
> >  delete mode 100644 xen/arch/ppc/include/asm/numa.h
> >  rename xen/{arch/arm/include/asm => include/asm-generic}/numa.h
> > (75%)
> > 
> > diff --git a/xen/arch/arm/include/asm/Makefile
> > b/xen/arch/arm/include/asm/Makefile
> > index 8221429c2c..0c855a798a 100644
> > --- a/xen/arch/arm/include/asm/Makefile
> > +++ b/xen/arch/arm/include/asm/Makefile
> > @@ -2,6 +2,7 @@
> >  generic-y += altp2m.h
> >  generic-y += hardirq.h
> >  generic-y += iocap.h
> > +generic-y += numa.h
> >  generic-y += paging.h
> >  generic-y += percpu.h
> >  generic-y += random.h
> > diff --git a/xen/arch/ppc/include/asm/Makefile
> > b/xen/arch/ppc/include/asm/Makefile
> > index 9bbae4cec8..d5a94bc718 100644
> > --- a/xen/arch/ppc/include/asm/Makefile
> > +++ b/xen/arch/ppc/include/asm/Makefile
> > @@ -5,6 +5,7 @@ generic-y += hardirq.h
> >  generic-y += hypercall.h
> >  generic-y += iocap.h
> >  generic-y += monitor.h
> > +generic-y += numa.h
> >  generic-y += paging.h
> >  generic-y += percpu.h
> >  generic-y += random.h
> > diff --git a/xen/arch/ppc/include/asm/numa.h
> > b/xen/arch/ppc/include/asm/numa.h
> > deleted file mode 100644
> > index 7fdf66c3da..0000000000
> > --- a/xen/arch/ppc/include/asm/numa.h
> > +++ /dev/null
> > @@ -1,26 +0,0 @@
> > -#ifndef __ASM_PPC_NUMA_H__
> > -#define __ASM_PPC_NUMA_H__
> > -
> > -#include <xen/types.h>
> > -#include <xen/mm.h>
> > -
> > -typedef uint8_t nodeid_t;
> > -
> > -/* Fake one node for now. See also node_online_map. */
> > -#define cpu_to_node(cpu) 0
> > -#define node_to_cpumask(node)   (cpu_online_map)
> > -
> > -/*
> > - * TODO: make first_valid_mfn static when NUMA is supported on
> > PPC, this
> > - * is required because the dummy helpers are using it.
> > - */
> > -extern mfn_t first_valid_mfn;
> > -
> > -/* XXX: implement NUMA support */
> > -#define node_spanned_pages(nid) (max_page -
> > mfn_x(first_valid_mfn))
> > -#define node_start_pfn(nid) (mfn_x(first_valid_mfn))
> > -#define __node_distance(a, b) (20)
> > -
> > -#define arch_want_default_dmazone() (false)
> > -
> > -#endif /* __ASM_PPC_NUMA_H__ */
> > diff --git a/xen/arch/arm/include/asm/numa.h b/xen/include/asm-
> > generic/numa.h
> > similarity index 75%
> > rename from xen/arch/arm/include/asm/numa.h
> > rename to xen/include/asm-generic/numa.h
> > index e2bee2bd82..c5b522dee8 100644
> > --- a/xen/arch/arm/include/asm/numa.h
> > +++ b/xen/include/asm-generic/numa.h
> > @@ -1,9 +1,11 @@
> > -#ifndef __ARCH_ARM_NUMA_H
> > -#define __ARCH_ARM_NUMA_H
> > +/* SPDX-License-Identifier: GPL-2.0-only */
> > +#ifndef __ARCH_GENERIC_NUMA_H
> > +#define __ARCH_GENERIC_NUMA_H
> ASM_GENERIC ?
Thanks. I'll rename the guard.
> 
> > 
> > -#include <xen/mm.h>
> > +#include <xen/mm-frame.h>
> If this is for mfn_t, shouldn't this inclusion be moved under #ifndef
> ?
It would be better. I'll update that in the next patch series.

> 
> Apart from that:
> Reviewed-by: Michal Orzel <michal.orzel@xxxxxxx>


~ Oleksii