From: YASUAKI ISHIMATSU <yasu.isimatu@gmail.com>
To: Michal Hocko <mhocko@kernel.org>, linux-mm@kvack.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Mel Gorman <mgorman@suse.de>, Vlastimil Babka <vbabka@suse.cz>,
Andrea Arcangeli <aarcange@redhat.com>,
Jerome Glisse <jglisse@redhat.com>,
Reza Arbab <arbab@linux.vnet.ibm.com>,
qiuxishi@huawei.com, Kani Toshimitsu <toshi.kani@hpe.com>,
slaoub@gmail.com, Joonsoo Kim <js1304@gmail.com>,
Andi Kleen <ak@linux.intel.com>,
David Rientjes <rientjes@google.com>,
Daniel Kiper <daniel.kiper@oracle.com>,
Igor Mammedov <imammedo@redhat.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
LKML <linux-kernel@vger.kernel.org>,
Michal Hocko <mhocko@suse.com>
Subject: Re: [PATCH 1/9] mm: remove return value from init_currently_empty_zone
Date: Thu, 13 Apr 2017 15:43:36 -0400 [thread overview]
Message-ID: <4207028e-e91b-6294-d5b7-ae3e65f5e286@gmail.com> (raw)
In-Reply-To: <20170410110351.12215-2-mhocko@kernel.org>
On 04/10/2017 07:03 AM, Michal Hocko wrote:
> From: Michal Hocko <mhocko@suse.com>
>
> init_currently_empty_zone doesn't have any error to return yet it is
> still an int and callers try to be defensive and try to handle potential
> error. Remove this nonsense and simplify all callers.
>
> This patch shouldn't have any visible effect
>
> Signed-off-by: Michal Hocko <mhocko@suse.com>
> ---
Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Thanks,
Yasuaki Ishimatsu
> include/linux/mmzone.h | 2 +-
> mm/memory_hotplug.c | 23 +++++------------------
> mm/page_alloc.c | 8 ++------
> 3 files changed, 8 insertions(+), 25 deletions(-)
>
> diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
> index ebaccd4e7d8c..0fc121bbf4ff 100644
> --- a/include/linux/mmzone.h
> +++ b/include/linux/mmzone.h
> @@ -771,7 +771,7 @@ enum memmap_context {
> MEMMAP_EARLY,
> MEMMAP_HOTPLUG,
> };
> -extern int init_currently_empty_zone(struct zone *zone, unsigned long start_pfn,
> +extern void init_currently_empty_zone(struct zone *zone, unsigned long start_pfn,
> unsigned long size);
>
> extern void lruvec_init(struct lruvec *lruvec);
> diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
> index 257166ebdff0..9ed251811ec3 100644
> --- a/mm/memory_hotplug.c
> +++ b/mm/memory_hotplug.c
> @@ -347,27 +347,20 @@ static void fix_zone_id(struct zone *zone, unsigned long start_pfn,
> set_page_links(pfn_to_page(pfn), zid, nid, pfn);
> }
>
> -/* Can fail with -ENOMEM from allocating a wait table with vmalloc() or
> - * alloc_bootmem_node_nopanic()/memblock_virt_alloc_node_nopanic() */
> -static int __ref ensure_zone_is_initialized(struct zone *zone,
> +static void __ref ensure_zone_is_initialized(struct zone *zone,
> unsigned long start_pfn, unsigned long num_pages)
> {
> if (!zone_is_initialized(zone))
> - return init_currently_empty_zone(zone, start_pfn, num_pages);
> -
> - return 0;
> + init_currently_empty_zone(zone, start_pfn, num_pages);
> }
>
> static int __meminit move_pfn_range_left(struct zone *z1, struct zone *z2,
> unsigned long start_pfn, unsigned long end_pfn)
> {
> - int ret;
> unsigned long flags;
> unsigned long z1_start_pfn;
>
> - ret = ensure_zone_is_initialized(z1, start_pfn, end_pfn - start_pfn);
> - if (ret)
> - return ret;
> + ensure_zone_is_initialized(z1, start_pfn, end_pfn - start_pfn);
>
> pgdat_resize_lock(z1->zone_pgdat, &flags);
>
> @@ -403,13 +396,10 @@ static int __meminit move_pfn_range_left(struct zone *z1, struct zone *z2,
> static int __meminit move_pfn_range_right(struct zone *z1, struct zone *z2,
> unsigned long start_pfn, unsigned long end_pfn)
> {
> - int ret;
> unsigned long flags;
> unsigned long z2_end_pfn;
>
> - ret = ensure_zone_is_initialized(z2, start_pfn, end_pfn - start_pfn);
> - if (ret)
> - return ret;
> + ensure_zone_is_initialized(z2, start_pfn, end_pfn - start_pfn);
>
> pgdat_resize_lock(z1->zone_pgdat, &flags);
>
> @@ -480,12 +470,9 @@ static int __meminit __add_zone(struct zone *zone, unsigned long phys_start_pfn)
> int nid = pgdat->node_id;
> int zone_type;
> unsigned long flags, pfn;
> - int ret;
>
> zone_type = zone - pgdat->node_zones;
> - ret = ensure_zone_is_initialized(zone, phys_start_pfn, nr_pages);
> - if (ret)
> - return ret;
> + ensure_zone_is_initialized(zone, phys_start_pfn, nr_pages);
>
> pgdat_resize_lock(zone->zone_pgdat, &flags);
> grow_zone_span(zone, phys_start_pfn, phys_start_pfn + nr_pages);
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index 9c587000d408..0cacba69ab04 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
> @@ -5517,7 +5517,7 @@ static __meminit void zone_pcp_init(struct zone *zone)
> zone_batchsize(zone));
> }
>
> -int __meminit init_currently_empty_zone(struct zone *zone,
> +void __meminit init_currently_empty_zone(struct zone *zone,
> unsigned long zone_start_pfn,
> unsigned long size)
> {
> @@ -5535,8 +5535,6 @@ int __meminit init_currently_empty_zone(struct zone *zone,
>
> zone_init_free_lists(zone);
> zone->initialized = 1;
> -
> - return 0;
> }
>
> #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
> @@ -5999,7 +5997,6 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat)
> {
> enum zone_type j;
> int nid = pgdat->node_id;
> - int ret;
>
> pgdat_resize_init(pgdat);
> #ifdef CONFIG_NUMA_BALANCING
> @@ -6081,8 +6078,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat)
>
> set_pageblock_order();
> setup_usemap(pgdat, zone, zone_start_pfn, size);
> - ret = init_currently_empty_zone(zone, zone_start_pfn, size);
> - BUG_ON(ret);
> + init_currently_empty_zone(zone, zone_start_pfn, size);
> memmap_init(size, nid, j, zone_start_pfn);
> }
> }
>
next prev parent reply other threads:[~2017-04-13 19:43 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-10 11:03 [PATCH -v2 0/9] mm: make movable onlining suck less Michal Hocko
2017-04-10 11:03 ` [PATCH 1/9] mm: remove return value from init_currently_empty_zone Michal Hocko
2017-04-11 8:10 ` Balbir Singh
2017-04-13 12:03 ` Vlastimil Babka
2017-04-13 19:43 ` YASUAKI ISHIMATSU [this message]
2017-04-10 11:03 ` [PATCH 2/9] mm, memory_hotplug: use node instead of zone in can_online_high_movable Michal Hocko
2017-04-13 12:46 ` Vlastimil Babka
2017-04-13 19:45 ` YASUAKI ISHIMATSU
2017-04-10 11:03 ` [PATCH 3/9] mm: drop page_initialized check from get_nid_for_pfn Michal Hocko
2017-04-13 12:59 ` Vlastimil Babka
2017-04-10 11:03 ` [PATCH 4/9] mm, memory_hotplug: get rid of is_zone_device_section Michal Hocko
2017-04-10 16:20 ` Jerome Glisse
2017-04-10 16:31 ` Michal Hocko
2017-04-13 13:05 ` Vlastimil Babka
2017-04-17 20:12 ` Jerome Glisse
2017-04-18 7:19 ` Michal Hocko
2017-04-10 11:03 ` [PATCH 5/9] mm, memory_hotplug: split up register_one_node Michal Hocko
2017-04-13 14:05 ` Vlastimil Babka
2017-04-13 14:13 ` Michal Hocko
2017-04-10 11:03 ` [PATCH 6/9] mm, memory_hotplug: do not associate hotadded memory to zones until online Michal Hocko
2017-04-10 16:25 ` [PATCH v3 " Michal Hocko
2017-04-20 8:25 ` Vlastimil Babka
2017-04-20 9:06 ` Michal Hocko
2017-04-20 10:51 ` Vlastimil Babka
2017-04-10 11:03 ` [PATCH 7/9] mm, memory_hotplug: replace for_device by want_memblock in arch_add_memory Michal Hocko
2017-04-20 8:29 ` Vlastimil Babka
2017-04-10 11:03 ` [PATCH 8/9] mm, memory_hotplug: fix the section mismatch warning Michal Hocko
2017-04-10 11:03 ` [PATCH 9/9] mm, memory_hotplug: remove unused cruft after memory hotplug rework Michal Hocko
2017-04-20 8:38 ` Vlastimil Babka
2017-04-10 14:27 ` [PATCH -v2 0/9] mm: make movable onlining suck less Igor Mammedov
2017-04-10 14:56 ` Michal Hocko
2017-04-10 15:22 ` Michal Hocko
2017-04-10 15:31 ` Michal Hocko
2017-04-11 8:01 ` Igor Mammedov
2017-04-11 8:41 ` Michal Hocko
2017-04-11 9:53 ` Igor Mammedov
2017-04-11 10:47 ` Michal Hocko
2017-04-10 16:02 ` Michal Hocko
2017-04-18 8:23 ` Vlastimil Babka
2017-04-10 16:09 ` Michal Hocko
2017-04-11 6:38 ` Igor Mammedov
2017-04-11 9:23 ` Michal Hocko
2017-04-11 9:59 ` Igor Mammedov
2017-04-11 11:01 ` Michal Hocko
2017-04-11 11:38 ` Michal Hocko
2017-04-11 12:38 ` Michal Hocko
2017-04-10 15:43 ` Reza Arbab
2017-04-11 8:59 ` Michal Hocko
2017-04-10 16:35 ` Jerome Glisse
2017-04-10 17:53 ` Michal Hocko
2017-04-11 2:51 ` Balbir Singh
2017-04-11 17:03 ` Michal Hocko
2017-04-17 21:51 ` Dan Williams
2017-04-18 7:14 ` Michal Hocko
2017-04-18 16:42 ` Dan Williams
2017-04-18 19:54 ` Michal Hocko
2017-04-20 3:37 ` Dan Williams
2017-04-15 12:17 ` Michal Hocko
2017-04-15 12:17 ` [PATCH 1/3] mm: consider zone which is not fully populated to have holes Michal Hocko
2017-04-18 8:45 ` Vlastimil Babka
2017-04-18 9:27 ` Michal Hocko
2017-04-19 11:59 ` Vlastimil Babka
2017-04-19 12:16 ` Michal Hocko
2017-04-19 12:34 ` Vlastimil Babka
2017-04-19 12:50 ` Michal Hocko
2017-04-15 12:17 ` [PATCH 2/3] mm, compaction: skip over holes in __reset_isolation_suitable Michal Hocko
2017-04-15 12:17 ` [PATCH 3/3] mm: __first_valid_page skip over offline pages Michal Hocko
2017-04-17 5:47 ` your mail Joonsoo Kim
2017-04-17 8:15 ` Michal Hocko
2017-04-20 1:27 ` Joonsoo Kim
2017-04-20 7:28 ` Michal Hocko
2017-04-20 8:49 ` Michal Hocko
2017-04-20 11:56 ` Vlastimil Babka
2017-04-20 12:13 ` Michal Hocko
2017-04-21 2:46 ` [lkp-robot] 73821bb516: WARNING:at_mm/memblock.c:#memblock_virt_alloc_internal kernel test robot
2017-04-21 8:05 ` Michal Hocko
2017-04-21 4:38 ` your mail Joonsoo Kim
2017-04-21 7:16 ` Michal Hocko
2017-04-24 1:44 ` Joonsoo Kim
2017-04-24 7:53 ` Michal Hocko
2017-04-25 2:50 ` Joonsoo Kim
2017-04-26 9:19 ` Michal Hocko
2017-04-27 2:08 ` Joonsoo Kim
2017-04-27 15:10 ` Michal Hocko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4207028e-e91b-6294-d5b7-ae3e65f5e286@gmail.com \
--to=yasu.isimatu@gmail.com \
--cc=aarcange@redhat.com \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=arbab@linux.vnet.ibm.com \
--cc=daniel.kiper@oracle.com \
--cc=imammedo@redhat.com \
--cc=jglisse@redhat.com \
--cc=js1304@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=mhocko@kernel.org \
--cc=mhocko@suse.com \
--cc=qiuxishi@huawei.com \
--cc=rientjes@google.com \
--cc=slaoub@gmail.com \
--cc=toshi.kani@hpe.com \
--cc=vbabka@suse.cz \
--cc=vkuznets@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).