From nobody Fri Dec 19 09:11:34 2025 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 33676281379 for ; Tue, 18 Feb 2025 18:17:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739902650; cv=none; b=QyaokR7GBQhMpCCe/GCVeB6OI+EdaPkLfQic9FBXznj2sguaWEsR4XFroE4ygIa50bK0+uOaSGKCXBWAh8EkXgy00DxWu+vpdVppcctZ1JhYkkkXFfI207humlJV3ac+ddedzB1KiUlUakHgwYcgbdvboB6xFZcoL2OUJ8kINa0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739902650; c=relaxed/simple; bh=hVwCANj+CorVmjuRlsHWC8kHdg3pBhnm/kY0SBR96vc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=HSLN6rGGsH4eoK7eAHrZa/K2hoGABEVTWK/s0dmXSJcZq03TAiBanKlf/DOoY0HjTCtx52ELmmsIvH5iO4pDKTEIpm3lu10ZDVOEzXPayX0eMmYSIOY0yfpCrdBtDNmPiRom/L/C0OXo2sXOqQPeftTjlYzYzxMX5dS0KWSLiw0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--fvdl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=3/ioRqjW; arc=none smtp.client-ip=209.85.216.73 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--fvdl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="3/ioRqjW" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2fc2b258e82so9921788a91.0 for ; Tue, 18 Feb 2025 10:17:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739902647; x=1740507447; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=165gS3goRLf8zZj6pEhjQb5PxE79JM+3p+KuzMFcveU=; b=3/ioRqjWCMjVnaWbMhVq8XLHkFbE50jRhRR+uPNhCSNO0dCglXIi204X+NIohxhmki VvtdfNDv4ypf0+x0bgYG3WvAq9hcpd9OD4/LocQgGQ8Di73Gn45RL37RDP2vGCdEVSaW LBzm4HZDzbfuZ/KOYlQIhTqKJzPwzcS0NrTcD7N9BvV6qb9VF6cBKwaifXICrN06xYe8 uJiDMlodHd1i0Xs8PR/GMNa3QvAr2Uz5wxDLo2Qu35GLo/yW3jFvcc0rGEdBj3joBct5 ah1BTdIZQcKFhLy4EduDqAvhDj2a+ZX8VmKgmtmslkyDP1WghDVIYF8JXTBzHeamhnFv gNLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739902647; x=1740507447; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=165gS3goRLf8zZj6pEhjQb5PxE79JM+3p+KuzMFcveU=; b=bElhY3c7rFxbhsmLpef5Ec7n+2KzLrlJTqzmBVzHXfgx0XEL5HriZy43ItHr8Lcp53 eVy1ErX66I/W+EQ19NTdLBKmy+CDpJRfXYByNzaGJZwwSqu9TOeeYkdZ39W7TI4LYu+f 1wVvsXZatFLtZfFyIEFBz+3crxJjauZGXu8+G5LsYA1apT3TmEvDa0bBuBPlKuUuPOGw wTJ1G634tdtoRkM3LJBMGZVcR90jvpShmIsiCiXUle44jNoBmgW6YBoGskfhB096GdAE UO8pQ2p4v/zt9UnLmw6BsmAHAmBehw5TJSNdC5Ci/AnKOmpcuA7Jbob6UorkfevHeGmh +eqw== X-Forwarded-Encrypted: i=1; AJvYcCW+L0UXsPvWEL0FqLubLoKhS0Ds04vQHpU2L/Um1YdAH+z1uL4HcxOY3nvOVVGlW0JpMTMdXZ5+e4q/2oI=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9xw8+XzYfJqzMSIM+CSViftMfbPyo5NxO1SC1uOO12F+5XmR4 pLN72fbiTV5MpdM6+/1MXwBc0Q4NrIBm4ejER4sLdGYFPYU3V8nW/9grkGtRM5oE16Ucrg== X-Google-Smtp-Source: AGHT+IEoqMlrNITX7gZxzMB0Y+rjQKU0M6SIkqPiK42wAClKKAVtpeQMhJt67RX0BgBBDoe6CJK14pHN X-Received: from pjf4.prod.google.com ([2002:a17:90b:3f04:b0:2fc:13d6:b4cb]) (user=fvdl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:134e:b0:2ee:acb4:fecd with SMTP id 98e67ed59e1d1-2fcb5a10379mr642511a91.9.1739902647343; Tue, 18 Feb 2025 10:17:27 -0800 (PST) Date: Tue, 18 Feb 2025 18:16:41 +0000 In-Reply-To: <20250218181656.207178-1-fvdl@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250218181656.207178-1-fvdl@google.com> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog Message-ID: <20250218181656.207178-14-fvdl@google.com> Subject: [PATCH v4 13/27] mm/hugetlb: check bootmem pages for zone intersections From: Frank van der Linden 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Bootmem hugetlb pages are allocated using memblock, which isn't (and mostly can't be) aware of zones. So, they may end up crossing zone boundaries. This would create confusion, a hugetlb page that is part of multiple zones is bad. Worse, HVO might then end up stealthily re-assigning pages to a different zone when a hugetlb page is freed, since the tail page structures beyond the first vmemmap page would inherit the zone of the first page structures. While the chance of this happening is low, you can definitely create a configuration where this happens (especially using ZONE_MOVABLE). To avoid this issue, check if bootmem hugetlb pages intersect with multiple zones during the gather phase, and discard them, handing them to the page allocator, if they do. Record the number of invalid bootmem pages per node and subtract them from the number of available pages at the end, making it easier to do these checks in multiple places later on. Signed-off-by: Frank van der Linden --- mm/hugetlb.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++-- mm/internal.h | 2 ++ mm/mm_init.c | 25 +++++++++++++++++++++ 3 files changed, 86 insertions(+), 2 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 19a7a795a388..f9704a0e62de 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -62,6 +62,7 @@ static unsigned long hugetlb_cma_size_in_node[MAX_NUMNODE= S] __initdata; static unsigned long hugetlb_cma_size __initdata; =20 __initdata struct list_head huge_boot_pages[MAX_NUMNODES]; +static unsigned long hstate_boot_nrinvalid[HUGE_MAX_HSTATE] __initdata; =20 /* * Due to ordering constraints across the init code for various @@ -3304,6 +3305,44 @@ static void __init prep_and_add_bootmem_folios(struc= t hstate *h, } } =20 +static bool __init hugetlb_bootmem_page_zones_valid(int nid, + struct huge_bootmem_page *m) +{ + unsigned long start_pfn; + bool valid; + + start_pfn =3D virt_to_phys(m) >> PAGE_SHIFT; + + valid =3D !pfn_range_intersects_zones(nid, start_pfn, + pages_per_huge_page(m->hstate)); + if (!valid) + hstate_boot_nrinvalid[hstate_index(m->hstate)]++; + + return valid; +} + +/* + * Free a bootmem page that was found to be invalid (intersecting with + * multiple zones). + * + * Since it intersects with multiple zones, we can't just do a free + * operation on all pages at once, but instead have to walk all + * pages, freeing them one by one. + */ +static void __init hugetlb_bootmem_free_invalid_page(int nid, struct page = *page, + struct hstate *h) +{ + unsigned long npages =3D pages_per_huge_page(h); + unsigned long pfn; + + while (npages--) { + pfn =3D page_to_pfn(page); + __init_reserved_page_zone(pfn, nid); + free_reserved_page(page); + page++; + } +} + /* * Put bootmem huge pages into the standard lists after mem_map is up. * Note: This only applies to gigantic (order > MAX_PAGE_ORDER) pages. @@ -3311,14 +3350,25 @@ static void __init prep_and_add_bootmem_folios(stru= ct hstate *h, static void __init gather_bootmem_prealloc_node(unsigned long nid) { LIST_HEAD(folio_list); - struct huge_bootmem_page *m; + struct huge_bootmem_page *m, *tm; struct hstate *h =3D NULL, *prev_h =3D NULL; =20 - list_for_each_entry(m, &huge_boot_pages[nid], list) { + list_for_each_entry_safe(m, tm, &huge_boot_pages[nid], list) { struct page *page =3D virt_to_page(m); struct folio *folio =3D (void *)page; =20 h =3D m->hstate; + if (!hugetlb_bootmem_page_zones_valid(nid, m)) { + /* + * Can't use this page. Initialize the + * page structures if that hasn't already + * been done, and give them to the page + * allocator. + */ + hugetlb_bootmem_free_invalid_page(nid, page, h); + continue; + } + /* * It is possible to have multiple huge page sizes (hstates) * in this list. If so, process each size separately. @@ -3590,13 +3640,20 @@ static void __init hugetlb_init_hstates(void) static void __init report_hugepages(void) { struct hstate *h; + unsigned long nrinvalid; =20 for_each_hstate(h) { char buf[32]; =20 + nrinvalid =3D hstate_boot_nrinvalid[hstate_index(h)]; + h->max_huge_pages -=3D nrinvalid; + string_get_size(huge_page_size(h), 1, STRING_UNITS_2, buf, 32); pr_info("HugeTLB: registered %s page size, pre-allocated %ld pages\n", buf, h->free_huge_pages); + if (nrinvalid) + pr_info("HugeTLB: %s page size: %lu invalid page%s discarded\n", + buf, nrinvalid, nrinvalid > 1 ? "s" : ""); pr_info("HugeTLB: %d KiB vmemmap can be freed for a %s page\n", hugetlb_vmemmap_optimizable_size(h) / SZ_1K, buf); } diff --git a/mm/internal.h b/mm/internal.h index 57662141930e..63fda9bb9426 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -658,6 +658,8 @@ static inline struct page *pageblock_pfn_to_page(unsign= ed long start_pfn, } =20 void set_zone_contiguous(struct zone *zone); +bool pfn_range_intersects_zones(int nid, unsigned long start_pfn, + unsigned long nr_pages); =20 static inline void clear_zone_contiguous(struct zone *zone) { diff --git a/mm/mm_init.c b/mm/mm_init.c index 925ed6564572..f7d5b4fe1ae9 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -2287,6 +2287,31 @@ void set_zone_contiguous(struct zone *zone) zone->contiguous =3D true; } =20 +/* + * Check if a PFN range intersects multiple zones on one or more + * NUMA nodes. Specify the @nid argument if it is known that this + * PFN range is on one node, NUMA_NO_NODE otherwise. + */ +bool pfn_range_intersects_zones(int nid, unsigned long start_pfn, + unsigned long nr_pages) +{ + struct zone *zone, *izone =3D NULL; + + for_each_zone(zone) { + if (nid !=3D NUMA_NO_NODE && zone_to_nid(zone) !=3D nid) + continue; + + if (zone_intersects(zone, start_pfn, nr_pages)) { + if (izone !=3D NULL) + return true; + izone =3D zone; + } + + } + + return false; +} + static void __init mem_init_print_info(void); void __init page_alloc_init_late(void) { --=20 2.48.1.601.g30ceb7b040-goog