From patchwork Mon Mar 7 15:07:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 12771984 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38C43C433EF for ; Mon, 7 Mar 2022 15:07:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B8BF78D0003; Mon, 7 Mar 2022 10:07:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B3B878D0001; Mon, 7 Mar 2022 10:07:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A03E78D0003; Mon, 7 Mar 2022 10:07:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.a.hostedemail.com [64.99.140.24]) by kanga.kvack.org (Postfix) with ESMTP id 92EBB8D0001 for ; Mon, 7 Mar 2022 10:07:36 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 5E85321A8D for ; Mon, 7 Mar 2022 15:07:36 +0000 (UTC) X-FDA: 79217919312.04.A24CE4B Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf23.hostedemail.com (Postfix) with ESMTP id BFC0E14000E for ; Mon, 7 Mar 2022 15:07:35 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id A33DB210F6; Mon, 7 Mar 2022 15:07:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1646665654; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/+A0bDyvDGXMAEGgLd6HrR1FD9t6zIOokUQHzoAnIiw=; b=Jd6GKQ9CUlQiRU4Ruylo/72Vw/mzoTPXEaHLVjz3U8htklKaWXDhh9ENlGO9pxRJZIBssi xT0bfWbxVcU0t1QCPYCITTJc2yOFlnQI+7wA2EIPrI6tzRst7ssacZ4QAJS7/QVSeAOhNu CpyiHOz9t06tLOWQ+3RF2Nx3Le+5x0g= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1646665654; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/+A0bDyvDGXMAEGgLd6HrR1FD9t6zIOokUQHzoAnIiw=; b=+G0LP7QZV1k0Ud+wRWdG3t4zAkFwL8JaDfCtV/eqHl+PU2FLOf/Dn6GQfw2oJ2vtjkuwN4 Jg/zADZI7rm8fPBg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 27D34132BC; Mon, 7 Mar 2022 15:07:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id eAj7BrYfJmLrHgAAMHmgww (envelope-from ); Mon, 07 Mar 2022 15:07:34 +0000 From: Oscar Salvador To: Andrew Morton Cc: David Hildenbrand , Michal Hocko , Wei Yang , Miaohe Lin , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Oscar Salvador Subject: [PATCH 1/3] mm/page_alloc: Do not calculate node's total pages and memmap pages when empty Date: Mon, 7 Mar 2022 16:07:23 +0100 Message-Id: <20220307150725.6810-2-osalvador@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307150725.6810-1-osalvador@suse.de> References: <20220307150725.6810-1-osalvador@suse.de> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: BFC0E14000E X-Stat-Signature: 1y4dq8xuu34psaphok1ohi3hffett36h Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Jd6GKQ9C; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=+G0LP7QZ; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf23.hostedemail.com: domain of osalvador@suse.de designates 195.135.220.28 as permitted sender) smtp.mailfrom=osalvador@suse.de X-HE-Tag: 1646665655-424814 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: free_area_init_node() calls calculate_node_totalpages() and free_area_init_core(). The former to get node's {spanned,present}_pages, and the latter to calculate, among other things, how many pages per zone we spent on memmap_pages, which is used to substract zone's free pages. On memoryless-nodes, it is pointless to perform such a bunch of work, so make sure we skip the calculations when having a node or empty zone. Signed-off-by: Oscar Salvador --- mm/page_alloc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 967085c1c78a..0b7d176a8990 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -7312,6 +7312,10 @@ static void __init calculate_node_totalpages(struct pglist_data *pgdat, unsigned long realtotalpages = 0, totalpages = 0; enum zone_type i; + /* Skip calculation for memoryless nodes */ + if (node_start_pfn == node_end_pfn) + goto no_pages; + for (i = 0; i < MAX_NR_ZONES; i++) { struct zone *zone = pgdat->node_zones + i; unsigned long zone_start_pfn, zone_end_pfn; @@ -7344,6 +7348,7 @@ static void __init calculate_node_totalpages(struct pglist_data *pgdat, realtotalpages += real_size; } +no_pages: pgdat->node_spanned_pages = totalpages; pgdat->node_present_pages = realtotalpages; pr_debug("On node %d totalpages: %lu\n", pgdat->node_id, realtotalpages); @@ -7562,6 +7567,10 @@ static void __init free_area_init_core(struct pglist_data *pgdat) size = zone->spanned_pages; freesize = zone->present_pages; + /* No pages? Nothing to calculate then. */ + if (!size) + goto no_pages; + /* * Adjust freesize so that it accounts for how much memory * is used by this zone for memmap. This affects the watermark @@ -7597,6 +7606,7 @@ static void __init 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. */ +no_pages: zone_init_internals(zone, j, nid, freesize); if (!size) From patchwork Mon Mar 7 15:07:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 12771985 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8F9EC433FE for ; Mon, 7 Mar 2022 15:07:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 23F578D0005; Mon, 7 Mar 2022 10:07:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 151B18D0001; Mon, 7 Mar 2022 10:07:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE5DA8D0005; Mon, 7 Mar 2022 10:07:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0089.hostedemail.com [216.40.44.89]) by kanga.kvack.org (Postfix) with ESMTP id DFFEC8D0001 for ; Mon, 7 Mar 2022 10:07:37 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id A38A5182056E9 for ; Mon, 7 Mar 2022 15:07:37 +0000 (UTC) X-FDA: 79217919354.30.4B4972E Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf26.hostedemail.com (Postfix) with ESMTP id 2161F14000E for ; Mon, 7 Mar 2022 15:07:36 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 157121F395; Mon, 7 Mar 2022 15:07:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1646665656; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cXn7wMUrFX8sbZ6BajCuexWPZ8vXFeX9A1OvgwoNg58=; b=ytHZy3j9HqKRDsW7pEQ4O59R032rFz0Qzy5zOtnue0iOl9c7sgAV2g/tp1wnxtEh2c+oTM y8YeL4NGVRR5UrTNk+t3LYU/oI1mFIGjvYTPH/ZzznCZRdnBjQaloHJkjRfTtz2KXJZae7 h2urm2zh0O7BsBNKYEmCQ4M/7c3xcuI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1646665656; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cXn7wMUrFX8sbZ6BajCuexWPZ8vXFeX9A1OvgwoNg58=; b=20nmukv7C/ynzp+w1gkwrnOpnahpZQ59CEDXNgnTJnJ2zGHMlyI5k91O7OA90L66HQv9g7 cwjs+2DJiHFYvpBw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 8FE1C132BC; Mon, 7 Mar 2022 15:07:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id mHluILcfJmLrHgAAMHmgww (envelope-from ); Mon, 07 Mar 2022 15:07:35 +0000 From: Oscar Salvador To: Andrew Morton Cc: David Hildenbrand , Michal Hocko , Wei Yang , Miaohe Lin , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Oscar Salvador Subject: [PATCH 2/3] mm/memory_hotplug: Reset node's state when empty during offline Date: Mon, 7 Mar 2022 16:07:24 +0100 Message-Id: <20220307150725.6810-3-osalvador@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307150725.6810-1-osalvador@suse.de> References: <20220307150725.6810-1-osalvador@suse.de> MIME-Version: 1.0 X-Rspamd-Server: rspam10 X-Rspam-User: X-Stat-Signature: 9s5nt5tfxgfjhi1mzx79mtjoz6rn3jh3 Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=ytHZy3j9; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=20nmukv7; spf=pass (imf26.hostedemail.com: domain of osalvador@suse.de designates 195.135.220.29 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de X-Rspamd-Queue-Id: 2161F14000E X-HE-Tag: 1646665656-354855 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: All possible nodes are now pre-allocated at boot time by free_area_init()-> free_area_init_node(), and those which are to be hot-plugged are initialized later on by hotadd_init_pgdat()->free_area_init_core_hotplug() when they become online. free_area_init_core_hotplug() calls pgdat_init_internals() and zone_init_internals() to initialize some internal data structures and zeroes a few pgdat fields. But we do already call pgdat_init_internals() and zone_init_internals() for all possible nodes back in free_area_init_core(), and pgdat fields are already zeroed because the pre-allocation memsets with 0s the structure, meaning we do not need to repeat the process when the node becomes online. So initialize it only once when booting, and make sure to reset the fields we care about to 0 when the node goes empty. The only thing we need to check for is to allocate per_cpu_nodestats struct the very first time this node goes online. node_reset_state() is the function in charge of resetting pgdat's fields, and it is called when offline_pages() detects that the node becomes empty worth of memory. Signed-off-by: Oscar Salvador --- include/linux/memory_hotplug.h | 2 +- mm/memory_hotplug.c | 58 +++++++++++++++++++++------------- mm/page_alloc.c | 49 +++++----------------------- 3 files changed, 45 insertions(+), 64 deletions(-) diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 76bf2de86def..fcf4c9a023cc 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -319,7 +319,7 @@ extern void set_zone_contiguous(struct zone *zone); extern void clear_zone_contiguous(struct zone *zone); #ifdef CONFIG_MEMORY_HOTPLUG -extern void __ref free_area_init_core_hotplug(struct pglist_data *pgdat); +extern bool pgdat_has_boot_nodestats(pg_data_t *pgdat); extern int __add_memory(int nid, u64 start, u64 size, mhp_t mhp_flags); extern int add_memory(int nid, u64 start, u64 size, mhp_t mhp_flags); extern int add_memory_resource(int nid, struct resource *resource, diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index ddc62f8b591f..07cece9e22e4 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1164,18 +1164,18 @@ static void reset_node_present_pages(pg_data_t *pgdat) /* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */ static pg_data_t __ref *hotadd_init_pgdat(int nid) { - struct pglist_data *pgdat; + struct pglist_data *pgdat = NODE_DATA(nid); /* - * NODE_DATA is preallocated (free_area_init) but its internal - * state is not allocated completely. Add missing pieces. - * Completely offline nodes stay around and they just need - * reintialization. + * NODE_DATA is preallocated (free_area_init), the only thing missing + * is to allocate its per_cpu_nodestats struct and to build node's + * zonelists. The allocation of per_cpu_nodestats only needs to be done + * the very first time this node is brought up, as we reset its state + * when all node's memory goes offline. */ - pgdat = NODE_DATA(nid); - - /* init node's zones as empty zones, we don't have any present pages.*/ - free_area_init_core_hotplug(pgdat); + if (pgdat_has_boot_nodestats(pgdat)) + pgdat->per_cpu_nodestats = alloc_percpu_gfp(struct per_cpu_nodestat, + __GFP_ZERO); /* * The node we allocated has no zone fallback lists. For avoiding @@ -1183,15 +1183,6 @@ static pg_data_t __ref *hotadd_init_pgdat(int nid) */ build_all_zonelists(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(). - * TODO: should be in free_area_init_core_hotplug? - */ - reset_node_managed_pages(pgdat); - reset_node_present_pages(pgdat); - return pgdat; } @@ -1799,6 +1790,30 @@ static void node_states_clear_node(int node, struct memory_notify *arg) node_clear_state(node, N_MEMORY); } +static void node_reset_state(int node) +{ + pg_data_t *pgdat = NODE_DATA(node); + int cpu; + + kswapd_stop(node); + kcompactd_stop(node); + + reset_node_managed_pages(pgdat); + reset_node_present_pages(pgdat); + + pgdat->nr_zones = 0; + pgdat->kswapd_order = 0; + pgdat->kswapd_highest_zoneidx = 0; + pgdat->node_start_pfn = 0; + + for_each_online_cpu(cpu) { + struct per_cpu_nodestat *p; + + p = per_cpu_ptr(pgdat->per_cpu_nodestats, cpu); + memset(p, 0, sizeof(*p)); + } +} + static int count_system_ram_pages_cb(unsigned long start_pfn, unsigned long nr_pages, void *data) { @@ -1956,10 +1971,9 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages, } node_states_clear_node(node, &arg); - if (arg.status_change_nid >= 0) { - kswapd_stop(node); - kcompactd_stop(node); - } + if (arg.status_change_nid >= 0) + /* Reset node's state as all its memory went offline. */ + node_reset_state(node); writeback_set_ratelimit(); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0b7d176a8990..36e67418a6f0 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6382,6 +6382,13 @@ static DEFINE_PER_CPU(struct per_cpu_pages, boot_pageset); static DEFINE_PER_CPU(struct per_cpu_zonestat, boot_zonestats); static DEFINE_PER_CPU(struct per_cpu_nodestat, boot_nodestats); +#ifdef CONFIG_MEMORY_HOTPLUG +bool pgdat_has_boot_nodestats(pg_data_t *pgdat) +{ + return pgdat->per_cpu_nodestats == &boot_nodestats; +} +#endif + static void __build_all_zonelists(void *data) { int nid; @@ -7491,7 +7498,7 @@ static void __meminit pgdat_init_internals(struct pglist_data *pgdat) lruvec_init(&pgdat->__lruvec); } -static void __meminit zone_init_internals(struct zone *zone, enum zone_type idx, int nid, +static void __init zone_init_internals(struct zone *zone, enum zone_type idx, int nid, unsigned long remaining_pages) { atomic_long_set(&zone->managed_pages, remaining_pages); @@ -7503,46 +7510,6 @@ static void __meminit zone_init_internals(struct zone *zone, enum zone_type idx, 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(struct pglist_data *pgdat) -{ - int nid = pgdat->node_id; - enum zone_type z; - int cpu; - - pgdat_init_internals(pgdat); - - if (pgdat->per_cpu_nodestats == &boot_nodestats) - pgdat->per_cpu_nodestats = alloc_percpu(struct per_cpu_nodestat); - - /* - * Reset the nr_zones, order and highest_zoneidx before reuse. - * Note that kswapd will init kswapd_highest_zoneidx properly - * when it starts in the near future. - */ - pgdat->nr_zones = 0; - pgdat->kswapd_order = 0; - pgdat->kswapd_highest_zoneidx = 0; - pgdat->node_start_pfn = 0; - for_each_online_cpu(cpu) { - struct per_cpu_nodestat *p; - - p = per_cpu_ptr(pgdat->per_cpu_nodestats, cpu); - memset(p, 0, sizeof(*p)); - } - - 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 From patchwork Mon Mar 7 15:07:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 12771986 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9A11BC4332F for ; Mon, 7 Mar 2022 15:07:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6A95D8D0006; Mon, 7 Mar 2022 10:07:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 65A768D0001; Mon, 7 Mar 2022 10:07:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 438C28D0006; Mon, 7 Mar 2022 10:07:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.27]) by kanga.kvack.org (Postfix) with ESMTP id 232DE8D0001 for ; Mon, 7 Mar 2022 10:07:39 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay13.hostedemail.com (Postfix) with ESMTP id DFEC261796 for ; Mon, 7 Mar 2022 15:07:38 +0000 (UTC) X-FDA: 79217919396.14.334BB0F Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf25.hostedemail.com (Postfix) with ESMTP id 535FFA0015 for ; Mon, 7 Mar 2022 15:07:38 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 451591F396; Mon, 7 Mar 2022 15:07:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1646665657; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3P7bIRLrBlFDijrCRgEyPsvaDPLZQ9uN0q/x7eaR+p0=; b=Ey7TZ3RtHRDRJfjlRvqYGfgCeXP6f2e/zRCCnY0fgKG+lWYsIszX1S0JeOD0iI27d9FANs tuAtcOnnQkyna/xA02xRXWVx8vqENll2LjOAKLAhL+6nmVki01Um8UZ6XeCpBYpoOs4YJy MpxRC9LshIBY1+5Sm80cxTgxfftE1Uw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1646665657; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3P7bIRLrBlFDijrCRgEyPsvaDPLZQ9uN0q/x7eaR+p0=; b=bk0rwY2cBrRtaQPiDVmNf/T1xTP4vhye4JE996PHCMKFUBCfYkvXZ+ODoldNb+f4Gr+V34 YBZ0mSifN2993CBA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C38FB132BC; Mon, 7 Mar 2022 15:07:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id gIoJLbgfJmLrHgAAMHmgww (envelope-from ); Mon, 07 Mar 2022 15:07:36 +0000 From: Oscar Salvador To: Andrew Morton Cc: David Hildenbrand , Michal Hocko , Wei Yang , Miaohe Lin , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Oscar Salvador Subject: [PATCH 3/3] mm/memory_hotplug: Refactor hotadd_init_pgdat and try_online_node Date: Mon, 7 Mar 2022 16:07:25 +0100 Message-Id: <20220307150725.6810-4-osalvador@suse.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220307150725.6810-1-osalvador@suse.de> References: <20220307150725.6810-1-osalvador@suse.de> MIME-Version: 1.0 X-Rspamd-Queue-Id: 535FFA0015 X-Stat-Signature: dpsagu193915mgtht73bqph16j6chrue Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Ey7TZ3Rt; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=bk0rwY2c; spf=pass (imf25.hostedemail.com: domain of osalvador@suse.de designates 195.135.220.29 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1646665658-551832 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: Since we pre-allocate all nodes now, hotadd_init_pgdat() does not need to return a pgdat struct, as that was meant for __try_online_node() to check whether the node was succesfully allocated. Also get rid of the __ref as all functions hotadd_init_pgdat() calls fall within the same section. Also try to make more clear the return codes from __try_online_node(). __try_online_node() can return either 0, 1 or -errno (the latter not really as the BUG_ON() would catch it before we return) but depending on the caller that has different meanings. For add_memory_resource(), when __try_online_node() returns non-zero, it means that the node was already allocated and it does not need to bring it up. It is fine not to check for -errno values because we do not get to call register_one_node() when !set_node_online. For those who call try_online_node(), so set_node_online is true, a value other than zero means a failure (e.g: cpu_up() or find_and_online_cpu_nid()). Signed-off-by: Oscar Salvador --- mm/memory_hotplug.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 07cece9e22e4..5c92ac81a399 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1161,8 +1161,7 @@ static void reset_node_present_pages(pg_data_t *pgdat) pgdat->node_present_pages = 0; } -/* we are OK calling __meminit stuff here - we have CONFIG_MEMORY_HOTPLUG */ -static pg_data_t __ref *hotadd_init_pgdat(int nid) +static void hotadd_init_pgdat(int nid) { struct pglist_data *pgdat = NODE_DATA(nid); @@ -1182,8 +1181,6 @@ static pg_data_t __ref *hotadd_init_pgdat(int nid) * to access not-initialized zonelist, build here. */ build_all_zonelists(pgdat); - - return pgdat; } /* @@ -1193,31 +1190,27 @@ static pg_data_t __ref *hotadd_init_pgdat(int nid) * called by cpu_up() to online a node without onlined memory. * * Returns: - * 1 -> a new node has been allocated - * 0 -> the node is already online - * -ENOMEM -> the node could not be allocated + * 1 -> The node has been initialized. + * 0 -> Either the node was already online, or we succesfully registered a new + * one. + * -errno -> register_one_node() failed. */ static int __try_online_node(int nid, bool set_node_online) { - pg_data_t *pgdat; - int ret = 1; + int ret; if (node_online(nid)) return 0; - pgdat = hotadd_init_pgdat(nid); - if (!pgdat) { - pr_err("Cannot online node %d due to NULL pgdat\n", nid); - ret = -ENOMEM; - goto out; - } + hotadd_init_pgdat(nid); + + if (!set_node_online) + return 1; + + node_set_online(nid); + ret = register_one_node(nid); + BUG_ON(ret); - if (set_node_online) { - node_set_online(nid); - ret = register_one_node(nid); - BUG_ON(ret); - } -out: return ret; }