From patchwork Mon Jan 27 23:21:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank van der Linden X-Patchwork-Id: 13951852 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 0BBFEC02188 for ; Mon, 27 Jan 2025 23:23:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1A4952801B0; Mon, 27 Jan 2025 18:22:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1550628013A; Mon, 27 Jan 2025 18:22:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F3A002801B0; Mon, 27 Jan 2025 18:22:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id D0FEA28013A for ; Mon, 27 Jan 2025 18:22:44 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 8897EC0820 for ; Mon, 27 Jan 2025 23:22:44 +0000 (UTC) X-FDA: 83054808648.28.305C0ED Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf08.hostedemail.com (Postfix) with ESMTP id B122A160004 for ; Mon, 27 Jan 2025 23:22:42 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=AYta+LbK; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf08.hostedemail.com: domain of 3QRWYZwQKCBAvBt1w44w1u.s421y3AD-220Bqs0.47w@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3QRWYZwQKCBAvBt1w44w1u.s421y3AD-220Bqs0.47w@flex--fvdl.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738020162; a=rsa-sha256; cv=none; b=FVsfK5YUqYQC6jdHT4iaDgycuLm+RHVBzdM8vMQUeXmbk955zXegEverMWh//SYOxjTr4a AceAsYc86DgYLiAS3g5hFXV99WhdLOEjCg185w4+OZylm+dmu3DrEar9A7QmICX+MltBL8 qUla3vo/bnNZrruIMuXnYQudGZl2anY= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=AYta+LbK; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf08.hostedemail.com: domain of 3QRWYZwQKCBAvBt1w44w1u.s421y3AD-220Bqs0.47w@flex--fvdl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3QRWYZwQKCBAvBt1w44w1u.s421y3AD-220Bqs0.47w@flex--fvdl.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738020162; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=3UXEGVf17TVzbPjgEhSFIqZ1yVI6Ua/dfF01nsCmm7A=; b=wXiSJM0p5vzbSHBJu7llGhs5KgUr1ko7tVkaJuRBYk7SRF6qjbkfAosbzKGrY2nJv4jPKC A3rd0wtLYI2qcoKFt1uTD1S/kOI3yNdVIwHY6mdJ+TUf0wV/6lz6ym3KzIwEpTAEzcyEra oKJoN8Ue2VfR5VeMYiUtBhQvqcdPz/Q= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2166a1a5cc4so93303885ad.3 for ; Mon, 27 Jan 2025 15:22:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1738020161; x=1738624961; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=3UXEGVf17TVzbPjgEhSFIqZ1yVI6Ua/dfF01nsCmm7A=; b=AYta+LbKGUxaplrgDRxkMGtujwzBAnt8+ZCo9aaPJQb3XNFw66wocYt/Tz2Z0u6tyS dCVu3OYd1Smy+n9+mLwegdQ3eX60+YqPZkzLGEVvn52Fq7OgZxSuivzkVHRMLHZwE2ut 8w4ImrKRdDhkk8NDGeSRo4KGuWi6zqvmdoX6gDP3l//kT3dd9fmG4PujfkNkn5Sqvyi/ UoKLMVXPwAGKoXDhR7RhgY01GTZluYZfxY1J0vf6Xn3jZOu4bYgiDJmoKdN27Y7rSVlk FW52W0ywoOcfTeOhexRnIa/FSd923e2HCIziuUZ66W0okFnSm2K+5/6nUOUd9Zdi+4bs nweg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738020161; x=1738624961; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3UXEGVf17TVzbPjgEhSFIqZ1yVI6Ua/dfF01nsCmm7A=; b=R32eRlzH/R9tjyw3JXtC3CKKyQbq5fYT61ocl5jbHvSgCkPRcKDqbshEtzJS6PeOyS vs5l6myFoWsN1RfkseaYFdKBDXwlQK5gJ+Eey2yHLOWwIvWY1iHSYmy/+NRb9S5mZQwi 3PzeB5wxhDHw3RxSKDHpPigo35z2iQ4jOThVoqo/EFmLejxIFwrtNYDvr4qsDqWpzZWU O2Onsa0tfd4UTKLNcp9FhP/YjFJ/VFxYNn20mdNCre9KfdLbT2lYbU3sQsQ5nCJbD1UO /Gb7C+dKTSNbB1RkWTviTnkMD2NpgXUSkLMdj40d7XYSUkYdeyQ+tChussa9jc4PrLMl NEJQ== X-Forwarded-Encrypted: i=1; AJvYcCUUryi2ZQ0flZZMKrkT4Xxg26Hpok2TDWs78yBPYgo2IPW+4zMUJ2Q+V/Y0Bg/vbR35wsQFCo3Sag==@kvack.org X-Gm-Message-State: AOJu0YxRGqajzMByVBrgsK8ckfSMDuCvHaPabaQyWQ5oFGxEEGDn9EHx IGM4OVpzE5wxyN3a0ujGsHUm6UqssHIHbEZo6WhIpBWr1cfomg0AbDWVY1P03e1Wgq5KLg== X-Google-Smtp-Source: AGHT+IFhiw4AeddBRSGEq7qIMkWbFl43kdGAToKfXe/DO0y8IerN2I/rW+viU/dkSKd6w3H5A9Jgrve7 X-Received: from pfbcw13.prod.google.com ([2002:a05:6a00:450d:b0:725:1ef3:c075]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:2453:b0:1e1:b12e:edb8 with SMTP id adf61e73a8af0-1eb215682edmr76608159637.30.1738020161582; Mon, 27 Jan 2025 15:22:41 -0800 (PST) Date: Mon, 27 Jan 2025 23:21:51 +0000 In-Reply-To: <20250127232207.3888640-1-fvdl@google.com> Mime-Version: 1.0 References: <20250127232207.3888640-1-fvdl@google.com> X-Mailer: git-send-email 2.48.1.262.g85cc9f2d1e-goog Message-ID: <20250127232207.3888640-12-fvdl@google.com> Subject: [PATCH 11/27] mm/sparse: allow for alternate vmemmap section init at boot From: Frank van der Linden To: akpm@linux-foundation.org, muchun.song@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: yuzhao@google.com, usama.arif@bytedance.com, joao.m.martins@oracle.com, roman.gushchin@linux.dev, Frank van der Linden X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: B122A160004 X-Stat-Signature: xmmf1qdr75a675wrqzqz39qzj1f5toxk X-HE-Tag: 1738020162-179045 X-HE-Meta: U2FsdGVkX197N3QlOx6ZbjRiPfIrciiWsSDBgksu7qrNghBklH4lBoH4zXL8tEjrKNWoi0d+INN1f8DHCDAeZVhXpsSrNUEYiOo5l/1YFYp1+I9pL/K/kAssIXEOJHkcvHy4LpN4aSXDIGbPJuUAtNTAhWOUndR9xjvLdaDIr8azz5VG9a31JLIgh7OSlbBP1ltEsVVaiGS7QZyjL0y3NWnMKwfYvva5h833Q1wqsWsc5iOG2odZKXkKG5Ueg5pTm9ikN26CqtUCfmr+lb3szODFLURsag4lb7cRLzM1lCiXO/AbgYjomIl4jEY7H9dRBwpGEtQB3UKXyqQmgDqdz/TjvnUfPVO3tnRNCvI3WEO+ns48Oeqs/38L3R27kth3HNXYGQrbmQkhq0+RUxgvPbbfIp6mjygYZ9AAqOZcbCFHrJB9lyfXdQ4AdB7jZR7iz41OAEnmpc8Sw/Ip0/+d9lgFSa8vC+iKfmrqcQBqQU8zFuAr6z9tlA8+ZMDKo6gmcaa/odQvYB5R3/EwM4rRNmnCMQ+CPX08ehQjICl9C2UMSyNWCwm5EfF2OU0cHuGzQKwia1+s2lmyvMUOfi54P1pJUix+CUnN9VAQubJcVerH8mYRhJN8M0yFvH4jfsSNv/ZhGqzezwMuiSZTlg4Td3KOnePOC1ch3S25TzdOkCyeX9EKyR1wjycUBkhtiUBP/RHF25VkC/GfNwbLJngGyvP6B8txA6FhQHe9tlwla/f6uAgqN2QLoYwTxFm+i9hCr8GME1HdH4hBmxJ2QhGHBfEQSwXzvnx+HRwXzQl5b0g3rBqrxLsH0S+r1xd0wVKGBf8xICqbz+3U/tK6MtXmQeqzBkcOSThMcentyLd3Gg12UgmUZFeDx8FxZi+wGa+fZ7vhzNRWxxIghpANt/ssvRWFDmzX4DpPcuGzfW4R9etXjcIaB5N8tBV3imAiUR8H68jaYWtdgKZzCWYffuI u33ENWeR B0RPPQrns74ZrKGZkNddO/8Zg3NHHv3slQVaB4UQeEReuf9xZ8zuwIpmc+z37WYoEY7tGA4t9o7pRAabP/ol45+GFmWu4dmCmrivvaSTnSv3EKufcA1ufARBlbmJuGYCYoWvYf5Y29M2H0N2jLOrUYSJ3Jf4UldWxAC0AZFnQMMnEB+Bm5NVuY37KTGUACL0CVjyRhHykoI0oLwrcVhnBpv4nk1oQASXIbxTJE0KH2q3L3uG7r83Pnl2DHrAK81pb2fYlSvt4lEumzTvvrh1ddpxKxoocj/Bn6Gv1JhS7DZ10TNl+cP0TWtlRoIwFxsKn+NMk1IzNpb/7hQQd7o5+StD98GzMi0nb63qkDNTJiB1NWejCYqvkzOjJjLGLEOX5BsyxBRwl1d3LjMRBRoKKNvXfLR4B4q+5hmklWKYN3O1T2OmBFLgFCxxZKjFpczuLJ0ohNbSkRXAEwtKXRubmTfQstu8k4EmiNcq2XTAkWKcDwdzz9cd9+0RvJDJ8KELMwYxoqUOwT0YYz5HH80fiHieDVw== 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: List-Subscribe: List-Unsubscribe: Add functions that are called just before the per-section memmap is initialized and just before the memmap page structures are initialized. They are called sparse_vmemmap_init_nid_early and sparse_vmemmap_init_nid_late, respectively. This allows for mm subsystems to add calls to initialize memmap and page structures in a specific way, if using SPARSEMEM_VMEMMAP. Specifically, hugetlb can pre-HVO bootmem allocated pages that way, so that no time and resources are wasted on allocating vmemmap pages, only to free them later (and possibly unnecessarily running the system out of memory in the process). Refactor some code and export a few convenience functions for external use. In sparse_init_nid, skip any sections that are already initialized, e.g. they have been initialized by sparse_vmemmap_init_nid_early already. The hugetlb code to use these functions will be added in a later commit. Export section_map_size, as any alternate memmap init code will want to use it. THe config option to enable this is SPARSEMEM_VMEMMAP_PREINIT, which is dependent on and architecture-specific option, ARCH_WANT_SPARSEMEM_VMEMMAP_PREINIT. This is done because a section flag is used, and the number of flags available is architecture-dependent (see mmzone.h). Architecures can decide if there is room for the flag and enable the option. Fortunately, as of right now, all sparse vmemmap using architectures do have room. Signed-off-by: Frank van der Linden --- include/linux/mm.h | 1 + include/linux/mmzone.h | 35 +++++++++++++++++ mm/Kconfig | 8 ++++ mm/bootmem_info.c | 4 +- mm/mm_init.c | 3 ++ mm/sparse-vmemmap.c | 23 +++++++++++ mm/sparse.c | 87 ++++++++++++++++++++++++++++++++---------- 7 files changed, 139 insertions(+), 22 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 6dfc41b461af..df83653ed6e3 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3828,6 +3828,7 @@ static inline void print_vma_addr(char *prefix, unsigned long rip) #endif void *sparse_buffer_alloc(unsigned long size); +unsigned long section_map_size(void); struct page * __populate_section_memmap(unsigned long pfn, unsigned long nr_pages, int nid, struct vmem_altmap *altmap, struct dev_pagemap *pgmap); diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 9540b41894da..44ecb2f90db4 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1933,6 +1933,9 @@ enum { SECTION_IS_EARLY_BIT, #ifdef CONFIG_ZONE_DEVICE SECTION_TAINT_ZONE_DEVICE_BIT, +#endif +#ifdef CONFIG_SPARSEMEM_VMEMMAP_PREINIT + SECTION_IS_VMEMMAP_PREINIT_BIT, #endif SECTION_MAP_LAST_BIT, }; @@ -1944,6 +1947,9 @@ enum { #ifdef CONFIG_ZONE_DEVICE #define SECTION_TAINT_ZONE_DEVICE BIT(SECTION_TAINT_ZONE_DEVICE_BIT) #endif +#ifdef CONFIG_SPARSEMEM_VMEMMAP_PREINIT +#define SECTION_IS_VMEMMAP_PREINIT BIT(SECTION_IS_VMEMMAP_PREINIT_BIT) +#endif #define SECTION_MAP_MASK (~(BIT(SECTION_MAP_LAST_BIT) - 1)) #define SECTION_NID_SHIFT SECTION_MAP_LAST_BIT @@ -1998,6 +2004,30 @@ static inline int online_device_section(struct mem_section *section) } #endif +#ifdef CONFIG_SPARSEMEM_VMEMMAP_PREINIT +static inline int preinited_vmemmap_section(struct mem_section *section) +{ + return (section && + (section->section_mem_map & SECTION_IS_VMEMMAP_PREINIT)); +} + +void sparse_vmemmap_init_nid_early(int nid); +void sparse_vmemmap_init_nid_late(int nid); + +#else +static inline int preinited_vmemmap_section(struct mem_section *section) +{ + return 0; +} +static inline void sparse_vmemmap_init_nid_early(int nid) +{ +} + +static inline void sparse_vmemmap_init_nid_late(int nid) +{ +} +#endif + static inline int online_section_nr(unsigned long nr) { return online_section(__nr_to_section(nr)); @@ -2035,6 +2065,9 @@ static inline int pfn_section_valid(struct mem_section *ms, unsigned long pfn) } #endif +void sparse_init_early_section(int nid, struct page *map, unsigned long pnum, + unsigned long flags); + #ifndef CONFIG_HAVE_ARCH_PFN_VALID /** * pfn_valid - check if there is a valid memory map entry for a PFN @@ -2116,6 +2149,8 @@ void sparse_init(void); #else #define sparse_init() do {} while (0) #define sparse_index_init(_sec, _nid) do {} while (0) +#define sparse_vmemmap_init_nid_early(_nid, _use) do {} while (0) +#define sparse_vmemmap_init_nid_late(_nid) do {} while (0) #define pfn_in_present_section pfn_valid #define subsection_map_init(_pfn, _nr_pages) do {} while (0) #endif /* CONFIG_SPARSEMEM */ diff --git a/mm/Kconfig b/mm/Kconfig index 1b501db06417..f984dd928ce7 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -489,6 +489,14 @@ config SPARSEMEM_VMEMMAP SPARSEMEM_VMEMMAP uses a virtually mapped memmap to optimise pfn_to_page and page_to_pfn operations. This is the most efficient option when sufficient kernel resources are available. + +config ARCH_WANT_SPARSEMEM_VMEMMAP_PREINIT + bool + +config SPARSEMEM_VMEMMAP_PREINIT + bool "Early init of sparse memory virtual memmap" + depends on SPARSEMEM_VMEMMAP && ARCH_WANT_SPARSEMEM_VMEMMAP_PREINIT + default y # # Select this config option from the architecture Kconfig, if it is preferred # to enable the feature of HugeTLB/dev_dax vmemmap optimization. diff --git a/mm/bootmem_info.c b/mm/bootmem_info.c index 95f288169a38..b0e2a9fa641f 100644 --- a/mm/bootmem_info.c +++ b/mm/bootmem_info.c @@ -88,7 +88,9 @@ static void __init register_page_bootmem_info_section(unsigned long start_pfn) memmap = sparse_decode_mem_map(ms->section_mem_map, section_nr); - register_page_bootmem_memmap(section_nr, memmap, PAGES_PER_SECTION); + if (!preinited_vmemmap_section(ms)) + register_page_bootmem_memmap(section_nr, memmap, + PAGES_PER_SECTION); usage = ms->usage; page = virt_to_page(usage); diff --git a/mm/mm_init.c b/mm/mm_init.c index d2dee53e95dd..9f1e41c3dde6 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1862,6 +1862,9 @@ void __init free_area_init(unsigned long *max_zone_pfn) } } + for_each_node_state(nid, N_MEMORY) + sparse_vmemmap_init_nid_late(nid); + calc_nr_kernel_pages(); memmap_init(); diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index 3287ebadd167..8751c46c35e4 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -470,3 +470,26 @@ struct page * __meminit __populate_section_memmap(unsigned long pfn, return pfn_to_page(pfn); } + +#ifdef CONFIG_SPARSEMEM_VMEMMAP_PREINIT +/* + * This is called just before initializing sections for a NUMA node. + * Any special initialization that needs to be done before the + * generic initialization can be done from here. Sections that + * are initialized in hooks called from here will be skipped by + * the generic initialization. + */ +void __init sparse_vmemmap_init_nid_early(int nid) +{ +} + +/* + * This is called just before the initialization of page structures + * through memmap_init. Zones are now initialized, so any work that + * needs to be done that needs zone information can be done from + * here. + */ +void __init sparse_vmemmap_init_nid_late(int nid) +{ +} +#endif diff --git a/mm/sparse.c b/mm/sparse.c index 133b033d0cba..ee0234a77c7f 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -408,13 +408,13 @@ static void __init check_usemap_section_nr(int nid, #endif /* CONFIG_MEMORY_HOTREMOVE */ #ifdef CONFIG_SPARSEMEM_VMEMMAP -static unsigned long __init section_map_size(void) +unsigned long __init section_map_size(void) { return ALIGN(sizeof(struct page) * PAGES_PER_SECTION, PMD_SIZE); } #else -static unsigned long __init section_map_size(void) +unsigned long __init section_map_size(void) { return PAGE_ALIGN(sizeof(struct page) * PAGES_PER_SECTION); } @@ -495,6 +495,44 @@ void __weak __meminit vmemmap_populate_print_last(void) { } +static void *sparse_usagebuf __meminitdata; +static void *sparse_usagebuf_end __meminitdata; + +/* + * Helper function that is used for generic section initialization, and + * can also be used by any hooks added above. + */ +void __init sparse_init_early_section(int nid, struct page *map, + unsigned long pnum, unsigned long flags) +{ + BUG_ON(!sparse_usagebuf || sparse_usagebuf >= sparse_usagebuf_end); + check_usemap_section_nr(nid, sparse_usagebuf); + sparse_init_one_section(__nr_to_section(pnum), pnum, map, + sparse_usagebuf, SECTION_IS_EARLY | flags); + sparse_usagebuf = (void *)sparse_usagebuf + mem_section_usage_size(); +} + +static int __init sparse_usage_init(int nid, unsigned long map_count) +{ + unsigned long size; + + size = mem_section_usage_size() * map_count; + sparse_usagebuf = sparse_early_usemaps_alloc_pgdat_section( + NODE_DATA(nid), size); + if (!sparse_usagebuf) { + sparse_usagebuf_end = NULL; + return -ENOMEM; + } + + sparse_usagebuf_end = sparse_usagebuf + size; + return 0; +} + +static void __init sparse_usage_fini(void) +{ + sparse_usagebuf = sparse_usagebuf_end = NULL; +} + /* * Initialize sparse on a specific node. The node spans [pnum_begin, pnum_end) * And number of present sections in this node is map_count. @@ -503,47 +541,54 @@ static void __init sparse_init_nid(int nid, unsigned long pnum_begin, unsigned long pnum_end, unsigned long map_count) { - struct mem_section_usage *usage; unsigned long pnum; struct page *map; + struct mem_section *ms; - usage = sparse_early_usemaps_alloc_pgdat_section(NODE_DATA(nid), - mem_section_usage_size() * map_count); - if (!usage) { + if (sparse_usage_init(nid, map_count)) { pr_err("%s: node[%d] usemap allocation failed", __func__, nid); goto failed; } + sparse_buffer_init(map_count * section_map_size(), nid); + + sparse_vmemmap_init_nid_early(nid); + for_each_present_section_nr(pnum_begin, pnum) { unsigned long pfn = section_nr_to_pfn(pnum); if (pnum >= pnum_end) break; - map = __populate_section_memmap(pfn, PAGES_PER_SECTION, - nid, NULL, NULL); - if (!map) { - pr_err("%s: node[%d] memory map backing failed. Some memory will not be available.", - __func__, nid); - pnum_begin = pnum; - sparse_buffer_fini(); - goto failed; + ms = __nr_to_section(pnum); + if (!preinited_vmemmap_section(ms)) { + map = __populate_section_memmap(pfn, PAGES_PER_SECTION, + nid, NULL, NULL); + if (!map) { + pr_err("%s: node[%d] memory map backing failed. Some memory will not be available.", + __func__, nid); + pnum_begin = pnum; + sparse_usage_fini(); + sparse_buffer_fini(); + goto failed; + } + sparse_init_early_section(nid, map, pnum, 0); } - check_usemap_section_nr(nid, usage); - sparse_init_one_section(__nr_to_section(pnum), pnum, map, usage, - SECTION_IS_EARLY); - usage = (void *) usage + mem_section_usage_size(); } + sparse_usage_fini(); sparse_buffer_fini(); return; failed: - /* We failed to allocate, mark all the following pnums as not present */ + /* + * We failed to allocate, mark all the following pnums as not present, + * except the ones already initialized earlier. + */ for_each_present_section_nr(pnum_begin, pnum) { - struct mem_section *ms; - if (pnum >= pnum_end) break; ms = __nr_to_section(pnum); + if (!preinited_vmemmap_section(ms)) + ms->section_mem_map = 0; ms->section_mem_map = 0; } }