From: Miaohe Lin <linmiaohe@huawei.com>
To: Muchun Song <songmuchun@bytedance.com>
Cc: <duanxiongchun@bytedance.com>, <linux-doc@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-mm@kvack.org>,
<linux-fsdevel@vger.kernel.org>, <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@hisilicon.com>, <david@redhat.com>,
<naoya.horiguchi@nec.com>
Subject: Re: [PATCH v14 6/8] mm: hugetlb: introduce nr_free_vmemmap_pages in the struct hstate
Date: Fri, 5 Feb 2021 15:29:43 +0800 [thread overview]
Message-ID: <42c8272a-f170-b27e-af5e-a7cb7777a728@huawei.com> (raw)
In-Reply-To: <20210204035043.36609-7-songmuchun@bytedance.com>
On 2021/2/4 11:50, Muchun Song wrote:
> All the infrastructure is ready, so we introduce nr_free_vmemmap_pages
> field in the hstate to indicate how many vmemmap pages associated with
> a HugeTLB page that can be freed to buddy allocator. And initialize it
> in the hugetlb_vmemmap_init(). This patch is actual enablement of the
> feature.
>
> Signed-off-by: Muchun Song <songmuchun@bytedance.com>
> Acked-by: Mike Kravetz <mike.kravetz@oracle.com>
> Reviewed-by: Oscar Salvador <osalvador@suse.de>
> ---
> include/linux/hugetlb.h | 3 +++
> mm/hugetlb.c | 1 +
> mm/hugetlb_vmemmap.c | 30 ++++++++++++++++++++++++++----
> mm/hugetlb_vmemmap.h | 5 +++++
> 4 files changed, 35 insertions(+), 4 deletions(-)
>
> diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
> index ad249e56ac49..775aea53669a 100644
> --- a/include/linux/hugetlb.h
> +++ b/include/linux/hugetlb.h
> @@ -560,6 +560,9 @@ struct hstate {
> unsigned int nr_huge_pages_node[MAX_NUMNODES];
> unsigned int free_huge_pages_node[MAX_NUMNODES];
> unsigned int surplus_huge_pages_node[MAX_NUMNODES];
> +#ifdef CONFIG_HUGETLB_PAGE_FREE_VMEMMAP
> + unsigned int nr_free_vmemmap_pages;
> +#endif
> #ifdef CONFIG_CGROUP_HUGETLB
> /* cgroup control files */
> struct cftype cgroup_files_dfl[7];
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index 5518283aa667..04dde2b71f3e 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -3220,6 +3220,7 @@ void __init hugetlb_add_hstate(unsigned int order)
> h->next_nid_to_free = first_memory_node;
> snprintf(h->name, HSTATE_NAME_LEN, "hugepages-%lukB",
> huge_page_size(h)/1024);
> + hugetlb_vmemmap_init(h);
>
> parsed_hstate = h;
> }
> diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c
> index 224a3cb69bf9..36ebd677e606 100644
> --- a/mm/hugetlb_vmemmap.c
> +++ b/mm/hugetlb_vmemmap.c
> @@ -208,13 +208,10 @@ early_param("hugetlb_free_vmemmap", early_hugetlb_free_vmemmap_param);
> /*
> * How many vmemmap pages associated with a HugeTLB page that can be freed
> * to the buddy allocator.
> - *
> - * Todo: Returns zero for now, which means the feature is disabled. We will
> - * enable it once all the infrastructure is there.
> */
> static inline unsigned int free_vmemmap_pages_per_hpage(struct hstate *h)
> {
> - return 0;
> + return h->nr_free_vmemmap_pages;
> }
>
> static inline unsigned long free_vmemmap_pages_size_per_hpage(struct hstate *h)
> @@ -269,3 +266,28 @@ void free_huge_page_vmemmap(struct hstate *h, struct page *head)
> */
> vmemmap_remap_free(vmemmap_addr, vmemmap_end, vmemmap_reuse);
> }
> +
> +void __init hugetlb_vmemmap_init(struct hstate *h)
> +{
> + unsigned int nr_pages = pages_per_huge_page(h);
> + unsigned int vmemmap_pages;
> +
> + if (!hugetlb_free_vmemmap_enabled)
> + return;
> +
> + vmemmap_pages = (nr_pages * sizeof(struct page)) >> PAGE_SHIFT;
> + /*
> + * The head page and the first tail page are not to be freed to buddy
> + * allocator, the other pages will map to the first tail page, so they
> + * can be freed.
> + *
> + * Could RESERVE_VMEMMAP_NR be greater than @vmemmap_pages? It is true
> + * on some architectures (e.g. aarch64). See Documentation/arm64/
> + * hugetlbpage.rst for more details.
> + */
> + if (likely(vmemmap_pages > RESERVE_VMEMMAP_NR))
> + h->nr_free_vmemmap_pages = vmemmap_pages - RESERVE_VMEMMAP_NR;
Not a problem. Should we set h->nr_free_vmemmap_pages to 0 in 'else' case explicitly ?
Anyway, looks good to me. Thanks.
Reviewed-by: Miaohe Lin <linmiaohe@huawei.com>
> +
> + pr_info("can free %d vmemmap pages for %s\n", h->nr_free_vmemmap_pages,
> + h->name);
> +}
> diff --git a/mm/hugetlb_vmemmap.h b/mm/hugetlb_vmemmap.h
> index 6f89a9eed02c..02a21604ef1d 100644
> --- a/mm/hugetlb_vmemmap.h
> +++ b/mm/hugetlb_vmemmap.h
> @@ -14,6 +14,7 @@
> int alloc_huge_page_vmemmap(struct hstate *h, struct page *head,
> gfp_t gfp_mask);
> void free_huge_page_vmemmap(struct hstate *h, struct page *head);
> +void hugetlb_vmemmap_init(struct hstate *h);
> #else
> static inline int alloc_huge_page_vmemmap(struct hstate *h, struct page *head,
> gfp_t gfp_mask)
> @@ -24,5 +25,9 @@ static inline int alloc_huge_page_vmemmap(struct hstate *h, struct page *head,
> static inline void free_huge_page_vmemmap(struct hstate *h, struct page *head)
> {
> }
> +
> +static inline void hugetlb_vmemmap_init(struct hstate *h)
> +{
> +}
> #endif /* CONFIG_HUGETLB_PAGE_FREE_VMEMMAP */
> #endif /* _LINUX_HUGETLB_VMEMMAP_H */
>
next prev parent reply other threads:[~2021-02-05 7:31 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-04 3:50 [PATCH v14 0/8] Free some vmemmap pages of HugeTLB page Muchun Song
2021-02-04 3:50 ` [PATCH v14 1/8] mm: memory_hotplug: factor out bootmem core functions to bootmem_info.c Muchun Song
2021-02-04 3:50 ` [PATCH v14 2/8] mm: hugetlb: introduce a new config HUGETLB_PAGE_FREE_VMEMMAP Muchun Song
2021-02-04 11:44 ` Miaohe Lin
2021-02-04 3:50 ` [PATCH v14 3/8] mm: hugetlb: free the vmemmap pages associated with each HugeTLB page Muchun Song
2021-02-05 8:54 ` Oscar Salvador
2021-02-05 16:01 ` [External] " Muchun Song
2021-02-04 3:50 ` [PATCH v14 4/8] mm: hugetlb: alloc " Muchun Song
2021-02-05 9:29 ` Muchun Song
2021-02-05 11:54 ` Oscar Salvador
2021-02-06 8:01 ` [External] " Muchun Song
2021-02-04 3:50 ` [PATCH v14 5/8] mm: hugetlb: add a kernel parameter hugetlb_free_vmemmap Muchun Song
2021-02-05 7:25 ` Miaohe Lin
2021-02-04 3:50 ` [PATCH v14 6/8] mm: hugetlb: introduce nr_free_vmemmap_pages in the struct hstate Muchun Song
2021-02-05 7:29 ` Miaohe Lin [this message]
2021-02-05 8:22 ` Oscar Salvador
2021-02-05 8:39 ` Miaohe Lin
2021-02-05 8:56 ` Oscar Salvador
2021-02-05 9:12 ` Miaohe Lin
2021-02-04 3:50 ` [PATCH v14 7/8] mm: hugetlb: gather discrete indexes of tail page Muchun Song
2021-02-05 7:30 ` Miaohe Lin
2021-02-04 3:50 ` [PATCH v14 8/8] mm: hugetlb: optimize the code with the help of the compiler Muchun Song
2021-02-04 6:33 ` Miaohe Lin
2021-02-05 9:09 ` Oscar Salvador
2021-02-05 9:16 ` [External] " Muchun Song
2021-02-05 8:59 ` [PATCH v14 0/8] Free some vmemmap pages of HugeTLB page Oscar Salvador
2021-02-05 9:30 ` [External] " Muchun Song
2021-02-05 16:00 ` Joao Martins
2021-02-05 16:13 ` [External] " Muchun Song
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=42c8272a-f170-b27e-af5e-a7cb7777a728@huawei.com \
--to=linmiaohe@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=almasrymina@google.com \
--cc=anshuman.khandual@arm.com \
--cc=bp@alien8.de \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=david@redhat.com \
--cc=duanxiongchun@bytedance.com \
--cc=hpa@zytor.com \
--cc=jroedel@suse.de \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=mchehab+huawei@kernel.org \
--cc=mhocko@suse.com \
--cc=mike.kravetz@oracle.com \
--cc=mingo@redhat.com \
--cc=naoya.horiguchi@nec.com \
--cc=oneukum@suse.com \
--cc=osalvador@suse.de \
--cc=paulmck@kernel.org \
--cc=pawan.kumar.gupta@linux.intel.com \
--cc=peterz@infradead.org \
--cc=rdunlap@infradead.org \
--cc=rientjes@google.com \
--cc=song.bao.hua@hisilicon.com \
--cc=songmuchun@bytedance.com \
--cc=tglx@linutronix.de \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).