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=-13.7 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 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 DE37AC4361A for ; Fri, 4 Dec 2020 00:01:49 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E063022224 for ; Fri, 4 Dec 2020 00:01:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E063022224 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=hisilicon.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id E07B76B0036; Thu, 3 Dec 2020 19:01:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DDFD76B005C; Thu, 3 Dec 2020 19:01:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CCE4E6B0068; Thu, 3 Dec 2020 19:01:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0064.hostedemail.com [216.40.44.64]) by kanga.kvack.org (Postfix) with ESMTP id B72906B0036 for ; Thu, 3 Dec 2020 19:01:47 -0500 (EST) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 77E053637 for ; Fri, 4 Dec 2020 00:01:47 +0000 (UTC) X-FDA: 77553646254.20.game96_5b14cb2273c0 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin20.hostedemail.com (Postfix) with ESMTP id 578E9180C07AF for ; Fri, 4 Dec 2020 00:01:47 +0000 (UTC) X-HE-Tag: game96_5b14cb2273c0 X-Filterd-Recvd-Size: 10118 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Fri, 4 Dec 2020 00:01:46 +0000 (UTC) Received: from DGGEMM401-HUB.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4CnCXf671Nz50N9; Fri, 4 Dec 2020 08:01:06 +0800 (CST) Received: from dggemi761-chm.china.huawei.com (10.1.198.147) by DGGEMM401-HUB.china.huawei.com (10.3.20.209) with Microsoft SMTP Server (TLS) id 14.3.487.0; Fri, 4 Dec 2020 08:01:41 +0800 Received: from dggemi761-chm.china.huawei.com (10.1.198.147) by dggemi761-chm.china.huawei.com (10.1.198.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1913.5; Fri, 4 Dec 2020 08:01:41 +0800 Received: from dggemi761-chm.china.huawei.com ([10.9.49.202]) by dggemi761-chm.china.huawei.com ([10.9.49.202]) with mapi id 15.01.1913.007; Fri, 4 Dec 2020 08:01:41 +0800 From: "Song Bao Hua (Barry Song)" To: Muchun Song , "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" , "osalvador@suse.de" , "mhocko@suse.com" CC: "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 v7 13/15] mm/hugetlb: Add a kernel parameter hugetlb_free_vmemmap Thread-Topic: [PATCH v7 13/15] mm/hugetlb: Add a kernel parameter hugetlb_free_vmemmap Thread-Index: AQHWxyyEW8/tZjAAjUGQxE1fk3rBGKnmEXCA Date: Fri, 4 Dec 2020 00:01:41 +0000 Message-ID: References: <20201130151838.11208-1-songmuchun@bytedance.com> <20201130151838.11208-14-songmuchun@bytedance.com> In-Reply-To: <20201130151838.11208-14-songmuchun@bytedance.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.126.201.153] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-CFilter-Loop: Reflected 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: > -----Original Message----- > From: Muchun Song [mailto:songmuchun@bytedance.com] > Sent: Tuesday, December 1, 2020 4:19 AM > 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; > willy@infradead.org; osalvador@suse.de; mhocko@suse.com; Song Bao Hua (Ba= rry > Song) > Cc: duanxiongchun@bytedance.com; linux-doc@vger.kernel.org; > linux-kernel@vger.kernel.org; linux-mm@kvack.org; > linux-fsdevel@vger.kernel.org; Muchun Song > Subject: [PATCH v7 13/15] mm/hugetlb: Add a kernel parameter > hugetlb_free_vmemmap >=20 > Add a kernel parameter hugetlb_free_vmemmap to disable the feature of > freeing unused vmemmap pages associated with each hugetlb page on boot. >=20 > Signed-off-by: Muchun Song Reviewed-by: Barry Song > --- > Documentation/admin-guide/kernel-parameters.txt | 9 +++++++++ > Documentation/admin-guide/mm/hugetlbpage.rst | 3 +++ > arch/x86/mm/init_64.c | 5 +++-- > include/linux/hugetlb.h | 19 +++++++++++++++++++ > mm/hugetlb_vmemmap.c | 18 +++++++++++++++++- > 5 files changed, 51 insertions(+), 3 deletions(-) >=20 > 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] >=20 > + hugetlb_free_vmemmap=3D > + [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=3D > [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..6a8b57f6d3b7 100644 > --- a/Documentation/admin-guide/mm/hugetlbpage.rst > +++ b/Documentation/admin-guide/mm/hugetlbpage.rst > @@ -145,6 +145,9 @@ default_hugepagesz >=20 > 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 each HugeTLB page. >=20 > 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 155cb06a6961..fcdc020904a8 100644 > --- a/arch/x86/mm/init_64.c > +++ b/arch/x86/mm/init_64.c > @@ -34,6 +34,7 @@ > #include > #include > #include > +#include >=20 > #include > #include > @@ -1557,7 +1558,7 @@ int __meminit vmemmap_populate(unsigned long start, > unsigned long end, int node, > { > int err; >=20 > - if (IS_ENABLED(CONFIG_HUGETLB_PAGE_FREE_VMEMMAP)) > + if (is_hugetlb_free_vmemmap_enabled()) > err =3D vmemmap_populate_basepages(start, end, node, NULL); > else if (end - start < PAGES_PER_SECTION * sizeof(struct page)) > err =3D vmemmap_populate_basepages(start, end, node, NULL); > @@ -1613,7 +1614,7 @@ void register_page_bootmem_memmap(unsigned long > section_nr, > get_page_bootmem(section_nr, pud_page(*pud), MIX_SECTION_INFO); >=20 > if (!boot_cpu_has(X86_FEATURE_PSE) || > - IS_ENABLED(CONFIG_HUGETLB_PAGE_FREE_VMEMMAP)) { > + is_hugetlb_free_vmemmap_enabled()) { > next =3D (addr + PAGE_SIZE) & PAGE_MASK; > pmd =3D pmd_offset(pud, addr); > if (pmd_none(*pmd)) > diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h > index 4efeccb7192c..66d82ae7b712 100644 > --- a/include/linux/hugetlb.h > +++ b/include/linux/hugetlb.h > @@ -773,6 +773,20 @@ static inline void huge_ptep_modify_prot_commit(stru= ct > vm_area_struct *vma, > } > #endif >=20 > +#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 {}; >=20 > @@ -926,6 +940,11 @@ static inline void set_huge_swap_pte_at(struct mm_st= ruct > *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 */ >=20 > static inline spinlock_t *huge_pte_lock(struct hstate *h, > diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c > index a3714db7f400..ebc710d148e4 100644 > --- a/mm/hugetlb_vmemmap.c > +++ b/mm/hugetlb_vmemmap.c > @@ -131,6 +131,21 @@ typedef void (*vmemmap_remap_pte_func_t)(struct page > *reuse, pte_t *pte, > unsigned long start, unsigned long end, > void *priv); >=20 > +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 =3D true; > + else if (strcmp(buf, "off")) > + return -EINVAL; > + > + return 0; > +} > +early_param("hugetlb_free_vmemmap", early_hugetlb_free_vmemmap_param); >=20 > static inline unsigned int vmemmap_pages_per_hpage(struct hstate *h) > { > @@ -325,7 +340,8 @@ void __init hugetlb_vmemmap_init(struct hstate *h) > unsigned int nr_pages =3D pages_per_huge_page(h); > unsigned int vmemmap_pages; >=20 > - if (!is_power_of_2(sizeof(struct page))) { > + if (!is_power_of_2(sizeof(struct page)) || > + !hugetlb_free_vmemmap_enabled) { > pr_info("disable freeing vmemmap pages for %s\n", h->name); > return; > } > -- > 2.11.0 Thanks Barry