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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66DD9C43334 for ; Thu, 16 Jun 2022 03:57:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D186D6B0072; Wed, 15 Jun 2022 23:57:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CC7E66B0073; Wed, 15 Jun 2022 23:57:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B67B78D0001; Wed, 15 Jun 2022 23:57:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A44206B0072 for ; Wed, 15 Jun 2022 23:57:54 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 71F25212F2 for ; Thu, 16 Jun 2022 03:57:54 +0000 (UTC) X-FDA: 79582740468.16.BF41DB6 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf16.hostedemail.com (Postfix) with ESMTP id C9B9D180083 for ; Thu, 16 Jun 2022 03:57:53 +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 A64E21F98E; Thu, 16 Jun 2022 03:57:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1655351872; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=dxxafs0nnORNk79FDXK13oNViX136IuyHZDLyZrdYA4=; b=COcP7guBsOysmRwD23dQAQ9E0wsLVprhx4J43DId4i/Ien0OjmgGGxOEw+LOX8H9EsYzYx Tvsqv+gobQ90Y1F8LHG8KDNaDqV/2zfpnzT4knvOO3zvKOefgegHuu0n4epp4qI9th/nqO u6+9c59dpK2HzNassVN5qzzprGJd7Ew= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1655351872; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=dxxafs0nnORNk79FDXK13oNViX136IuyHZDLyZrdYA4=; b=L092PpnFy1P1QrwDm3vqZtea0spP4cUpyOAF/HHr7wEMrRvp3pU+G4sdgDbr70mP0aKo7j Cv2JLCprMsM4yuCQ== 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 E9D041344E; Thu, 16 Jun 2022 03:57:51 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id ZriANT+qqmKTLQAAMHmgww (envelope-from ); Thu, 16 Jun 2022 03:57:51 +0000 Date: Thu, 16 Jun 2022 05:57:50 +0200 From: Oscar Salvador To: David Hildenbrand Cc: Muchun Song , corbet@lwn.net, akpm@linux-foundation.org, paulmck@kernel.org, mike.kravetz@oracle.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, duanxiongchun@bytedance.com, smuchun@gmail.com Subject: Re: [PATCH v2 2/2] mm: memory_hotplug: introduce SECTION_CANNOT_OPTIMIZE_VMEMMAP Message-ID: References: <20220520025538.21144-1-songmuchun@bytedance.com> <20220520025538.21144-3-songmuchun@bytedance.com> <53024884-0182-df5f-9ca2-00652c64ce36@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <53024884-0182-df5f-9ca2-00652c64ce36@redhat.com> ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655351874; a=rsa-sha256; cv=none; b=bHXMygD97DCPApc1gJWKx0qx8m0lHfiSfxK2Ws3kZ/JUkEUz4SbUGMLHhNMCyp1nIeJ3h4 MK3ACdjeHumo2krrWdIFNHtHbcvDMJf8GpDWh/ArcbhKWS+dFpauGd30WUDg3SWQX9n5/b 9ME+K+yUUKk9ksdPdO3fo+K+6JyKJEE= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=COcP7guB; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=L092PpnF; spf=pass (imf16.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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655351874; 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=dxxafs0nnORNk79FDXK13oNViX136IuyHZDLyZrdYA4=; b=J4jvGjXJQltw0L4soHq6uj8Vt5Nr/gtbOgQcbWIbOxHpJL5a8bP3zpj/uHxAy3F5jQkxer u0y5KG5nVfbPPyMlqD1+TZV8vth6GAY91Cq7UwMhIqqfmFzDau9HbI9F3NpPNZh7mUEWJb 2bp8psYi9BdOR6HFU9PaJwCZnkAiUCE= X-Stat-Signature: buqdhzrtj18cywjw59zkqqsfdq1qx1ah X-Rspamd-Queue-Id: C9B9D180083 Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=COcP7guB; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=L092PpnF; spf=pass (imf16.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: rspam02 X-HE-Tag: 1655351873-505019 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: On Wed, Jun 15, 2022 at 11:51:49AM +0200, David Hildenbrand wrote: > An easier/future-proof approach might simply be flagging the vmemmap > pages as being special. We reuse page flags for that, which don't have > semantics yet (i.e., PG_reserved indicates a boot-time allocation via > memblock). The first versions of memmap_on_memory [1] introduced a new page type to represent such pages, not sure if that is what you mean, e.g: diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index f91cb8898ff0..75f302a532f9 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -708,6 +708,7 @@ PAGEFLAG_FALSE(DoubleMap) #define PG_kmemcg 0x00000200 #define PG_table 0x00000400 #define PG_guard 0x00000800 +#define PG_vmemmap 0x00001000 #define PageType(page, flag) \ ((page->page_type & (PAGE_TYPE_BASE | flag)) == PAGE_TYPE_BASE) @@ -764,6 +765,24 @@ PAGE_TYPE_OPS(Table, table) */ PAGE_TYPE_OPS(Guard, guard) +/* + * Vmemmap pages refers to those pages that are used to create the memmap + * array, and reside within the same memory range that was hotppluged, so + * they are self-hosted. (see include/linux/memory_hotplug.h) + */ +PAGE_TYPE_OPS(Vmemmap, vmemmap) +static __always_inline void SetPageVmemmap(struct page *page) +{ + __SetPageVmemmap(page); + __SetPageReserved(page); +} + +static __always_inline void ClearPageVmemmap(struct page *page) +{ + __ClearPageVmemmap(page); + __ClearPageReserved(page); +} [1] https://patchwork.kernel.org/project/linux-mm/patch/20190725160207.19579-3-osalvador@suse.de/ > > You'd walk the applicable vmemmap pages you want to optimize and check > if they are marked as special. You don't have to walk all but can > optimize: memmap_on_memory uses a vmemmap size that's at least PMD_SIZE. > So it's sufficient to check a single vmemmap page inside a PMD_SIZE > vmemmap range. > > > > Signed-off-by: Muchun Song > > --- > > Documentation/admin-guide/kernel-parameters.txt | 22 +++++++++---------- > > Documentation/admin-guide/sysctl/vm.rst | 5 ++--- > > include/linux/memory_hotplug.h | 9 -------- > > include/linux/mmzone.h | 17 +++++++++++++++ > > mm/hugetlb_vmemmap.c | 28 ++++++++++++++++++------- > > mm/memory_hotplug.c | 22 +++++++------------ > > mm/sparse.c | 8 +++++++ > > 7 files changed, 66 insertions(+), 45 deletions(-) > > > > diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt > > index c087f578d9d8..5359ffb04a84 100644 > > --- a/Documentation/admin-guide/kernel-parameters.txt > > +++ b/Documentation/admin-guide/kernel-parameters.txt > > @@ -1730,9 +1730,11 @@ > > Built with CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP_DEFAULT_ON=y, > > the default is on. > > > > - This is not compatible with memory_hotplug.memmap_on_memory. > > - If both parameters are enabled, hugetlb_free_vmemmap takes > > - precedence over memory_hotplug.memmap_on_memory. > > + Note that the vmemmap pages may be allocated from the added > > + memory block itself when memory_hotplug.memmap_on_memory is > > + enabled, those vmemmap pages cannot be optimized even if this > > + feature is enabled. Other vmemmap pages not allocated from > > + the added memory block itself do not be affected. > > > > hung_task_panic= > > [KNL] Should the hung task detector generate panics. > > @@ -3077,10 +3079,12 @@ > > [KNL,X86,ARM] Boolean flag to enable this feature. > > Format: {on | off (default)} > > When enabled, runtime hotplugged memory will > > - allocate its internal metadata (struct pages) > > - from the hotadded memory which will allow to > > - hotadd a lot of memory without requiring > > - additional memory to do so. > > + allocate its internal metadata (struct pages, > > + those vmemmap pages cannot be optimized even > > + if hugetlb_free_vmemmap is enabled) from the > > + hotadded memory which will allow to hotadd a > > + lot of memory without requiring additional > > + memory to do so. > > This feature is disabled by default because it > > has some implication on large (e.g. GB) > > allocations in some configurations (e.g. small > > @@ -3090,10 +3094,6 @@ > > Note that even when enabled, there are a few cases where > > the feature is not effective. > > > > - This is not compatible with hugetlb_free_vmemmap. If > > - both parameters are enabled, hugetlb_free_vmemmap takes > > - precedence over memory_hotplug.memmap_on_memory. > > - > > memtest= [KNL,X86,ARM,M68K,PPC,RISCV] Enable memtest > > Format: > > default : 0 > > diff --git a/Documentation/admin-guide/sysctl/vm.rst b/Documentation/admin-guide/sysctl/vm.rst > > index 5c9aa171a0d3..d7374a1e8ac9 100644 > > --- a/Documentation/admin-guide/sysctl/vm.rst > > +++ b/Documentation/admin-guide/sysctl/vm.rst > > @@ -565,9 +565,8 @@ See Documentation/admin-guide/mm/hugetlbpage.rst > > hugetlb_optimize_vmemmap > > ======================== > > > > -This knob is not available when memory_hotplug.memmap_on_memory (kernel parameter) > > -is configured or the size of 'struct page' (a structure defined in > > -include/linux/mm_types.h) is not power of two (an unusual system config could > > +This knob is not available when the size of 'struct page' (a structure defined > > +in include/linux/mm_types.h) is not power of two (an unusual system config could > > result in this). > > > > Enable (set to 1) or disable (set to 0) the feature of optimizing vmemmap pages > > diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h > > index 20d7edf62a6a..e0b2209ab71c 100644 > > --- a/include/linux/memory_hotplug.h > > +++ b/include/linux/memory_hotplug.h > > @@ -351,13 +351,4 @@ void arch_remove_linear_mapping(u64 start, u64 size); > > extern bool mhp_supports_memmap_on_memory(unsigned long size); > > #endif /* CONFIG_MEMORY_HOTPLUG */ > > > > -#ifdef CONFIG_MHP_MEMMAP_ON_MEMORY > > -bool mhp_memmap_on_memory(void); > > -#else > > -static inline bool mhp_memmap_on_memory(void) > > -{ > > - return false; > > -} > > -#endif > > - > > #endif /* __LINUX_MEMORY_HOTPLUG_H */ > > diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h > > index 2cf2a76535ab..607a4fcabbd4 100644 > > --- a/include/linux/mmzone.h > > +++ b/include/linux/mmzone.h > > @@ -1434,6 +1434,7 @@ extern size_t mem_section_usage_size(void); > > MAPPER(IS_ONLINE) \ > > MAPPER(IS_EARLY) \ > > MAPPER(TAINT_ZONE_DEVICE, CONFIG_ZONE_DEVICE) \ > > + MAPPER(CANNOT_OPTIMIZE_VMEMMAP, CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP) \ > > MAPPER(MAP_LAST_BIT) > > > > #define __SECTION_SHIFT_FLAG_MAPPER_0(x) > > @@ -1471,6 +1472,22 @@ static inline struct page *__section_mem_map_addr(struct mem_section *section) > > return (struct page *)map; > > } > > > > +#ifdef CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP > > +static inline void section_mark_cannot_optimize_vmemmap(struct mem_section *ms) > > +{ > > + ms->section_mem_map |= SECTION_CANNOT_OPTIMIZE_VMEMMAP; > > +} > > + > > +static inline int section_cannot_optimize_vmemmap(struct mem_section *ms) > > +{ > > + return (ms && (ms->section_mem_map & SECTION_CANNOT_OPTIMIZE_VMEMMAP)); > > +} > > +#else > > +static inline void section_mark_cannot_optimize_vmemmap(struct mem_section *ms) > > +{ > > +} > > +#endif > > + > > static inline int present_section(struct mem_section *section) > > { > > return (section && (section->section_mem_map & SECTION_MARKED_PRESENT)); > > diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c > > index fcd9f7872064..f12170520337 100644 > > --- a/mm/hugetlb_vmemmap.c > > +++ b/mm/hugetlb_vmemmap.c > > @@ -97,18 +97,32 @@ int hugetlb_vmemmap_alloc(struct hstate *h, struct page *head) > > return ret; > > } > > > > +static unsigned int optimizable_vmemmap_pages(struct hstate *h, > > + struct page *head) > > +{ > > + unsigned long pfn = page_to_pfn(head); > > + unsigned long end = pfn + pages_per_huge_page(h); > > + > > + if (READ_ONCE(vmemmap_optimize_mode) == VMEMMAP_OPTIMIZE_OFF) > > + return 0; > > + > > + for (; pfn < end; pfn += PAGES_PER_SECTION) { > > + if (section_cannot_optimize_vmemmap(__pfn_to_section(pfn))) > > + return 0; > > + } > > + > > + return hugetlb_optimize_vmemmap_pages(h); > > +} > > + > > void hugetlb_vmemmap_free(struct hstate *h, struct page *head) > > { > > unsigned long vmemmap_addr = (unsigned long)head; > > unsigned long vmemmap_end, vmemmap_reuse, vmemmap_pages; > > > > - vmemmap_pages = hugetlb_optimize_vmemmap_pages(h); > > + vmemmap_pages = optimizable_vmemmap_pages(h, head); > > if (!vmemmap_pages) > > return; > > > > - if (READ_ONCE(vmemmap_optimize_mode) == VMEMMAP_OPTIMIZE_OFF) > > - return; > > - > > static_branch_inc(&hugetlb_optimize_vmemmap_key); > > > > vmemmap_addr += RESERVE_VMEMMAP_SIZE; > > @@ -199,10 +213,10 @@ static struct ctl_table hugetlb_vmemmap_sysctls[] = { > > static __init int hugetlb_vmemmap_sysctls_init(void) > > { > > /* > > - * If "memory_hotplug.memmap_on_memory" is enabled or "struct page" > > - * crosses page boundaries, the vmemmap pages cannot be optimized. > > + * If "struct page" crosses page boundaries, the vmemmap pages cannot > > + * be optimized. > > */ > > - if (!mhp_memmap_on_memory() && is_power_of_2(sizeof(struct page))) > > + if (is_power_of_2(sizeof(struct page))) > > register_sysctl_init("vm", hugetlb_vmemmap_sysctls); > > > > return 0; > > diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c > > index 3b360eda933f..7309694c4dee 100644 > > --- a/mm/memory_hotplug.c > > +++ b/mm/memory_hotplug.c > > @@ -43,30 +43,22 @@ > > #include "shuffle.h" > > > > #ifdef CONFIG_MHP_MEMMAP_ON_MEMORY > > -static int memmap_on_memory_set(const char *val, const struct kernel_param *kp) > > -{ > > - if (hugetlb_optimize_vmemmap_enabled()) > > - return 0; > > - return param_set_bool(val, kp); > > -} > > - > > -static const struct kernel_param_ops memmap_on_memory_ops = { > > - .flags = KERNEL_PARAM_OPS_FL_NOARG, > > - .set = memmap_on_memory_set, > > - .get = param_get_bool, > > -}; > > - > > /* > > * memory_hotplug.memmap_on_memory parameter > > */ > > static bool memmap_on_memory __ro_after_init; > > -module_param_cb(memmap_on_memory, &memmap_on_memory_ops, &memmap_on_memory, 0444); > > +module_param(memmap_on_memory, bool, 0444); > > MODULE_PARM_DESC(memmap_on_memory, "Enable memmap on memory for memory hotplug"); > > > > -bool mhp_memmap_on_memory(void) > > +static inline bool mhp_memmap_on_memory(void) > > { > > return memmap_on_memory; > > } > > +#else > > +static inline bool mhp_memmap_on_memory(void) > > +{ > > + return false; > > +} > > #endif > > > > enum { > > diff --git a/mm/sparse.c b/mm/sparse.c > > index cb3bfae64036..1f353bf9ea6b 100644 > > --- a/mm/sparse.c > > +++ b/mm/sparse.c > > @@ -913,6 +913,14 @@ int __meminit sparse_add_section(int nid, unsigned long start_pfn, > > ms = __nr_to_section(section_nr); > > set_section_nid(section_nr, nid); > > __section_mark_present(ms, section_nr); > > + /* > > + * Mark whole section as non-optimizable once there is a subsection > > + * whose vmemmap pages are allocated from alternative allocator. The > > + * early section is always optimizable since the early section's > > + * vmemmap pages do not consider partially being populated. > > + */ > > + if (!early_section(ms) && altmap) > > + section_mark_cannot_optimize_vmemmap(ms); > > > > /* Align memmap to section boundary in the subsection case */ > > if (section_nr_to_pfn(section_nr) != start_pfn) > > > -- > Thanks, > > David / dhildenb > > -- Oscar Salvador SUSE Labs