[04/27] mm, hugetlb: use cma_declare_contiguous_multi

Message ID	20250127232207.3888640-5-fvdl@google.com (mailing list archive)
State	New
Headers	show Return-Path: <owner-linux-mm@kvack.org> Date: Mon, 27 Jan 2025 23:21:44 +0000 In-Reply-To: <20250127232207.3888640-1-fvdl@google.com> Mime-Version: 1.0 References: <20250127232207.3888640-1-fvdl@google.com> Message-ID: <20250127232207.3888640-5-fvdl@google.com> Subject: [PATCH 04/27] mm, hugetlb: use cma_declare_contiguous_multi From: Frank van der Linden <fvdl@google.com> To: akpm@linux-foundation.org, muchun.song@linux.dev, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: yuzhao@google.com, usama.arif@bytedance.com, joao.m.martins@oracle.com, roman.gushchin@linux.dev, Frank van der Linden <fvdl@google.com> Content-Type: text/plain; charset="UTF-8" Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	hugetlb/CMA improvements for large systems \| expand [00/27] hugetlb/CMA improvements for large systems [01/27] mm/cma: export total and free number of pages for CMA areas [02/27] mm, cma: support multiple contiguous ranges, if requested [03/27] mm/cma: introduce cma_intersects function [04/27] mm, hugetlb: use cma_declare_contiguous_multi [05/27] mm/hugetlb: fix round-robin bootmem allocation [06/27] mm/hugetlb: remove redundant __ClearPageReserved [07/27] mm/hugetlb: use online nodes for bootmem allocation [08/27] mm/hugetlb: convert cmdline parameters from setup to early [09/27] x86/mm: make register_page_bootmem_memmap handle PTE mappings [10/27] mm/bootmem_info: export register_page_bootmem_memmap [11/27] mm/sparse: allow for alternate vmemmap section init at boot [12/27] mm/hugetlb: set migratetype for bootmem folios [13/27] mm: define __init_reserved_page_zone function [14/27] mm/hugetlb: check bootmem pages for zone intersections [15/27] mm/sparse: add vmemmap_*_hvo functions [16/27] mm/hugetlb: deal with multiple calls to hugetlb_bootmem_alloc [17/27] mm/hugetlb: move huge_boot_pages list init to hugetlb_bootmem_alloc [18/27] mm/hugetlb: add pre-HVO framework [19/27] mm/hugetlb_vmemmap: fix hugetlb_vmemmap_restore_folios definition [20/27] mm/hugetlb: do pre-HVO for bootmem allocated pages [21/27] x86/setup: call hugetlb_bootmem_alloc early [22/27] x86/mm: set ARCH_WANT_SPARSEMEM_VMEMMAP_PREINIT [23/27] mm/cma: simplify zone intersection check [24/27] mm/cma: introduce a cma validate function [25/27] mm/cma: introduce interface for early reservations [26/27] mm/hugetlb: add hugetlb_cma_only cmdline option [27/27] mm/hugetlb: enable bootmem allocation from CMA areas

Message ID

20250127232207.3888640-5-fvdl@google.com (mailing list archive)

State

New

Headers

Date: Mon, 27 Jan 2025 23:21:44 +0000
In-Reply-To: <20250127232207.3888640-1-fvdl@google.com>
Mime-Version: 1.0
References: <20250127232207.3888640-1-fvdl@google.com>
Message-ID: <20250127232207.3888640-5-fvdl@google.com>
Subject: [PATCH 04/27] mm, hugetlb: use cma_declare_contiguous_multi
From: Frank van der Linden <fvdl@google.com>
To: akpm@linux-foundation.org, muchun.song@linux.dev, linux-mm@kvack.org,
	linux-kernel@vger.kernel.org
Cc: yuzhao@google.com, usama.arif@bytedance.com, joao.m.martins@oracle.com,
	roman.gushchin@linux.dev, Frank van der Linden <fvdl@google.com>
Content-Type: text/plain; charset="UTF-8"
Sender: owner-linux-mm@kvack.org
Precedence: bulk

Series

hugetlb/CMA improvements for large systems | expand

Commit Message

Frank van der Linden Jan. 27, 2025, 11:21 p.m. UTC

hugetlb_cma is fine with using multiple CMA ranges, as long as it
can get its gigantic pages allocated from them. So, use
cma_declare_contiguous_multi to allow for multiple ranges,
increasing the chances of getting what we want on systems
with gaps in physical memory.

Signed-off-by: Frank van der Linden <fvdl@google.com>
---
 mm/hugetlb.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 87761b042ed0..b187843e38fe 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -7738,9 +7738,8 @@  void __init hugetlb_cma_reserve(int order)
 		 * may be returned to CMA allocator in the case of
 		 * huge page demotion.
 		 */
-		res = cma_declare_contiguous_nid(0, size, 0,
-					PAGE_SIZE << order,
-					HUGETLB_PAGE_ORDER, false, name,
+		res = cma_declare_contiguous_multi(size, PAGE_SIZE << order,
+					HUGETLB_PAGE_ORDER, name,
 					&hugetlb_cma[nid], nid);
 		if (res) {
 			pr_warn("hugetlb_cma: reservation failed: err %d, node %d",

[04/27] mm, hugetlb: use cma_declare_contiguous_multi

Commit Message

Patch