2023-05-28 06:28:29

by Haifeng Xu

Subject: [PATCH] mm/mm_init.c: remove free_area_init_memoryless_node()

free_area_init_memoryless_node() is just a wrapper of
free_area_init_node(), remove it to clean up.

Signed-off-by: Haifeng Xu <[email protected]>
---
mm/mm_init.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/mm/mm_init.c b/mm/mm_init.c
index 2d91bb52c619..93821824271a 100644
--- a/mm/mm_init.c
+++ b/mm/mm_init.c
@@ -1752,11 +1752,6 @@ void __init setup_nr_node_ids(void)
}
#endif

-static void __init free_area_init_memoryless_node(int nid)
-{
- free_area_init_node(nid);
-}
-
/*
* Some architectures, e.g. ARC may have ZONE_HIGHMEM below ZONE_NORMAL. For
* such cases we allow max_zone_pfn sorted in the descending order
@@ -1867,7 +1862,7 @@ void __init free_area_init(unsigned long *max_zone_pfn)
panic("Cannot allocate %zuB for node %d.\n",
sizeof(*pgdat), nid);
arch_refresh_nodedata(nid, pgdat);
- free_area_init_memoryless_node(nid);
+ free_area_init_node(nid);

/*
* We do not want to confuse userspace by sysfs
--
2.25.1

2023-05-29 09:23:07

by Mike Rapoport

Subject: Re: [PATCH] mm/mm_init.c: remove free_area_init_memoryless_node()

(added Michal)

On Sun, May 28, 2023 at 04:57:20AM +0000, Haifeng Xu wrote:
> free_area_init_memoryless_node() is just a wrapper of
> free_area_init_node(), remove it to clean up.
>
> Signed-off-by: Haifeng Xu <[email protected]>
> ---
> mm/mm_init.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/mm/mm_init.c b/mm/mm_init.c
> index 2d91bb52c619..93821824271a 100644
> --- a/mm/mm_init.c
> +++ b/mm/mm_init.c
> @@ -1752,11 +1752,6 @@ void __init setup_nr_node_ids(void)
> }
> #endif
>
> -static void __init free_area_init_memoryless_node(int nid)
> -{
> - free_area_init_node(nid);
> -}
> -
> /*
> * Some architectures, e.g. ARC may have ZONE_HIGHMEM below ZONE_NORMAL. For
> * such cases we allow max_zone_pfn sorted in the descending order
> @@ -1867,7 +1862,7 @@ void __init free_area_init(unsigned long *max_zone_pfn)
> panic("Cannot allocate %zuB for node %d.\n",
> sizeof(*pgdat), nid);
> arch_refresh_nodedata(nid, pgdat);
> - free_area_init_memoryless_node(nid);
> + free_area_init_node(nid);

Using a dedicated free_area_init_memoryless_node() wrapper here emphasizes
that the node has no memory, but I don't have a strong feeling about
keeping it.

>
> /*
> * We do not want to confuse userspace by sysfs
> --
> 2.25.1
>

--
Sincerely yours,
Mike.

2023-05-29 12:09:58

by Michal Hocko

Subject: Re: [PATCH] mm/mm_init.c: remove free_area_init_memoryless_node()

On Mon 29-05-23 12:04:46, Mike Rapoport wrote:
> (added Michal)
>
> On Sun, May 28, 2023 at 04:57:20AM +0000, Haifeng Xu wrote:
> > free_area_init_memoryless_node() is just a wrapper of
> > free_area_init_node(), remove it to clean up.
> >
> > Signed-off-by: Haifeng Xu <[email protected]>
> > ---
> > mm/mm_init.c | 7 +------
> > 1 file changed, 1 insertion(+), 6 deletions(-)
> >
> > diff --git a/mm/mm_init.c b/mm/mm_init.c
> > index 2d91bb52c619..93821824271a 100644
> > --- a/mm/mm_init.c
> > +++ b/mm/mm_init.c
> > @@ -1752,11 +1752,6 @@ void __init setup_nr_node_ids(void)
> > }
> > #endif
> >
> > -static void __init free_area_init_memoryless_node(int nid)
> > -{
> > - free_area_init_node(nid);
> > -}
> > -
> > /*
> > * Some architectures, e.g. ARC may have ZONE_HIGHMEM below ZONE_NORMAL. For
> > * such cases we allow max_zone_pfn sorted in the descending order
> > @@ -1867,7 +1862,7 @@ void __init free_area_init(unsigned long *max_zone_pfn)
> > panic("Cannot allocate %zuB for node %d.\n",
> > sizeof(*pgdat), nid);
> > arch_refresh_nodedata(nid, pgdat);
> > - free_area_init_memoryless_node(nid);
> > + free_area_init_node(nid);
>
> Using a dedicated free_area_init_memoryless_node() wrapper here emphasizes
> that the node has no memory, but I don't have a strong feeling about
> keeping it.

Honestly, I do not think it has any added value anymore. Some time ago
it was a list of special parameters and aliasing that made some sense at
least. Maybe that could be carved into the changelog in some form.

Acked-by: Michal Hocko <[email protected]>

>
> >
> > /*
> > * We do not want to confuse userspace by sysfs
> > --
> > 2.25.1
> >
>
> --
> Sincerely yours,
> Mike.

--
Michal Hocko
SUSE Labs