[v2,21/28] x86/setup: call hugetlb_bootmem_alloc early

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

Message ID

20250129224157.2046079-22-fvdl@google.com (mailing list archive)

State

New

Headers

Date: Wed, 29 Jan 2025 22:41:50 +0000
In-Reply-To: <20250129224157.2046079-1-fvdl@google.com>
Mime-Version: 1.0
References: <20250129224157.2046079-1-fvdl@google.com>
Message-ID: <20250129224157.2046079-22-fvdl@google.com>
Subject: [PATCH v2 21/28] x86/setup: call hugetlb_bootmem_alloc early
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, usamaarif642@gmail.com, joao.m.martins@oracle.com,
	roman.gushchin@linux.dev, Frank van der Linden <fvdl@google.com>,
	Dave Hansen <dave.hansen@linux.intel.com>, Andy Lutomirski <luto@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>
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. 29, 2025, 10:41 p.m. UTC

Call hugetlb_bootmem_allloc in an earlier spot in setup, after
hugelb_cma_reserve. This will make vmemmap preinit of
the sections covered by the allocated hugetlb pages possible.

Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Frank van der Linden <fvdl@google.com>
---
 arch/x86/kernel/setup.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index cebee310e200..ff8604007b08 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1108,8 +1108,10 @@  void __init setup_arch(char **cmdline_p)
 	initmem_init();
 	dma_contiguous_reserve(max_pfn_mapped << PAGE_SHIFT);
 
-	if (boot_cpu_has(X86_FEATURE_GBPAGES))
+	if (boot_cpu_has(X86_FEATURE_GBPAGES)) {
 		hugetlb_cma_reserve(PUD_SHIFT - PAGE_SHIFT);
+		hugetlb_bootmem_alloc();
+	}
 
 	/*
 	 * Reserve memory for crash kernel after SRAT is parsed so that it

[v2,21/28] x86/setup: call hugetlb_bootmem_alloc early

Commit Message

Patch