From patchwork Mon Mar 9 22:32:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Gushchin X-Patchwork-Id: 11428181 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DB5E992A for ; Mon, 9 Mar 2020 22:32:32 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8B1ED24677 for ; Mon, 9 Mar 2020 22:32:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="UwkJOHUd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8B1ED24677 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=fb.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B787C6B000A; Mon, 9 Mar 2020 18:32:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B02506B000C; Mon, 9 Mar 2020 18:32:31 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9F1426B000D; Mon, 9 Mar 2020 18:32:31 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0090.hostedemail.com [216.40.44.90]) by kanga.kvack.org (Postfix) with ESMTP id 822536B000A for ; Mon, 9 Mar 2020 18:32:31 -0400 (EDT) Received: from smtpin20.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 51D1D8248047 for ; Mon, 9 Mar 2020 22:32:31 +0000 (UTC) X-FDA: 76577274102.20.woman06_15f1cb895c142 X-Spam-Summary: 30,2,0,6e907e1f43936ae4,d41d8cd98f00b204,prvs=0337cb866d=guro@fb.com,,RULES_HIT:1:2:41:355:379:541:800:960:966:973:988:989:1260:1261:1277:1313:1314:1345:1431:1437:1516:1518:1605:1730:1747:1777:1792:1801:2194:2196:2198:2199:2200:2201:2393:2553:2559:2562:2731:3138:3139:3140:3141:3142:3865:3866:3867:3868:3870:3871:3872:3874:4051:4250:4321:4385:4470:4605:5007:6119:6261:6630:6653:7875:7903:8603:10004:11026:11233:11473:11658:11914:12043:12296:12297:12438:12555:12679:12895:12986:13161:13229:13972:14394:21080:21324:21451:21611:21627:21740:21795:21796:21889:21987:21990,0,RBL:67.231.145.42:@fb.com:.lbl8.mailshell.net-64.201.201.201 62.12.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:28,LUA_SUMMARY:none X-HE-Tag: woman06_15f1cb895c142 X-Filterd-Recvd-Size: 10796 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf27.hostedemail.com (Postfix) with ESMTP for ; Mon, 9 Mar 2020 22:32:30 +0000 (UTC) Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 029MU7mJ020532 for ; Mon, 9 Mar 2020 15:32:29 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=facebook; bh=a7ab9YxxrzbzsAzxRTc7PISmeH7sx6ZzKqxtpjiU778=; b=UwkJOHUdrdYqV/3tafOOulVlbwfZN5yO1PtPaFD53D5kyWKrf22P7+eIrzPE5jc/RcXL R+uq9cDHPvD+CSRBkD7Ql2+fJUYmTlleXRae/Upb2aqoNI2dAoMYY+5VpxzdhpJVSvRy qyBiHfqubvuKrH0tCvhbeY5yfyYRv6/Ysyc= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 2ymv6jq6n5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 09 Mar 2020 15:32:29 -0700 Received: from intmgw001.41.prn1.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::d) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1847.3; Mon, 9 Mar 2020 15:32:27 -0700 Received: by devvm2643.prn2.facebook.com (Postfix, from userid 111017) id 7EA3D3369D6AD; Mon, 9 Mar 2020 15:32:23 -0700 (PDT) Smtp-Origin-Hostprefix: devvm From: Roman Gushchin Smtp-Origin-Hostname: devvm2643.prn2.facebook.com To: Andrew Morton CC: Johannes Weiner , Michal Hocko , , , , Rik van Riel , Roman Gushchin Smtp-Origin-Cluster: prn2c23 Subject: [PATCH] mm: hugetlb: optionally allocate gigantic hugepages using cma Date: Mon, 9 Mar 2020 15:32:16 -0700 Message-ID: <20200309223216.1974290-1-guro@fb.com> X-Mailer: git-send-email 2.17.1 X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-03-09_11:2020-03-09,2020-03-09 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 bulkscore=0 phishscore=0 impostorscore=0 spamscore=0 suspectscore=2 malwarescore=0 priorityscore=1501 adultscore=0 mlxlogscore=999 mlxscore=0 lowpriorityscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2003090136 X-FB-Internal: deliver 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: Commit 944d9fec8d7a ("hugetlb: add support for gigantic page allocation at runtime") has added the run-time allocation of gigantic pages. However it actually works only at early stages of the system loading, when the majority of memory is free. After some time the memory gets fragmented by non-movable pages, so the chances to find a contiguous 1 GB block are getting close to zero. Even dropping caches manually doesn't help a lot. At large scale rebooting servers in order to allocate gigantic hugepages is quite expensive and complex. At the same time keeping some constant percentage of memory in reserved hugepages even if the workload isn't using it is a big waste: not all workloads can benefit from using 1 GB pages. The following solution can solve the problem: 1) On boot time a dedicated cma area* is reserved. The size is passed as a kernel argument. 2) Run-time allocations of gigantic hugepages are performed using the cma allocator and the dedicated cma area In this case gigantic hugepages can be allocated successfully with a high probability, however the memory isn't completely wasted if nobody is using 1GB hugepages: it can be used for pagecache, anon memory, THPs, etc. * On a multi-node machine a per-node cma area is allocated on each node. Following gigantic hugetlb allocation are using the first available numa node if the mask isn't specified by a user. Usage: 1) configure the kernel to allocate a cma area for hugetlb allocations: pass hugetlb_cma=10G as a kernel argument 2) allocate hugetlb pages as usual, e.g. echo 10 > /sys/kernel/mm/hugepages/hugepages-1048576kB/nr_hugepages If the option isn't enabled or the allocation of the cma area failed, the current behavior of the system is preserved. Only x86 is covered by this patch, but it's trivial to extend it to cover other architectures as well. Signed-off-by: Roman Gushchin --- .../admin-guide/kernel-parameters.txt | 7 ++ arch/x86/kernel/setup.c | 3 + include/linux/hugetlb.h | 2 + mm/hugetlb.c | 108 ++++++++++++++++++ 4 files changed, 120 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 0c9894247015..d3349ec1dbef 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -1452,6 +1452,13 @@ hpet_mmap= [X86, HPET_MMAP] Allow userspace to mmap HPET registers. Default set by CONFIG_HPET_MMAP_DEFAULT. + hugetlb_cma= [x86-64] The size of a cma area used for allocation + of gigantic hugepages. + Format: nn[GTPE] | nn% + + If enabled, boot-time allocation of gigantic hugepages + is skipped. + hugepages= [HW,X86-32,IA-64] HugeTLB pages to allocate at boot. hugepagesz= [HW,IA-64,PPC,X86-64] The size of the HugeTLB pages. On x86-64 and powerpc, this option can be specified diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index a74262c71484..ceeb06ddfd41 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -1158,6 +1159,8 @@ void __init setup_arch(char **cmdline_p) initmem_init(); dma_contiguous_reserve(max_pfn_mapped << PAGE_SHIFT); + hugetlb_cma_reserve(); + /* * Reserve memory for crash kernel after SRAT is parsed so that it * won't consume hotpluggable memory. diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 50480d16bd33..50050c981ab9 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -157,6 +157,8 @@ pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud); extern int sysctl_hugetlb_shm_group; extern struct list_head huge_boot_pages; +extern void __init hugetlb_cma_reserve(void); + /* arch callbacks */ pte_t *huge_pte_alloc(struct mm_struct *mm, diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 7fb31750e670..f2e6e0a37263 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -44,6 +45,9 @@ int hugetlb_max_hstate __read_mostly; unsigned int default_hstate_idx; struct hstate hstates[HUGE_MAX_HSTATE]; + +static struct cma *hugetlb_cma[MAX_NUMNODES]; + /* * Minimum page order among possible hugepage sizes, set to a proper value * at boot time. @@ -1228,6 +1232,11 @@ static void destroy_compound_gigantic_page(struct page *page, static void free_gigantic_page(struct page *page, unsigned int order) { + if (hugetlb_cma[0]) { + cma_release(hugetlb_cma[page_to_nid(page)], page, 1 << order); + return; + } + free_contig_range(page_to_pfn(page), 1 << order); } @@ -1237,6 +1246,23 @@ static struct page *alloc_gigantic_page(struct hstate *h, gfp_t gfp_mask, { unsigned long nr_pages = 1UL << huge_page_order(h); + if (hugetlb_cma[0]) { + struct page *page; + int nid; + + for_each_node_mask(nid, *nodemask) { + if (!hugetlb_cma[nid]) + break; + + page = cma_alloc(hugetlb_cma[nid], nr_pages, + huge_page_order(h), true); + if (page) + return page; + } + + return NULL; + } + return alloc_contig_pages(nr_pages, gfp_mask, nid, nodemask); } @@ -2439,6 +2465,10 @@ static void __init hugetlb_hstate_alloc_pages(struct hstate *h) for (i = 0; i < h->max_huge_pages; ++i) { if (hstate_is_gigantic(h)) { + if (hugetlb_cma[0]) { + pr_warn_once("HugeTLB: hugetlb_cma is enabled, skip boot time allocation\n"); + break; + } if (!alloc_bootmem_huge_page(h)) break; } else if (!alloc_pool_huge_page(h, @@ -5372,3 +5402,81 @@ void move_hugetlb_state(struct page *oldpage, struct page *newpage, int reason) spin_unlock(&hugetlb_lock); } } + +static unsigned long hugetlb_cma_size __initdata; +static unsigned long hugetlb_cma_percent __initdata; + +static int __init cmdline_parse_hugetlb_cma(char *p) +{ + unsigned long long val; + char *endptr; + + if (!p) + return -EINVAL; + + /* Value may be a percentage of total memory, otherwise bytes */ + val = simple_strtoull(p, &endptr, 0); + if (*endptr == '%') + hugetlb_cma_percent = clamp_t(unsigned long, val, 0, 100); + else + hugetlb_cma_size = memparse(p, &p); + + return 0; +} + +early_param("hugetlb_cma", cmdline_parse_hugetlb_cma); + +void __init hugetlb_cma_reserve(void) +{ + unsigned long totalpages = 0; + unsigned long start_pfn, end_pfn; + phys_addr_t size; + int nid, i, res; + + if (!hugetlb_cma_size && !hugetlb_cma_percent) + return; + + if (hugetlb_cma_percent) { + for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, + NULL) + totalpages += end_pfn - start_pfn; + + size = PAGE_SIZE * (hugetlb_cma_percent * 100 * totalpages) / + 10000UL; + } else { + size = hugetlb_cma_size; + } + + pr_info("hugetlb_cma: reserve %llu, %llu per node\n", size, + size / nr_online_nodes); + + size /= nr_online_nodes; + + for_each_node_state(nid, N_ONLINE) { + unsigned long min_pfn = 0, max_pfn = 0; + + for_each_mem_pfn_range(i, nid, &start_pfn, &end_pfn, NULL) { + if (!min_pfn) + min_pfn = start_pfn; + max_pfn = end_pfn; + } + + res = cma_declare_contiguous(PFN_PHYS(min_pfn), size, + PFN_PHYS(max_pfn), (1UL << 30), + 0, false, + "hugetlb", &hugetlb_cma[nid]); + if (res) { + pr_warn("hugetlb_cma: reservation failed: err %d, node %d, [%llu, %llu)", + res, nid, PFN_PHYS(min_pfn), PFN_PHYS(max_pfn)); + + for (; nid >= 0; nid--) + hugetlb_cma[nid] = NULL; + + break; + } + + pr_info("hugetlb_cma: successfully reserved %llu on node %d\n", + size, nid); + } +} +