From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753618AbdGSNdf (ORCPT ); Wed, 19 Jul 2017 09:33:35 -0400 Received: from mx2.suse.de ([195.135.220.15]:56716 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752811AbdGSNde (ORCPT ); Wed, 19 Jul 2017 09:33:34 -0400 Subject: Re: [PATCH 4/9] mm, memory_hotplug: drop zone from build_all_zonelists To: Michal Hocko , linux-mm@kvack.org Cc: Andrew Morton , Mel Gorman , Johannes Weiner , LKML , Michal Hocko , Wen Congyang References: <20170714080006.7250-1-mhocko@kernel.org> <20170714080006.7250-5-mhocko@kernel.org> From: Vlastimil Babka Message-ID: Date: Wed, 19 Jul 2017 15:33:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20170714080006.7250-5-mhocko@kernel.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/14/2017 10:00 AM, Michal Hocko wrote: > From: Michal Hocko > > build_all_zonelists gets a zone parameter to initialize zone's > pagesets. There is only a single user which gives a non-NULL > zone parameter and that one doesn't really need the rest of the > build_all_zonelists (see 6dcd73d7011b ("memory-hotplug: allocate zone's > pcp before onlining pages")). > > Therefore remove setup_zone_pageset from build_all_zonelists and call it > from its only user directly. This will also remove a pointless zonlists > rebuilding which is always good. > > Cc: Wen Congyang > Signed-off-by: Michal Hocko Acked-by: Vlastimil Babka with a small point below ... > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index ebc3311555b1..00e117922b3f 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -5065,7 +5065,6 @@ static void build_zonelists(pg_data_t *pgdat) > static void setup_pageset(struct per_cpu_pageset *p, unsigned long batch); > static DEFINE_PER_CPU(struct per_cpu_pageset, boot_pageset); > static DEFINE_PER_CPU(struct per_cpu_nodestat, boot_nodestats); > -static void setup_zone_pageset(struct zone *zone); > > /* > * Global mutex to protect against size modification of zonelists > @@ -5146,19 +5145,14 @@ build_all_zonelists_init(void) > * unless system_state == SYSTEM_BOOTING. > * > * __ref due to (1) call of __meminit annotated setup_zone_pageset Isn't the whole (1) in the comment invalid now? > - * [we're only called with non-NULL zone through __meminit paths] and > - * (2) call of __init annotated helper build_all_zonelists_init > + * and (2) call of __init annotated helper build_all_zonelists_init > * [protected by SYSTEM_BOOTING]. > */ > -void __ref build_all_zonelists(pg_data_t *pgdat, struct zone *zone) > +void __ref build_all_zonelists(pg_data_t *pgdat) > { > if (system_state == SYSTEM_BOOTING) { > build_all_zonelists_init(); > } else { > -#ifdef CONFIG_MEMORY_HOTPLUG > - if (zone) > - setup_zone_pageset(zone); > -#endif > /* we have to stop all cpus to guarantee there is no user > of zonelist */ > stop_machine_cpuslocked(__build_all_zonelists, pgdat, NULL); > @@ -5432,7 +5426,7 @@ static void __meminit zone_pageset_init(struct zone *zone, int cpu) > pageset_set_high_and_batch(zone, pcp); > } > > -static void __meminit setup_zone_pageset(struct zone *zone) > +void __meminit setup_zone_pageset(struct zone *zone) > { > int cpu; > zone->pageset = alloc_percpu(struct per_cpu_pageset); >