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=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 35CCFC4361B for ; Thu, 10 Dec 2020 04:02:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0B38F23BA7 for ; Thu, 10 Dec 2020 04:02:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732229AbgLJEAF (ORCPT ); Wed, 9 Dec 2020 23:00:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732187AbgLJD7t (ORCPT ); Wed, 9 Dec 2020 22:59:49 -0500 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDBC0C0613CF for ; Wed, 9 Dec 2020 19:59:08 -0800 (PST) Received: by mail-pf1-x444.google.com with SMTP id b26so2793085pfi.3 for ; Wed, 09 Dec 2020 19:59:08 -0800 (PST) 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=NXEM/oAgRB8SPb1GBM6JgFCy32b9gAgKVaY2cNUX5bc=; b=t/PQvvxLvOVtqYNrE/8+ZXwVXT0apX4/Hj49KPwi1q8WFm2QE4Ds/rzhEIJQ3sXpn7 05v2fJoDvPGcb07p7Cot+ADazISgVAfffDX7GRaKI2i3+dwDTAz2Sw7h1kZhi6OT5Fyh EpAge96UAF2ZrY4RX/HQGASumSQ6s9DbyVApII0DZsXL2Ry2WtgRkMtZ9Z1nrkaizodm 37N4tCODgUQ2osiMTl9m21HxW3lvTTXro9rDkSt+8B2kBBhhr+R2e06B3zd324Qxpk/d sradaXafAsHYC1zxNTrq9Oi7VNWwmUmz40He3QuapJZ5FIH6innzpgVoMU3o94LAM64W o1vw== 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=NXEM/oAgRB8SPb1GBM6JgFCy32b9gAgKVaY2cNUX5bc=; b=Z+orclgZgsrp7JliG9NpZ3OdOzKxsIYeIYdMrexu9OgaaoxGlYvXva14gabjuXmyST hISWhM9DwDAEpGKIFiEX9Hvxv/HBVfvWPo99FxLpML7xFuMqzzY1sKuF9OBt8tvoT3NE o26cdbPpGaQYbO9dNn7o4APrG9k8QPSi7cjwxebDeiEln8n4cAAbonddGOKUigZXkvQO A1AY46FAypyH+E6BlBQgXwJ5QwMGfiI651TWdmuUCGtLc7L6hNwOnEMPRTGTd4UC9PkA aAiy7BTkSr2Ew3hUUwKKeTByO2kLDRBZgZ4Sv72s5IoXm6qk15q5/UWE1IrCC/q7gRW4 uMuA== X-Gm-Message-State: AOAM531EF0Wpu+FVYs1L0RQqo0g+Dq1gvnQxxJJQ9iHnTROQY1036Jke bSuE+Z15ap4csQJJieyi3hv80Q== X-Google-Smtp-Source: ABdhPJwCdiHPHlcmtfk+GCubiq+fr68sz4WohtRe5uALUzjQHi9/NtYpB3850BNZ9mnXnYskq8JBig== X-Received: by 2002:a17:90a:1b0d:: with SMTP id q13mr5262615pjq.21.1607572748392; Wed, 09 Dec 2020 19:59:08 -0800 (PST) Received: from localhost.localdomain ([103.136.220.85]) by smtp.gmail.com with ESMTPSA id f33sm4266535pgl.83.2020.12.09.19.58.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Dec 2020 19:59:07 -0800 (PST) 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, willy@infradead.org, osalvador@suse.de, mhocko@suse.com, song.bao.hua@hisilicon.com, david@redhat.com 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 v8 10/12] mm/hugetlb: Introduce nr_free_vmemmap_pages in the struct hstate Date: Thu, 10 Dec 2020 11:55:24 +0800 Message-Id: <20201210035526.38938-11-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20201210035526.38938-1-songmuchun@bytedance.com> References: <20201210035526.38938-1-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 we can free to buddy allocator. And initialize it in the hugetlb_vmemmap_init(). This patch is actual enablement of the feature. Signed-off-by: Muchun Song Acked-by: Mike Kravetz --- include/linux/hugetlb.h | 3 +++ mm/hugetlb.c | 1 + mm/hugetlb_vmemmap.c | 29 +++++++++++++++++++++++++++++ mm/hugetlb_vmemmap.h | 10 ++++++---- 4 files changed, 39 insertions(+), 4 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 7f47f0eeca3b..66d82ae7b712 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -492,6 +492,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 2e7a59b44364..6440367a71b6 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -3327,6 +3327,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 f0926b382338..36a2e2db7913 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -421,3 +421,32 @@ void free_huge_page_vmemmap(struct hstate *h, struct page *head) free_vmemmap_page_list(&vmemmap_pages); } + +void __init hugetlb_vmemmap_init(struct hstate *h) +{ + unsigned int nr_pages = pages_per_huge_page(h); + unsigned int vmemmap_pages; + + /* We cannot optimize if a "struct page" crosses page boundaries. */ + if (!is_power_of_2(sizeof(struct page))) + return; + + 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 + * system, the others page will map to the first tail page. So there + * are the remaining pages that 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; + + 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 8fd57c49e230..0a1c0d33a316 100644 --- a/mm/hugetlb_vmemmap.h +++ b/mm/hugetlb_vmemmap.h @@ -11,21 +11,23 @@ #include #ifdef CONFIG_HUGETLB_PAGE_FREE_VMEMMAP +void hugetlb_vmemmap_init(struct hstate *h); void alloc_huge_page_vmemmap(struct hstate *h, struct page *head); void free_huge_page_vmemmap(struct hstate *h, struct page *head); /* * How many vmemmap pages associated with a HugeTLB page that can be freed * to the buddy allocator. - * - * Todo: Now it is zero, because all infrastructure is not ready. Once all the - * infrastructure is ready, we will rework this function to support the feature. */ static inline unsigned int free_vmemmap_pages_per_hpage(struct hstate *h) { - return 0; + return h->nr_free_vmemmap_pages; } #else +static inline void hugetlb_vmemmap_init(struct hstate *h) +{ +} + static inline void alloc_huge_page_vmemmap(struct hstate *h, struct page *head) { } -- 2.11.0