Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mm/hugetlb: deal with multiple calls to hugetlb_bootmem_alloc

Architectures that want pre-HVO of hugetlb vmemmap pages will need to call
hugetlb_bootmem_alloc from an earlier spot in boot (before sparse_init).
To facilitate some architectures doing this, protect hugetlb_bootmem_alloc
against multiple calls.

Also provide a helper function to check if it's been called, so that the
early HVO code, to be added later, can see if there is anything to do.

Link: https://lkml.kernel.org/r/20250228182928.2645936-16-fvdl@google.com
Signed-off-by: Frank van der Linden <fvdl@google.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Dan Carpenter <dan.carpenter@linaro.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Joao Martins <joao.m.martins@oracle.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Roman Gushchin (Cruise) <roman.gushchin@linux.dev>
Cc: Usama Arif <usamaarif642@gmail.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Yu Zhao <yuzhao@google.com>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Frank van der Linden and committed by
Andrew Morton
d58b2498 9eb6207b

+18
+6
include/linux/hugetlb.h
··· 175 175 extern struct list_head huge_boot_pages[MAX_NUMNODES]; 176 176 177 177 void hugetlb_bootmem_alloc(void); 178 + bool hugetlb_bootmem_allocated(void); 178 179 179 180 /* arch callbacks */ 180 181 ··· 1263 1262 1264 1263 static inline void hugetlb_bootmem_alloc(void) 1265 1264 { 1265 + } 1266 + 1267 + static inline bool hugetlb_bootmem_allocated(void) 1268 + { 1269 + return false; 1266 1270 } 1267 1271 #endif /* CONFIG_HUGETLB_PAGE */ 1268 1272
+12
mm/hugetlb.c
··· 4918 4918 } 4919 4919 hugetlb_early_param("default_hugepagesz", default_hugepagesz_setup); 4920 4920 4921 + static bool __hugetlb_bootmem_allocated __initdata; 4922 + 4923 + bool __init hugetlb_bootmem_allocated(void) 4924 + { 4925 + return __hugetlb_bootmem_allocated; 4926 + } 4927 + 4921 4928 void __init hugetlb_bootmem_alloc(void) 4922 4929 { 4923 4930 struct hstate *h; 4931 + 4932 + if (__hugetlb_bootmem_allocated) 4933 + return; 4924 4934 4925 4935 hugetlb_parse_params(); 4926 4936 ··· 4938 4928 if (hstate_is_gigantic(h)) 4939 4929 hugetlb_hstate_alloc_pages(h); 4940 4930 } 4931 + 4932 + __hugetlb_bootmem_allocated = true; 4941 4933 } 4942 4934 4943 4935 static unsigned int allowed_mems_nr(struct hstate *h)