From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by kanga.kvack.org (Postfix) with ESMTP id AD1316B56E3 for ; Fri, 30 Nov 2018 01:59:08 -0500 (EST) Received: by mail-pg1-f199.google.com with SMTP id a2so2903376pgt.11 for ; Thu, 29 Nov 2018 22:59:08 -0800 (PST) Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id x21-v6sor5716000pln.20.2018.11.29.22.59.07 for (Google Transport Security); Thu, 29 Nov 2018 22:59:07 -0800 (PST) From: Wei Yang Subject: [PATCH v3] mm, hotplug: move init_currently_empty_zone() under zone_span_lock protection Date: Fri, 30 Nov 2018 14:58:47 +0800 Message-Id: <20181130065847.13714-1-richard.weiyang@gmail.com> In-Reply-To: <20181122101241.7965-1-richard.weiyang@gmail.com> References: <20181122101241.7965-1-richard.weiyang@gmail.com> Sender: owner-linux-mm@kvack.org List-ID: To: mhocko@suse.com, osalvador@suse.de, david@redhat.com Cc: akpm@linux-foundation.org, linux-mm@kvack.org, Wei Yang During online_pages phase, pgdat->nr_zones will be updated in case this zone is empty. Currently the online_pages phase is protected by the global lock mem_hotplug_begin(), which ensures there is no contention during the update of nr_zones. But this global lock introduces scalability issues. The patch moves init_currently_empty_zone under both zone_span_writelock and pgdat_resize_lock because both the pgdat state is changed (nr_zones) and the zone's start_pfn. Also this patch changes the documentation of node_size_lock to include the protectioin of nr_zones. Signed-off-by: Wei Yang Acked-by: Michal Hocko Reviewed-by: Oscar Salvador CC: David Hildenbrand --- David, I may not catch you exact comment on the code or changelog. If I missed, just let me know. --- v3: * slightly modify the last paragraph of changelog based on Michal's comment v2: * commit log changes * modify the code in move_pfn_range_to_zone() instead of in init_currently_empty_zone() * pgdat_resize_lock documentation change --- include/linux/mmzone.h | 7 ++++--- mm/memory_hotplug.c | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 3d0c472438d2..37d9c5c3faa6 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -635,9 +635,10 @@ typedef struct pglist_data { #endif #if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_DEFERRED_STRUCT_PAGE_INIT) /* - * Must be held any time you expect node_start_pfn, node_present_pages - * or node_spanned_pages stay constant. Holding this will also - * guarantee that any pfn_valid() stays that way. + * Must be held any time you expect node_start_pfn, + * node_present_pages, node_spanned_pages or nr_zones stay constant. + * Holding this will also guarantee that any pfn_valid() stays that + * way. * * pgdat_resize_lock() and pgdat_resize_unlock() are provided to * manipulate node_size_lock without checking for CONFIG_MEMORY_HOTPLUG diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 61972da38d93..f626e7e5f57b 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -742,14 +742,13 @@ void __ref move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, int nid = pgdat->node_id; unsigned long flags; - if (zone_is_empty(zone)) - init_currently_empty_zone(zone, start_pfn, nr_pages); - clear_zone_contiguous(zone); /* TODO Huh pgdat is irqsave while zone is not. It used to be like that before */ pgdat_resize_lock(pgdat, &flags); zone_span_writelock(zone); + if (zone_is_empty(zone)) + init_currently_empty_zone(zone, start_pfn, nr_pages); resize_zone_range(zone, start_pfn, nr_pages); zone_span_writeunlock(zone); resize_pgdat_range(pgdat, start_pfn, nr_pages); -- 2.15.1