Re: [PATCH v1 01/11] mm/memory_hotplug: inline __offline_pages() into offline_pages()

From: Michal Hocko
Date: Wed Aug 19 2020 - 08:23:28 EST


On Wed 19-08-20 12:11:47, David Hildenbrand wrote:
> There is only a single user, offline_pages(). Let's inline, to make
> it look more similar to online_pages().
>
> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Cc: Michal Hocko <mhocko@xxxxxxxx>
> Cc: Wei Yang <richard.weiyang@xxxxxxxxxxxxxxxxx>
> Cc: Baoquan He <bhe@xxxxxxxxxx>
> Cc: Pankaj Gupta <pankaj.gupta.linux@xxxxxxxxx>
> Cc: Oscar Salvador <osalvador@xxxxxxx>
> Signed-off-by: David Hildenbrand <david@xxxxxxxxxx>

Acked-by: Michal Hocko <mhocko@xxxxxxxx>

> ---
> mm/memory_hotplug.c | 16 +++++-----------
> 1 file changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
> index 7f62d69660e06..c781d386d87f9 100644
> --- a/mm/memory_hotplug.c
> +++ b/mm/memory_hotplug.c
> @@ -1473,11 +1473,10 @@ static int count_system_ram_pages_cb(unsigned long start_pfn,
> return 0;
> }
>
> -static int __ref __offline_pages(unsigned long start_pfn,
> - unsigned long end_pfn)
> +int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages)
> {
> - unsigned long pfn, nr_pages = 0;
> - unsigned long offlined_pages = 0;
> + const unsigned long end_pfn = start_pfn + nr_pages;
> + unsigned long pfn, system_ram_pages = 0, offlined_pages = 0;
> int ret, node, nr_isolate_pageblock;
> unsigned long flags;
> struct zone *zone;
> @@ -1494,9 +1493,9 @@ static int __ref __offline_pages(unsigned long start_pfn,
> * memory holes PG_reserved, don't need pfn_valid() checks, and can
> * avoid using walk_system_ram_range() later.
> */
> - walk_system_ram_range(start_pfn, end_pfn - start_pfn, &nr_pages,
> + walk_system_ram_range(start_pfn, nr_pages, &system_ram_pages,
> count_system_ram_pages_cb);
> - if (nr_pages != end_pfn - start_pfn) {
> + if (system_ram_pages != nr_pages) {
> ret = -EINVAL;
> reason = "memory holes";
> goto failed_removal;
> @@ -1631,11 +1630,6 @@ static int __ref __offline_pages(unsigned long start_pfn,
> return ret;
> }
>
> -int offline_pages(unsigned long start_pfn, unsigned long nr_pages)
> -{
> - return __offline_pages(start_pfn, start_pfn + nr_pages);
> -}
> -
> static int check_memblock_offlined_cb(struct memory_block *mem, void *arg)
> {
> int ret = !is_memblock_offlined(mem);
> --
> 2.26.2
>

--
Michal Hocko
SUSE Labs