From patchwork Mon Jul 30 10:17:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10548861 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AA19414BC for ; Mon, 30 Jul 2018 10:18:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 985D029878 for ; Mon, 30 Jul 2018 10:18:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8CB512987D; Mon, 30 Jul 2018 10:18:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF40629878 for ; Mon, 30 Jul 2018 10:18:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4359E6B000A; Mon, 30 Jul 2018 06:18:08 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3B8696B000D; Mon, 30 Jul 2018 06:18:08 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2582F6B000E; Mon, 30 Jul 2018 06:18:08 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by kanga.kvack.org (Postfix) with ESMTP id BBC576B000A for ; Mon, 30 Jul 2018 06:18:07 -0400 (EDT) Received: by mail-wr1-f72.google.com with SMTP id w2-v6so9527559wrt.13 for ; Mon, 30 Jul 2018 03:18:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=TLyg0Y04DoZ4XgeqD6bRBZIDhScpx+PZcN+xJjKpwhY=; b=pK4T8qvw5f7GtFs0CEiLlY+4rTZ/E+rmUITMHwiNSpmesL5Icb1Y7H7cKFlMDSQPY3 N8rH81QWslSZeu8epTo1j8nNe+hY15euC97cIS39jTCYaPVU8CW8oRC0kx/PWn1nANPv h3+PqHj1d39qqooBJrgXfpzAPVkeEL2btxQoc1Ttlm/w1qAJ4NVijymzpwzMSqIM/vcA vEk3WZL3rTd5a3D/p/WPy7+wp2OctEdGd6ntpZsek1/bqRZegKupxFc1BFvXrttrAflk 2yw0vUiaUnlPYkyoLsO4nu1XNO5wqBs8ys9Jd0pGm45nMMKHhXKvSD5909K8ww7n6PJ1 F8wQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@gmail.com X-Gm-Message-State: AOUpUlGEVPnCP51zH71if48dTxYFJLS/dUYsr4GdfxOVxnfmsGj8W1Pr ZYk1Suusc26glsH3+P7iSx0sLV5qCzmpbFcuhje2S7kTGvezevYjBQ1RMKzhRrkKrZflLDz8VZU U5ggUQeNXMmdq4M2Lft28gfXzcBPaP4Np8hvydg6VO4yxTYi42EemFBtTVe/FUkRhtyrKALQ22d TEdlJYyiquBkPlvRI8vY+J2dJgrFzsfi1XUiawaQndWI64vyOpWZvgAWbh3ejq57q2QnX04L2vB hUzZugWoxdFC0eJgpPTC4mRker1G0Mit5Aa3c6sAhfR9SB52+TY9dkLG7NnL2VG9I//+o+9TCwm 6ZDbiU9v7KmZ+HAoaSa6ZXPyoctcvqMw8e1HIGR5MVFXkFfbX5AE1obWAcHtCETNTlj/fdp/xw= = X-Received: by 2002:a1c:8b0d:: with SMTP id n13-v6mr13920999wmd.46.1532945887284; Mon, 30 Jul 2018 03:18:07 -0700 (PDT) X-Received: by 2002:a1c:8b0d:: with SMTP id n13-v6mr13920941wmd.46.1532945886416; Mon, 30 Jul 2018 03:18:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532945886; cv=none; d=google.com; s=arc-20160816; b=Fvl/9TerjSMwyp9O9StZ1/WlcErbrHgDbIvpXiT/B1DTMDmkG1fl7Opp25hVtsFv+o eibMkLBaWic3KUT/VgLvDc/zgQdFquz+J8Nb6GSIa98X76FM7cgnBqibDlkhQav++Vdb I9lBgFb2U685L1V8oM/SBk5mepsjRbpXFMtgrnnAUjtURUOczVgNPeqdVZmD7s/o3zF5 2uoyf7OyP/S9pwrMbqtAFlCL8GqPdNxtNnWCW+dlxSzf9oZYYwRTKX26jgj6dJvANZm6 upFigJvpHisluDNAeVKHipFm8misoVownG14Iu5yPEjH4mTIZXuQvy9WA9GrIfqljyeT cF1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=TLyg0Y04DoZ4XgeqD6bRBZIDhScpx+PZcN+xJjKpwhY=; b=m/15y4+xmMgK0eIgPqhYUg1b+HidOQVuikFFzoo7wAGYWdtAsgaejMZCinUarQJzZu Z2I8iw0xnXX/RQC4CSo8CEoBQHeRAUwkIN3MhqUGIXRVUWEsr+lGtMs/YwmxHhcfgt8H DryRT/Xpq2g8ypgxTdZV56XbfqO0xE/qk3uxKWmKjWTmUVTcn3v97jJj7jUV/ceDor64 1q4wNJflnNJmmIv9X2lMnV8htShpRAs4Zt9FDKjVVx7ufHqLUNOCdPMCQiWjYdFg+7B9 9HyuvNkOY5qHZxqdE2j08HL9bxUMHHRv2jeApvHEafaN273bdnMiX+ZsZlGRAuCGkDKT jdkw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id y199-v6sor2948100wmd.8.2018.07.30.03.18.06 for (Google Transport Security); Mon, 30 Jul 2018 03:18:06 -0700 (PDT) Received-SPF: pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@gmail.com X-Google-Smtp-Source: AAOMgpcIeoYDPBf9PNJRGGgdGykb1wTfI4h8Qi7UURcI+PRKUmQKj5DCVIYh+NJ+6UcWDnDiVzOUEQ== X-Received: by 2002:a1c:7c13:: with SMTP id x19-v6mr15398785wmc.27.1532945886047; Mon, 30 Jul 2018 03:18:06 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id s124-v6sm14262798wmf.47.2018.07.30.03.18.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Jul 2018 03:18:05 -0700 (PDT) Received: from d104.suse.de (nat.nue.novell.com [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id 79FC2124449; Mon, 30 Jul 2018 12:18:03 +0200 (CEST) From: osalvador@techadventures.net To: akpm@linux-foundation.org Cc: mhocko@suse.com, vbabka@suse.cz, pasha.tatashin@oracle.com, mgorman@techsingularity.net, aaron.lu@intel.com, iamjoonsoo.kim@lge.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, dan.j.williams@intel.com, david@redhat.com, Oscar Salvador Subject: [PATCH v5 4/4] mm/page_alloc: Introduce free_area_init_core_hotplug Date: Mon, 30 Jul 2018 12:17:57 +0200 Message-Id: <20180730101757.28058-5-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180730101757.28058-1-osalvador@techadventures.net> References: <20180730101757.28058-1-osalvador@techadventures.net> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Oscar Salvador Currently, whenever a new node is created/re-used from the memhotplug path, we call free_area_init_node()->free_area_init_core(). But there is some code that we do not really need to run when we are coming from such path. free_area_init_core() performs the following actions: 1) Initializes pgdat internals, such as spinlock, waitqueues and more. 2) Account # nr_all_pages and # nr_kernel_pages. These values are used later on when creating hash tables. 3) Account number of managed_pages per zone, substracting dma_reserved and memmap pages. 4) Initializes some fields of the zone structure data 5) Calls init_currently_empty_zone to initialize all the freelists 6) Calls memmap_init to initialize all pages belonging to certain zone When called from memhotplug path, free_area_init_core() only performs actions #1 and #4. Action #2 is pointless as the zones do not have any pages since either the node was freed, or we are re-using it, eitherway all zones belonging to this node should have 0 pages. For the same reason, action #3 results always in manages_pages being 0. Action #5 and #6 are performed later on when onlining the pages: online_pages()->move_pfn_range_to_zone()->init_currently_empty_zone() online_pages()->move_pfn_range_to_zone()->memmap_init_zone() This patch does two things: First, moves the node/zone initializtion to their own function, so it allows us to create a small version of free_area_init_core, where we only perform: 1) Initialization of pgdat internals, such as spinlock, waitqueues and more 4) Initialization of some fields of the zone structure data These two functions are: pgdat_init_internals() and zone_init_internals(). The second thing this patch does, is to introduce free_area_init_core_hotplug(), the memhotplug version of free_area_init_core(): Currently, we call free_area_init_node() from the memhotplug path. In there, we set some pgdat's fields, and call calculate_node_totalpages(). calculate_node_totalpages() calculates the # of pages the node has. Since the node is either new, or we are re-using it, the zones belonging to this node should not have any pages, so there is no point to calculate this now. Actually, we re-set these values to 0 later on with the calls to: reset_node_managed_pages() reset_node_present_pages() The # of pages per node and the # of pages per zone will be calculated when onlining the pages: online_pages()->move_pfn_range()->move_pfn_range_to_zone()->resize_zone_range() online_pages()->move_pfn_range()->move_pfn_range_to_zone()->resize_pgdat_range() Also, since free_area_init_core/free_area_init_node will now only get called during early init, let us replace __paginginit with __init, so their code gets freed up. Signed-off-by: Oscar Salvador Reviewed-by: Pavel Tatashin Acked-by: Michal Hocko --- include/linux/mm.h | 6 ++++- mm/memory_hotplug.c | 16 ++++-------- mm/page_alloc.c | 71 +++++++++++++++++++++++++++++++++++++---------------- 3 files changed, 60 insertions(+), 33 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 6954ad183159..af3222785347 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1998,10 +1998,14 @@ static inline spinlock_t *pud_lock(struct mm_struct *mm, pud_t *pud) extern void __init pagecache_init(void); extern void free_area_init(unsigned long * zones_size); -extern void free_area_init_node(int nid, unsigned long * zones_size, +extern void __init free_area_init_node(int nid, unsigned long * zones_size, unsigned long zone_start_pfn, unsigned long *zholes_size); extern void free_initmem(void); +#ifdef CONFIG_MEMORY_HOTPLUG +extern void __ref free_area_init_core_hotplug(int nid); +#endif + /* * Free reserved pages within range [PAGE_ALIGN(start), end & PAGE_MASK) * into the buddy system. The freed pages will be poisoned with pattern diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 4eb6e824a80c..9eea6e809a4e 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -982,8 +982,6 @@ static void reset_node_present_pages(pg_data_t *pgdat) static pg_data_t __ref *hotadd_new_pgdat(int nid, u64 start) { struct pglist_data *pgdat; - unsigned long zones_size[MAX_NR_ZONES] = {0}; - unsigned long zholes_size[MAX_NR_ZONES] = {0}; unsigned long start_pfn = PFN_DOWN(start); pgdat = NODE_DATA(nid); @@ -1006,8 +1004,11 @@ static pg_data_t __ref *hotadd_new_pgdat(int nid, u64 start) /* we can use NODE_DATA(nid) from here */ + pgdat->node_id = nid; + pgdat->node_start_pfn = start_pfn; + /* init node's zones as empty zones, we don't have any present pages.*/ - free_area_init_node(nid, zones_size, start_pfn, zholes_size); + free_area_init_core_hotplug(nid); pgdat->per_cpu_nodestats = alloc_percpu(struct per_cpu_nodestat); /* @@ -1017,18 +1018,11 @@ static pg_data_t __ref *hotadd_new_pgdat(int nid, u64 start) build_all_zonelists(pgdat); /* - * zone->managed_pages is set to an approximate value in - * free_area_init_core(), which will cause - * /sys/device/system/node/nodeX/meminfo has wrong data. - * So reset it to 0 before any memory is onlined. - */ - reset_node_managed_pages(pgdat); - - /* * When memory is hot-added, all the memory is in offline state. So * clear all zones' present_pages because they will be updated in * online_pages() and offline_pages(). */ + reset_node_managed_pages(pgdat); reset_node_present_pages(pgdat); return pgdat; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 4e84a17a5030..b2ccade42020 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6237,21 +6237,9 @@ static void pgdat_init_kcompactd(struct pglist_data *pgdat) static void pgdat_init_kcompactd(struct pglist_data *pgdat) {} #endif -/* - * Set up the zone data structures: - * - mark all pages reserved - * - mark all memory queues empty - * - clear the memory bitmaps - * - * NOTE: pgdat should get zeroed by caller. - */ -static void __paginginit free_area_init_core(struct pglist_data *pgdat) +static void __paginginit pgdat_init_internals(struct pglist_data *pgdat) { - enum zone_type j; - int nid = pgdat->node_id; - pgdat_resize_init(pgdat); - pgdat_init_numabalancing(pgdat); pgdat_init_split_queue(pgdat); pgdat_init_kcompactd(pgdat); @@ -6262,7 +6250,54 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat) pgdat_page_ext_init(pgdat); spin_lock_init(&pgdat->lru_lock); lruvec_init(node_lruvec(pgdat)); +} + +static void __paginginit zone_init_internals(struct zone *zone, enum zone_type idx, int nid, + unsigned long remaining_pages) +{ + zone->managed_pages = remaining_pages; + zone_set_nid(zone, nid); + zone->name = zone_names[idx]; + zone->zone_pgdat = NODE_DATA(nid); + spin_lock_init(&zone->lock); + zone_seqlock_init(zone); + zone_pcp_init(zone); +} + +/* + * Set up the zone data structures + * - init pgdat internals + * - init all zones belonging to this node + * + * NOTE: this function is only called during memory hotplug + */ +#ifdef CONFIG_MEMORY_HOTPLUG +void __ref free_area_init_core_hotplug(int nid) +{ + enum zone_type z; + pg_data_t *pgdat = NODE_DATA(nid); + + pgdat_init_internals(pgdat); + for (z = 0; z < MAX_NR_ZONES; z++) + zone_init_internals(&pgdat->node_zones[z], z, nid, 0); +} +#endif + +/* + * Set up the zone data structures: + * - mark all pages reserved + * - mark all memory queues empty + * - clear the memory bitmaps + * + * NOTE: pgdat should get zeroed by caller. + * NOTE: this function is only called during early init. + */ +static void __init free_area_init_core(struct pglist_data *pgdat) +{ + enum zone_type j; + int nid = pgdat->node_id; + pgdat_init_internals(pgdat); pgdat->per_cpu_nodestats = &boot_nodestats; for (j = 0; j < MAX_NR_ZONES; j++) { @@ -6310,13 +6345,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat) * when the bootmem allocator frees pages into the buddy system. * And all highmem pages will be managed by the buddy system. */ - zone->managed_pages = freesize; - zone_set_nid(zone, nid); - zone->name = zone_names[j]; - zone->zone_pgdat = pgdat; - spin_lock_init(&zone->lock); - zone_seqlock_init(zone); - zone_pcp_init(zone); + zone_init_internals(zone, j, nid, freesize); if (!size) continue; @@ -6391,7 +6420,7 @@ static inline void pgdat_set_deferred_range(pg_data_t *pgdat) static inline void pgdat_set_deferred_range(pg_data_t *pgdat) {} #endif -void __paginginit free_area_init_node(int nid, unsigned long *zones_size, +void __init free_area_init_node(int nid, unsigned long *zones_size, unsigned long node_start_pfn, unsigned long *zholes_size) { pg_data_t *pgdat = NODE_DATA(nid);