From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FFA2C433E2 for ; Tue, 15 Sep 2020 13:00:30 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9F06920756 for ; Tue, 15 Sep 2020 13:00:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bytedance-com.20150623.gappssmtp.com header.i=@bytedance-com.20150623.gappssmtp.com header.b="GgmCZYpj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F06920756 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 09772900037; Tue, 15 Sep 2020 09:00:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 044E66B00A5; Tue, 15 Sep 2020 09:00:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E4EE3900037; Tue, 15 Sep 2020 09:00:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0024.hostedemail.com [216.40.44.24]) by kanga.kvack.org (Postfix) with ESMTP id C45186B00A4 for ; Tue, 15 Sep 2020 09:00:28 -0400 (EDT) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 7A3C0181AC553 for ; Tue, 15 Sep 2020 13:00:28 +0000 (UTC) X-FDA: 77265304536.11.wind82_1f1066a27111 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin11.hostedemail.com (Postfix) with ESMTP id C18F8180F9825 for ; Tue, 15 Sep 2020 13:00:21 +0000 (UTC) X-HE-Tag: wind82_1f1066a27111 X-Filterd-Recvd-Size: 13973 Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by imf07.hostedemail.com (Postfix) with ESMTP for ; Tue, 15 Sep 2020 13:00:19 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id bd2so1301629plb.7 for ; Tue, 15 Sep 2020 06:00:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8DeR6uCzjtGkfSrSPVsevsVb+uX4MzvHGApgHXTvvUU=; b=GgmCZYpjjGYQ+i7JTgVfCqcMV19OllOjnimbgEh4KD68EpHT1ZrY5UXaJHwW8FUksy VtLEaCoGgXbWy9FiG8ouh4dqVnM2lKHiBWFfKq8c0LfnyMZoi466aHtHjh3VOWx937uB gK2s8ECAvT+FtcYzYs62l9997QgtXzGo4+MdxyxGS72Ts2/tQRzNFTLFMNcXf5ge9iF0 CkKEyt9lUChQI4dZ5gG38O0mDV72IoRwnVvF02mReAUpLlG4NObetw+/zOq+6EEDXd0j 4iENtSW7dUv3yR1JFX6hlWO0E3W9BE5cO7RK5K7kAtgs5UYPJUw5/GrucGpTX5fx3e4C anMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8DeR6uCzjtGkfSrSPVsevsVb+uX4MzvHGApgHXTvvUU=; b=Iq39+ymRecN1ykntOQ4tMpguhG1u0Ryb1CFyO0HdHKLU01dtzqoYFhPFS7lUQXRsfX WuwMiQSGrhYYSLPFVUMMrO9YMT+VlqRIXS32Ss8ar3BNk59OTgsdlOrgDiW4nPuPw4TA 4XsyBqvz/9RQteiqXo7lgd4kgl45HioUUzf+OGhTkqIh3KVJEfSe+Nhu5YPn0O/rlz+6 cupZi0oAO7zh/XL9du+SN8K4siRDIDBXsDQqKoehInpONRNPppMNxqLEYmSjP8noZ/C0 JeVzP1gcTVp7EdL4Mc5TMB6x/5A8lkioCzOzVE0kbLo3dFC+NPRUrIgaoqmGtNSWhndQ bdwA== X-Gm-Message-State: AOAM530k4gGCmV6FFIzV827JpkkPChxzF0Fn/+nWYFnU13rq7/Nn0ayz sSh2EGLwIXX30T67QljSVIUI5Q== X-Google-Smtp-Source: ABdhPJxu7cY6/i1C0V0XQr412JG0Pp/ta/9zN44Xbi2aWgCow/XMuUpaSqNEvok+rqjE/CCZypwPRg== X-Received: by 2002:a17:902:eec7:b029:d1:c2e4:6b58 with SMTP id h7-20020a170902eec7b02900d1c2e46b58mr11022576plb.4.1600174818384; Tue, 15 Sep 2020 06:00:18 -0700 (PDT) Received: from localhost.bytedance.net ([103.136.220.66]) by smtp.gmail.com with ESMTPSA id w185sm14269855pfc.36.2020.09.15.06.00.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Sep 2020 06:00:17 -0700 (PDT) From: Muchun Song To: corbet@lwn.net, mike.kravetz@oracle.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, viro@zeniv.linux.org.uk, akpm@linux-foundation.org, paulmck@kernel.org, mchehab+huawei@kernel.org, pawan.kumar.gupta@linux.intel.com, rdunlap@infradead.org, oneukum@suse.com, anshuman.khandual@arm.com, jroedel@suse.de, almasrymina@google.com, rientjes@google.com Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Muchun Song Subject: [RFC PATCH 01/24] mm/memory_hotplug: Move bootmem info registration API to bootmem_info.c Date: Tue, 15 Sep 2020 20:59:24 +0800 Message-Id: <20200915125947.26204-2-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20200915125947.26204-1-songmuchun@bytedance.com> References: <20200915125947.26204-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: C18F8180F9825 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 Content-Transfer-Encoding: quoted-printable 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: Move bootmem info registration common API to individual bootmem_info.c for later patch use. Signed-off-by: Muchun Song --- arch/x86/mm/init_64.c | 1 + include/linux/bootmem_info.h | 27 ++++++++++ include/linux/memory_hotplug.h | 23 -------- mm/Makefile | 1 + mm/bootmem_info.c | 99 ++++++++++++++++++++++++++++++++++ mm/memory_hotplug.c | 91 +------------------------------ 6 files changed, 129 insertions(+), 113 deletions(-) create mode 100644 include/linux/bootmem_info.h create mode 100644 mm/bootmem_info.c diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index b5a3fa4033d3..c7f7ad55b625 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -33,6 +33,7 @@ #include #include #include +#include =20 #include #include diff --git a/include/linux/bootmem_info.h b/include/linux/bootmem_info.h new file mode 100644 index 000000000000..65bb9b23140f --- /dev/null +++ b/include/linux/bootmem_info.h @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LINUX_BOOTMEM_INFO_H +#define __LINUX_BOOTMEM_INFO_H + +#include + +/* + * Types for free bootmem stored in page->lru.next. These have to be in + * some random range in unsigned long space for debugging purposes. + */ +enum { + MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE =3D 12, + SECTION_INFO =3D MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE, + MIX_SECTION_INFO, + NODE_INFO, + MEMORY_HOTPLUG_MAX_BOOTMEM_TYPE =3D NODE_INFO, +}; + +#ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE +void __init register_page_bootmem_info_node(struct pglist_data *pgdat); +#else +static inline void register_page_bootmem_info_node(struct pglist_data *p= gdat) +{ +} +#endif + +#endif /* __LINUX_BOOTMEM_INFO_H */ diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplu= g.h index 51a877fec8da..19e5d067294c 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -33,18 +33,6 @@ struct vmem_altmap; ___page; \ }) =20 -/* - * Types for free bootmem stored in page->lru.next. These have to be in - * some random range in unsigned long space for debugging purposes. - */ -enum { - MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE =3D 12, - SECTION_INFO =3D MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE, - MIX_SECTION_INFO, - NODE_INFO, - MEMORY_HOTPLUG_MAX_BOOTMEM_TYPE =3D NODE_INFO, -}; - /* Types for control the zone type of onlined and offlined memory */ enum { /* Offline the memory. */ @@ -209,13 +197,6 @@ static inline void arch_refresh_nodedata(int nid, pg= _data_t *pgdat) #endif /* CONFIG_NUMA */ #endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */ =20 -#ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE -extern void __init register_page_bootmem_info_node(struct pglist_data *p= gdat); -#else -static inline void register_page_bootmem_info_node(struct pglist_data *p= gdat) -{ -} -#endif extern void put_page_bootmem(struct page *page); extern void get_page_bootmem(unsigned long ingo, struct page *page, unsigned long type); @@ -254,10 +235,6 @@ static inline int mhp_notimplemented(const char *fun= c) return -ENOSYS; } =20 -static inline void register_page_bootmem_info_node(struct pglist_data *p= gdat) -{ -} - static inline int try_online_node(int nid) { return 0; diff --git a/mm/Makefile b/mm/Makefile index d5649f1c12c0..752111587c99 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -82,6 +82,7 @@ obj-$(CONFIG_SLAB) +=3D slab.o obj-$(CONFIG_SLUB) +=3D slub.o obj-$(CONFIG_KASAN) +=3D kasan/ obj-$(CONFIG_FAILSLAB) +=3D failslab.o +obj-$(CONFIG_HAVE_BOOTMEM_INFO_NODE) +=3D bootmem_info.o obj-$(CONFIG_MEMORY_HOTPLUG) +=3D memory_hotplug.o obj-$(CONFIG_MEMTEST) +=3D memtest.o obj-$(CONFIG_MIGRATION) +=3D migrate.o diff --git a/mm/bootmem_info.c b/mm/bootmem_info.c new file mode 100644 index 000000000000..39fa8fc120bc --- /dev/null +++ b/mm/bootmem_info.c @@ -0,0 +1,99 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * linux/mm/bootmem_info.c + * + * Copyright (C) + */ +#include +#include +#include +#include +#include + +#ifndef CONFIG_SPARSEMEM_VMEMMAP +static void register_page_bootmem_info_section(unsigned long start_pfn) +{ + unsigned long mapsize, section_nr, i; + struct mem_section *ms; + struct page *page, *memmap; + struct mem_section_usage *usage; + + section_nr =3D pfn_to_section_nr(start_pfn); + ms =3D __nr_to_section(section_nr); + + /* Get section's memmap address */ + memmap =3D sparse_decode_mem_map(ms->section_mem_map, section_nr); + + /* + * Get page for the memmap's phys address + * XXX: need more consideration for sparse_vmemmap... + */ + page =3D virt_to_page(memmap); + mapsize =3D sizeof(struct page) * PAGES_PER_SECTION; + mapsize =3D PAGE_ALIGN(mapsize) >> PAGE_SHIFT; + + /* remember memmap's page */ + for (i =3D 0; i < mapsize; i++, page++) + get_page_bootmem(section_nr, page, SECTION_INFO); + + usage =3D ms->usage; + page =3D virt_to_page(usage); + + mapsize =3D PAGE_ALIGN(mem_section_usage_size()) >> PAGE_SHIFT; + + for (i =3D 0; i < mapsize; i++, page++) + get_page_bootmem(section_nr, page, MIX_SECTION_INFO); + +} +#else /* CONFIG_SPARSEMEM_VMEMMAP */ +static void register_page_bootmem_info_section(unsigned long start_pfn) +{ + unsigned long mapsize, section_nr, i; + struct mem_section *ms; + struct page *page, *memmap; + struct mem_section_usage *usage; + + section_nr =3D pfn_to_section_nr(start_pfn); + ms =3D __nr_to_section(section_nr); + + memmap =3D sparse_decode_mem_map(ms->section_mem_map, section_nr); + + register_page_bootmem_memmap(section_nr, memmap, PAGES_PER_SECTION); + + usage =3D ms->usage; + page =3D virt_to_page(usage); + + mapsize =3D PAGE_ALIGN(mem_section_usage_size()) >> PAGE_SHIFT; + + for (i =3D 0; i < mapsize; i++, page++) + get_page_bootmem(section_nr, page, MIX_SECTION_INFO); +} +#endif /* !CONFIG_SPARSEMEM_VMEMMAP */ + +void __init register_page_bootmem_info_node(struct pglist_data *pgdat) +{ + unsigned long i, pfn, end_pfn, nr_pages; + int node =3D pgdat->node_id; + struct page *page; + + nr_pages =3D PAGE_ALIGN(sizeof(struct pglist_data)) >> PAGE_SHIFT; + page =3D virt_to_page(pgdat); + + for (i =3D 0; i < nr_pages; i++, page++) + get_page_bootmem(node, page, NODE_INFO); + + pfn =3D pgdat->node_start_pfn; + end_pfn =3D pgdat_end_pfn(pgdat); + + /* register section info */ + for (; pfn < end_pfn; pfn +=3D PAGES_PER_SECTION) { + /* + * Some platforms can assign the same pfn to multiple nodes - on + * node0 as well as nodeN. To avoid registering a pfn against + * multiple nodes we check that this pfn does not already + * reside in some other nodes. + */ + if (pfn_valid(pfn) && (early_pfn_to_nid(pfn) =3D=3D node)) + register_page_bootmem_info_section(pfn); + } +} diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index baded53b9ff9..2da4ad071456 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -167,96 +168,6 @@ void put_page_bootmem(struct page *page) } } =20 -#ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE -#ifndef CONFIG_SPARSEMEM_VMEMMAP -static void register_page_bootmem_info_section(unsigned long start_pfn) -{ - unsigned long mapsize, section_nr, i; - struct mem_section *ms; - struct page *page, *memmap; - struct mem_section_usage *usage; - - section_nr =3D pfn_to_section_nr(start_pfn); - ms =3D __nr_to_section(section_nr); - - /* Get section's memmap address */ - memmap =3D sparse_decode_mem_map(ms->section_mem_map, section_nr); - - /* - * Get page for the memmap's phys address - * XXX: need more consideration for sparse_vmemmap... - */ - page =3D virt_to_page(memmap); - mapsize =3D sizeof(struct page) * PAGES_PER_SECTION; - mapsize =3D PAGE_ALIGN(mapsize) >> PAGE_SHIFT; - - /* remember memmap's page */ - for (i =3D 0; i < mapsize; i++, page++) - get_page_bootmem(section_nr, page, SECTION_INFO); - - usage =3D ms->usage; - page =3D virt_to_page(usage); - - mapsize =3D PAGE_ALIGN(mem_section_usage_size()) >> PAGE_SHIFT; - - for (i =3D 0; i < mapsize; i++, page++) - get_page_bootmem(section_nr, page, MIX_SECTION_INFO); - -} -#else /* CONFIG_SPARSEMEM_VMEMMAP */ -static void register_page_bootmem_info_section(unsigned long start_pfn) -{ - unsigned long mapsize, section_nr, i; - struct mem_section *ms; - struct page *page, *memmap; - struct mem_section_usage *usage; - - section_nr =3D pfn_to_section_nr(start_pfn); - ms =3D __nr_to_section(section_nr); - - memmap =3D sparse_decode_mem_map(ms->section_mem_map, section_nr); - - register_page_bootmem_memmap(section_nr, memmap, PAGES_PER_SECTION); - - usage =3D ms->usage; - page =3D virt_to_page(usage); - - mapsize =3D PAGE_ALIGN(mem_section_usage_size()) >> PAGE_SHIFT; - - for (i =3D 0; i < mapsize; i++, page++) - get_page_bootmem(section_nr, page, MIX_SECTION_INFO); -} -#endif /* !CONFIG_SPARSEMEM_VMEMMAP */ - -void __init register_page_bootmem_info_node(struct pglist_data *pgdat) -{ - unsigned long i, pfn, end_pfn, nr_pages; - int node =3D pgdat->node_id; - struct page *page; - - nr_pages =3D PAGE_ALIGN(sizeof(struct pglist_data)) >> PAGE_SHIFT; - page =3D virt_to_page(pgdat); - - for (i =3D 0; i < nr_pages; i++, page++) - get_page_bootmem(node, page, NODE_INFO); - - pfn =3D pgdat->node_start_pfn; - end_pfn =3D pgdat_end_pfn(pgdat); - - /* register section info */ - for (; pfn < end_pfn; pfn +=3D PAGES_PER_SECTION) { - /* - * Some platforms can assign the same pfn to multiple nodes - on - * node0 as well as nodeN. To avoid registering a pfn against - * multiple nodes we check that this pfn does not already - * reside in some other nodes. - */ - if (pfn_valid(pfn) && (early_pfn_to_nid(pfn) =3D=3D node)) - register_page_bootmem_info_section(pfn); - } -} -#endif /* CONFIG_HAVE_BOOTMEM_INFO_NODE */ - static int check_pfn_span(unsigned long pfn, unsigned long nr_pages, const char *reason) { --=20 2.20.1