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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 CF3C4C4361B for ; Wed, 16 Dec 2020 14:41:00 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 324F0233EB for ; Wed, 16 Dec 2020 14:41:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 324F0233EB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 592A96B0070; Wed, 16 Dec 2020 09:40:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 543CA6B0071; Wed, 16 Dec 2020 09:40:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 458236B0072; Wed, 16 Dec 2020 09:40:59 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0221.hostedemail.com [216.40.44.221]) by kanga.kvack.org (Postfix) with ESMTP id 2F6D06B0070 for ; Wed, 16 Dec 2020 09:40:59 -0500 (EST) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id E5BDA1EE6 for ; Wed, 16 Dec 2020 14:40:58 +0000 (UTC) X-FDA: 77599407396.29.pest38_13110fc2742c Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id C164A18085D16 for ; Wed, 16 Dec 2020 14:40:58 +0000 (UTC) X-HE-Tag: pest38_13110fc2742c X-Filterd-Recvd-Size: 7488 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Wed, 16 Dec 2020 14:40:58 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id C38AEAC7F; Wed, 16 Dec 2020 14:40:56 +0000 (UTC) Date: Wed, 16 Dec 2020 15:40:53 +0100 From: Oscar Salvador To: Muchun Song Cc: 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, willy@infradead.org, mhocko@suse.com, song.bao.hua@hisilicon.com, david@redhat.com, duanxiongchun@bytedance.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH v9 08/11] mm/hugetlb: Add a kernel parameter hugetlb_free_vmemmap Message-ID: <20201216144052.GF29394@linux> References: <20201213154534.54826-1-songmuchun@bytedance.com> <20201213154534.54826-9-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201213154534.54826-9-songmuchun@bytedance.com> User-Agent: Mutt/1.10.1 (2018-07-13) 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 Sun, Dec 13, 2020 at 11:45:31PM +0800, Muchun Song wrote: > Add a kernel parameter hugetlb_free_vmemmap to disable the feature of > freeing unused vmemmap pages associated with each hugetlb page on boot. I guess this should read "to enable the feature"? AFAICS, it is disabled by default. > Signed-off-by: Muchun Song Reviewed-by: Oscar Salvador > --- > Documentation/admin-guide/kernel-parameters.txt | 9 +++++++++ > Documentation/admin-guide/mm/hugetlbpage.rst | 3 +++ > arch/x86/mm/init_64.c | 8 ++++++-- > include/linux/hugetlb.h | 19 +++++++++++++++++++ > mm/hugetlb_vmemmap.c | 16 ++++++++++++++++ > 5 files changed, 53 insertions(+), 2 deletions(-) > > diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt > index 3ae25630a223..9e6854f21d55 100644 > --- a/Documentation/admin-guide/kernel-parameters.txt > +++ b/Documentation/admin-guide/kernel-parameters.txt > @@ -1551,6 +1551,15 @@ > Documentation/admin-guide/mm/hugetlbpage.rst. > Format: size[KMG] > > + hugetlb_free_vmemmap= > + [KNL] When CONFIG_HUGETLB_PAGE_FREE_VMEMMAP is set, > + this controls freeing unused vmemmap pages associated > + with each HugeTLB page. > + Format: { on | off (default) } > + > + on: enable the feature > + off: disable the feature > + > hung_task_panic= > [KNL] Should the hung task detector generate panics. > Format: 0 | 1 > diff --git a/Documentation/admin-guide/mm/hugetlbpage.rst b/Documentation/admin-guide/mm/hugetlbpage.rst > index f7b1c7462991..3a23c2377acc 100644 > --- a/Documentation/admin-guide/mm/hugetlbpage.rst > +++ b/Documentation/admin-guide/mm/hugetlbpage.rst > @@ -145,6 +145,9 @@ default_hugepagesz > > will all result in 256 2M huge pages being allocated. Valid default > huge page size is architecture dependent. > +hugetlb_free_vmemmap > + When CONFIG_HUGETLB_PAGE_FREE_VMEMMAP is set, this enables freeing > + unused vmemmap pages associated with each HugeTLB page. > > When multiple huge page sizes are supported, ``/proc/sys/vm/nr_hugepages`` > indicates the current number of pre-allocated huge pages of the default size. > diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c > index 0435bee2e172..1bce5f20e6ca 100644 > --- a/arch/x86/mm/init_64.c > +++ b/arch/x86/mm/init_64.c > @@ -34,6 +34,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -1557,7 +1558,8 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, > { > int err; > > - if (end - start < PAGES_PER_SECTION * sizeof(struct page)) > + if (is_hugetlb_free_vmemmap_enabled() || > + end - start < PAGES_PER_SECTION * sizeof(struct page)) > err = vmemmap_populate_basepages(start, end, node, NULL); > else if (boot_cpu_has(X86_FEATURE_PSE)) > err = vmemmap_populate_hugepages(start, end, node, altmap); > @@ -1585,6 +1587,8 @@ void register_page_bootmem_memmap(unsigned long section_nr, > pmd_t *pmd; > unsigned int nr_pmd_pages; > struct page *page; > + bool base_mapping = !boot_cpu_has(X86_FEATURE_PSE) || > + is_hugetlb_free_vmemmap_enabled(); > > for (; addr < end; addr = next) { > pte_t *pte = NULL; > @@ -1610,7 +1614,7 @@ void register_page_bootmem_memmap(unsigned long section_nr, > } > get_page_bootmem(section_nr, pud_page(*pud), MIX_SECTION_INFO); > > - if (!boot_cpu_has(X86_FEATURE_PSE)) { > + if (base_mapping) { > next = (addr + PAGE_SIZE) & PAGE_MASK; > pmd = pmd_offset(pud, addr); > if (pmd_none(*pmd)) > diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h > index ebca2ef02212..7f47f0eeca3b 100644 > --- a/include/linux/hugetlb.h > +++ b/include/linux/hugetlb.h > @@ -770,6 +770,20 @@ static inline void huge_ptep_modify_prot_commit(struct vm_area_struct *vma, > } > #endif > > +#ifdef CONFIG_HUGETLB_PAGE_FREE_VMEMMAP > +extern bool hugetlb_free_vmemmap_enabled; > + > +static inline bool is_hugetlb_free_vmemmap_enabled(void) > +{ > + return hugetlb_free_vmemmap_enabled; > +} > +#else > +static inline bool is_hugetlb_free_vmemmap_enabled(void) > +{ > + return false; > +} > +#endif > + > #else /* CONFIG_HUGETLB_PAGE */ > struct hstate {}; > > @@ -923,6 +937,11 @@ static inline void set_huge_swap_pte_at(struct mm_struct *mm, unsigned long addr > pte_t *ptep, pte_t pte, unsigned long sz) > { > } > + > +static inline bool is_hugetlb_free_vmemmap_enabled(void) > +{ > + return false; > +} > #endif /* CONFIG_HUGETLB_PAGE */ > > static inline spinlock_t *huge_pte_lock(struct hstate *h, > diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c > index 02201c2e3dfa..64ad929cac61 100644 > --- a/mm/hugetlb_vmemmap.c > +++ b/mm/hugetlb_vmemmap.c > @@ -180,6 +180,22 @@ > #define RESERVE_VMEMMAP_NR 2U > #define RESERVE_VMEMMAP_SIZE (RESERVE_VMEMMAP_NR << PAGE_SHIFT) > > +bool hugetlb_free_vmemmap_enabled; > + > +static int __init early_hugetlb_free_vmemmap_param(char *buf) > +{ > + if (!buf) > + return -EINVAL; > + > + if (!strcmp(buf, "on")) > + hugetlb_free_vmemmap_enabled = true; > + else if (strcmp(buf, "off")) > + return -EINVAL; > + > + return 0; > +} > +early_param("hugetlb_free_vmemmap", early_hugetlb_free_vmemmap_param); > + > static inline unsigned long free_vmemmap_pages_size_per_hpage(struct hstate *h) > { > return (unsigned long)free_vmemmap_pages_per_hpage(h) << PAGE_SHIFT; > -- > 2.11.0 > -- Oscar Salvador SUSE L3