From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 621C93998BA for ; Wed, 29 Jul 2026 16:31:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.199 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785342713; cv=none; b=Vx9RDruH+1Nf1qFN85fVxb/uPwmtOCfYU/xctGOrlSFOc09K4zuKPIuCG1ILTfx9JEhS34KaQMK7IBwFfNwpjVi7MP7MtpMpr8WT/8vU+sKEJacyeSEoys073N1Os9F1DF9Z2USIYQMEQ+cFj9RBT8z3YQo/jGqhVTl+dL8dyVc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785342713; c=relaxed/simple; bh=NnEzoG+Np15xHHLPhlTqwdsmcGRGiqBTrB0uLE8X7DQ=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=JgD2FSxCnsEDWa2R9LMPJAqYWoerMAZqKEk59IgzuOM4ah7+Q5JGzUzdQ1uagYXaTuPOL134eNE7II8G+wvLZtRHOM6LolwflE6NkLGUFgbfFWle6h7lbZkyscXXAYF79agKeqeC9JrXbohuER1dcHnpJ2/dXd3TJcpTQ2WrCXs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--souravpanda.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Ty5ZtX0c; arc=none smtp.client-ip=209.85.210.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--souravpanda.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Ty5ZtX0c" Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-8488ac68185so2732898b3a.2 for ; Wed, 29 Jul 2026 09:31:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785342711; x=1785947511; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:mime-version:date:from :to:cc:subject:date:message-id:reply-to:content-type; bh=mKBWk7rMjo7Xb5Ef81dPQ400kcrxUsMUdTBRgElPKBE=; b=Ty5ZtX0ckwuuaM9OHs/RI8zp63S8B+a0mvq3ji10WD41aYn1ULJwdHOdttYxQUnhwy L9ByMp8S1KFcvSqTVoorCbwz27H6wYEUgElbGAUCtoApAn3yVcHPr9CBnUP7NnyCLvA8 mDGyeCXBjskiAkyTcOfJc+vtONWvh9xsS1rrisHj19qGPqyusmRIlWK6/yW58mQXV+fu 58T0ubb5ZsvIXJY6ATdi9Ic5E8vexOBpoV2jk6/6+8prhiKH9yO2FrG7xv7Ku4SOWN5Z QEwzRmlq52uRlUW3TZK4mSPgqD4r/LRzfJoQ2d16eOAiWFbBvw2Z9j382Clmp8oPI3eI 7L6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785342711; x=1785947511; h=content-type:cc:to:from:subject:message-id:mime-version:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=mKBWk7rMjo7Xb5Ef81dPQ400kcrxUsMUdTBRgElPKBE=; b=V1UmN/V28BF2e7COrIyh285jMWlAW88SKadnMTj7/RdneB8kGnqGCJPOtrs7JB49gN lmhe+Thk5sDulDdpkxHocwrdKdyyEbhL/bIcAcAQd7ngbjIVlf6LlQ63D0NuSdjLI7pg 9GxaSb8FupDmaQLmgLh+vmV1+Fk2UjRmB0xH5+5HCtXrth57MQFXB/L1+XkrVoFp1xOY 8SIuIW4hGoIUEoFubVAAp6c8NSAhKEnp7ST4wvPuMwTRq35gvzPh4e/4T87u/FBiPbRI 7faEBvdfSHu00Ov90yK2TsAZ84TQynEN8so60BoKyOoR2Xj5Ez/nJNAG3SdyIBfC9GVa aIDw== X-Forwarded-Encrypted: i=1; AHgh+RrhdLOsOkDdnU277czDhg76Ti5eNTBlO4VUKC0wgA0Ffhna3dgl8Hr7GM/rlDZ9hbgobtud6CvRWkwysZk=@vger.kernel.org X-Gm-Message-State: AOJu0YzoK3KihnZ8QNJN3YsW4eA6zoesIvi5ScX96P/V9MMJHE7CMIh0 CZgP8/zBNYfZeOhR68G/KK+JTUx84eoCmdbH6gTmjQvrcq8qTRGB3N7IyFfP5mpLB/OBxc2qyVW qx4v2bfvZgrL2ZDcQrB2Cf02tyA== X-Received: from pgmp19.prod.google.com ([2002:a63:1e53:0:b0:ca1:40df:1c8a]) (user=souravpanda job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:84e:b0:848:2f84:f427 with SMTP id d2e1a72fcca58-84e93338b86mr7855046b3a.64.1785342710351; Wed, 29 Jul 2026 09:31:50 -0700 (PDT) Date: Wed, 29 Jul 2026 16:31:48 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog Message-ID: <20260729163148.3271755-1-souravpanda@google.com> Subject: [PATCH v3] mm/hugetlb_cma: support percentage-based hugetlb_cma reservation From: Sourav Panda To: muchun.song@linux.dev, osalvador@suse.de, akpm@linux-foundation.org Cc: david@kernel.org, usama.arif@linux.dev, surenb@google.com, fvdl@google.com, gthelen@google.com, rientjes@google.com, souravpanda@google.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Currently, hugetlb_cma reservation only supports absolute sizes (e.g., hugetlb_cma=2G or hugetlb_cma=0:1G,1:1G). This can be restrictive in heterogeneous environments or when deploying common kernel command lines across machines with different memory capacities. Add support for percentage-based hugetlb_cma reservation (e.g., hugetlb_cma=20% or hugetlb_cma=0:20%,1:10%). The percentage is calculated against the total memory (for global settings) or against the node-specific memory (for node-specific settings) using memblock APIs during early boot. Signed-off-by: Sourav Panda --- Link: https://lore.kernel.org/linux-mm/20260628190155.3655895-1-souravpanda@google.com/ [v2] Link: https://lore.kernel.org/linux-mm/20260625215900.2151690-1-souravpanda@google.com/ [v1] v3: - Enhance pr_info logs to explicitly show percentage-derived sizes per Andrew Morton's suggestions. - Explicitly align percentage-derived sizes down to the gigantic page size to prevent allocation failures (Usama Arif). .../admin-guide/kernel-parameters.txt | 7 +- mm/hugetlb_cma.c | 126 ++++++++++++++++-- 2 files changed, 123 insertions(+), 10 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 5a05b48d1684..846940ce2858 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -2064,8 +2064,11 @@ Kernel parameters hugetlb_cma= [HW,CMA,EARLY] The size of a CMA area used for allocation of gigantic hugepages. Or using node format, the size of a CMA area per node can be specified. - Format: nn[KMGTPE] or (node format) - :nn[KMGTPE][,:nn[KMGTPE]] + The size can be an absolute value (e.g., 2G) or a + percentage of the total memory or node memory (e.g., 20%). + Format: nn[KMGTPE] or nn% or (node format) + :nn[KMGTPE][,:nn[KMGTPE]] or + :nn%[,:nn%] Reserve a CMA area of given size and allocate gigantic hugepages using the CMA allocator. If enabled, the diff --git a/mm/hugetlb_cma.c b/mm/hugetlb_cma.c index 7693ccefd0c6..99d05eb82abc 100644 --- a/mm/hugetlb_cma.c +++ b/mm/hugetlb_cma.c @@ -9,6 +9,9 @@ #include #include +#include +#include +#include #include "internal.h" #include "hugetlb_cma.h" @@ -18,6 +21,28 @@ static unsigned long hugetlb_cma_size_in_node[MAX_NUMNODES] __initdata; static bool hugetlb_cma_only __ro_after_init; static unsigned long hugetlb_cma_size __ro_after_init; +static unsigned int hugetlb_cma_percent __initdata; +static unsigned int hugetlb_cma_percent_in_node[MAX_NUMNODES] __initdata; + +#ifdef CONFIG_NUMA +static phys_addr_t __init memblock_node_memory_size(int nid) +{ + struct memblock_region *reg; + phys_addr_t size = 0; + + for_each_mem_region(reg) { + if (reg->nid == nid) + size += reg->size; + } + return size; +} +#else +static phys_addr_t __init memblock_node_memory_size(int nid) +{ + return memblock_phys_mem_size(); +} +#endif + void hugetlb_cma_free_frozen_folio(struct folio *folio) { WARN_ON_ONCE(!cma_release_frozen(hugetlb_cma[folio_nid(folio)], @@ -100,14 +125,28 @@ static int __init cmdline_parse_hugetlb_cma(char *p) break; if (s[count] == ':') { + char *next; + if (tmp >= MAX_NUMNODES) break; nid = array_index_nospec(tmp, MAX_NUMNODES); s += count + 1; - tmp = memparse(s, &s); - hugetlb_cma_size_in_node[nid] = tmp; - hugetlb_cma_size += tmp; + tmp = memparse(s, &next); + if (*next == '%') { + if (tmp > 100) { + pr_warn("hugetlb_cma: invalid percentage %lu for node %d\n", + tmp, nid); + break; + } + hugetlb_cma_percent_in_node[nid] = tmp; + hugetlb_cma_size_in_node[nid] = 0; + s = next + 1; + } else { + hugetlb_cma_size_in_node[nid] = tmp; + hugetlb_cma_percent_in_node[nid] = 0; + s = next; + } /* * Skip the separator if have one, otherwise @@ -118,7 +157,28 @@ static int __init cmdline_parse_hugetlb_cma(char *p) else break; } else { - hugetlb_cma_size = memparse(p, &p); + char *next; + + tmp = memparse(p, &next); + if (*next == '%') { + if (tmp > 100) { + pr_warn("hugetlb_cma: invalid percentage %lu\n", tmp); + } else { + hugetlb_cma_percent = tmp; + hugetlb_cma_size = 0; + for (nid = 0; nid < MAX_NUMNODES; nid++) { + hugetlb_cma_size_in_node[nid] = 0; + hugetlb_cma_percent_in_node[nid] = 0; + } + } + } else { + hugetlb_cma_size = tmp; + hugetlb_cma_percent = 0; + for (nid = 0; nid < MAX_NUMNODES; nid++) { + hugetlb_cma_size_in_node[nid] = 0; + hugetlb_cma_percent_in_node[nid] = 0; + } + } break; } } @@ -144,8 +204,36 @@ void __init hugetlb_cma_reserve(void) { unsigned long size, reserved, per_node, order; bool node_specific_cma_alloc = false; + bool has_node_specific_param = false; int nid; + for (nid = 0; nid < MAX_NUMNODES; nid++) { + if (hugetlb_cma_size_in_node[nid] || hugetlb_cma_percent_in_node[nid]) { + has_node_specific_param = true; + break; + } + } + + if (has_node_specific_param) { + hugetlb_cma_size = 0; + for (nid = 0; nid < MAX_NUMNODES; nid++) { + if (hugetlb_cma_percent_in_node[nid]) { + phys_addr_t node_gfp_mem = memblock_node_memory_size(nid); + u64 s; + + s = mul_u64_u32_div((u64)node_gfp_mem, + hugetlb_cma_percent_in_node[nid], + 100); + + hugetlb_cma_size_in_node[nid] = s; + } + hugetlb_cma_size += hugetlb_cma_size_in_node[nid]; + } + } else if (hugetlb_cma_percent) { + hugetlb_cma_size = mul_u64_u32_div((u64)memblock_phys_mem_size(), + hugetlb_cma_percent, 100); + } + if (!hugetlb_cma_size) return; @@ -163,6 +251,20 @@ void __init hugetlb_cma_reserve(void) */ VM_WARN_ON(order <= MAX_PAGE_ORDER); + if (hugetlb_cma_percent) { + hugetlb_cma_size = ALIGN_DOWN(hugetlb_cma_size, PAGE_SIZE << order); + } else if (has_node_specific_param) { + hugetlb_cma_size = 0; + for (nid = 0; nid < MAX_NUMNODES; nid++) { + if (hugetlb_cma_percent_in_node[nid]) { + hugetlb_cma_size_in_node[nid] = + ALIGN_DOWN(hugetlb_cma_size_in_node[nid], + PAGE_SIZE << order); + } + hugetlb_cma_size += hugetlb_cma_size_in_node[nid]; + } + } + hugetlb_bootmem_set_nodes(); for (nid = 0; nid < MAX_NUMNODES; nid++) { @@ -205,8 +307,12 @@ void __init hugetlb_cma_reserve(void) per_node = DIV_ROUND_UP(hugetlb_cma_size, nodes_weight(hugetlb_bootmem_nodes)); per_node = round_up(per_node, PAGE_SIZE << order); - pr_info("hugetlb_cma: reserve %lu MiB, up to %lu MiB per node\n", - hugetlb_cma_size / SZ_1M, per_node / SZ_1M); + if (hugetlb_cma_percent) + pr_info("hugetlb_cma: reserve %lu MiB (%u%%), up to %lu MiB per node\n", + hugetlb_cma_size / SZ_1M, hugetlb_cma_percent, per_node / SZ_1M); + else + pr_info("hugetlb_cma: reserve %lu MiB, up to %lu MiB per node\n", + hugetlb_cma_size / SZ_1M, per_node / SZ_1M); } reserved = 0; @@ -241,8 +347,12 @@ void __init hugetlb_cma_reserve(void) } reserved += size; - pr_info("hugetlb_cma: reserved %lu MiB on node %d\n", - size / SZ_1M, nid); + if (hugetlb_cma_percent_in_node[nid]) + pr_info("hugetlb_cma: reserved %lu MiB (%u%%) on node %d\n", + size / SZ_1M, hugetlb_cma_percent_in_node[nid], nid); + else + pr_info("hugetlb_cma: reserved %lu MiB on node %d\n", + size / SZ_1M, nid); if (reserved >= hugetlb_cma_size) break; -- 2.55.0.rc0.799.gd6f94ed593-goog