From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (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 0F6E22D7DEF for ; Thu, 18 Dec 2025 19:09:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.193 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766084955; cv=none; b=Xa7VO0jakV47glsaiQBCWKaVoB7iHAGgEw5RGUCds6tVRSMO6dsio1B2izZMKlx7NOCK/xm9c+h1q3u6iuifASkj+AS3dfij8lGa+Sz/1ztcODF8XVYQMLMoHQ5+y9uTdW/Z8LAH8Sw8kZbz/ZXEEcorXbVRyVbtlihIYZo/288= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766084955; c=relaxed/simple; bh=XTDWKXVzdNTuLwYU1rAn8HjjsoV1W6XsG1JTSB+jQH4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=YOsgVsilcYLG8lLqZUt5O7N+rZ4NiX6m3iXOqPSVhI6fpFALr7yJd5VY2QkNGiHunlah2NbdpGK9p+lrS+aaEVTpU2pMwf/AJQoGqZQApPcJT8jgFT+SIuX8y2eVapsyI7YAMLrVjT2aZFRj/5m9eaqK8Qkb9EuKK8F5Z8s/bOE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net; spf=pass smtp.mailfrom=gourry.net; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b=Q//b+MQb; arc=none smtp.client-ip=209.85.160.193 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gourry.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b="Q//b+MQb" Received: by mail-qt1-f193.google.com with SMTP id d75a77b69052e-4eda057f3c0so9670241cf.2 for ; Thu, 18 Dec 2025 11:09:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1766084952; x=1766689752; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=sr6t72F2/YlZspjAm+Hn5mEEflMBkP4wvzoax87pPvk=; b=Q//b+MQbhxJHZtkqso2XCesukod34yn8fiS3KewV2joIwbftMo9ICDe1VPLuoC9RAo uK4sf4j0A851IiVUkW0jAdsKx9jKpR3gnCU0WNctAOYzFWV7jFMGfI4lBKn12OGh175g b/oBrJ4cyKjKbU5nApuXZnyGbXVTeYvr/+P9R5++M4ZncxK0KtcTfEma6yoL8iQxaeDS F9p0WuiruLzPLTrHlxNjHp9J1oyyp0jde1zg2pmVLOVdb43hCtOSkpJYodwPsktSUrpU vJ57TBnHd2hCvnj7PWWBkYHQEhm3onxoeNpMT0TnFMWJD9qthtdUZ1n8QGpCNGVcymDc 13PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766084952; x=1766689752; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=sr6t72F2/YlZspjAm+Hn5mEEflMBkP4wvzoax87pPvk=; b=BDvxZCbjflItJHPDKWBnAxc57tJByLSpFyu1rvFxxDUgFrXahWCE+UJPh65APxyQoy 7C6E6x6JVR+qyNKPQte1KH/gc39Q0AXpyVc0Idd8b7OnQXQouC33EtjFciXte5RRIuZc eFvJZhWUylHGfIa7VskEomla8zWVMOqjsj8bG3sJ/6SB/T2wm1iBw7Cqg3XfSHlOoCHq x2SzFYorIeK+J4yp0tS9jn2vA9yemMJBBPLXE28MvXLNIohKg62uMJMPbUfHs1mVoMdi 9ELnH6qSMJlbYFONZ3eB3kbS+tk+UnUFSsSpfIfivvPkzScagn7hGISRwrnusqEy5sux e/iw== X-Gm-Message-State: AOJu0Yw0pDStpzWhpgcAkx12nIfi56631wQKAk/OYIpblvAMxErG+Kof qXWIrVGjOn2GCil4li/LEfCRxvPVY38LBT7yW6xIv4W1cjJWl12uBMdHdgzoFiEh/Zw= X-Gm-Gg: AY/fxX7g+X3M6vRbCNFb92ckz0y0XeLTZImUdOnUMR8XRBfmnM1V5hbxqxxSLezsz0h AbiqD57Ukuo+5lgG6fHn9mexSPv/6dLSyvcRgcQIX2SRwq3Ua80xz6sUOUWJwZkUHFw2RbL+WM0 Tdr9RLHcu5epwDn1O9rSR1i8+40UU6jv175cqzGx/HP0WXDdfdXyDZepqBKtk1mxKiP971/cyPr JHf8yRNCksEnF9bC6WeQOVpAwJwfJCDmTlctLqxKFYKgw3PkwRVCdyuiTf7ydEe68+AYQMvnIFP kQbWCIB3wAc6mOrW3BMj7I8NfCIPqVafAQHrAi11SOsOIcrvzpHBx51eh4D35p6Hm7KobnwwoE3 P+C6GzlfDMKybYr/Qn0WTNA5/olyreSs9lQieIUMwgA493xqIHiEMc8SYJ06mJ1d///DrpMszSx qStUsoWQglQ4bRGZR8j/9hzwDaGVrWXyLcVHSWWbZaV7MPv/5Ot5c0+6NZoHkpu4Xfso+ouTHvD CU= X-Google-Smtp-Source: AGHT+IE2kdBu3P33xwfz1hi6O4x5R3FYIFiXDMr78ahQNaJ9YkXrvKTYMyxchFx9IfZwSWBKWgVahg== X-Received: by 2002:ac8:5714:0:b0:4ed:b06b:d67d with SMTP id d75a77b69052e-4f4abd79a65mr3935091cf.45.1766084951597; Thu, 18 Dec 2025 11:09:11 -0800 (PST) Received: from gourry-fedora-PF4VCD3F.lan (pool-96-255-20-138.washdc.ftas.verizon.net. [96.255.20.138]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4f4ac532d08sm382601cf.6.2025.12.18.11.09.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Dec 2025 11:09:11 -0800 (PST) From: Gregory Price To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, akpm@linux-foundation.org, vbabka@suse.cz, surenb@google.com, mhocko@suse.com, jackmanb@google.com, hannes@cmpxchg.org, ziy@nvidia.com, richard.weiyang@gmail.com, osalvador@suse.de, rientjes@google.com, david@redhat.com, joshua.hahnjy@gmail.com, fvdl@google.com Subject: [PATCH v5] page_alloc: allow migration of smaller hugepages during contig_alloc Date: Thu, 18 Dec 2025 14:08:31 -0500 Message-ID: <20251218190832.1319797-1-gourry@gourry.net> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit We presently skip regions with hugepages entirely when trying to do contiguous page allocation. This will cause otherwise-movable 2MB HugeTLB pages to be considered unmovable, and will make 1GB hugepages allocation less reliable on systems utilizing both. Commit 4d73ba5fa710 ("mm: page_alloc: skip regions with hugetlbfs pages when allocating 1G pages") skipped all HugePage containing regions because it can cause significant delays in 1G allocation (as HugeTLB migrations may fail for a number of reasons). Instead, if hugepage migration is enabled, consider regions with hugepages smaller than the target contiguous allocation request as valid targets for allocation. We optimize for the existing behavior by searching for non-hugetlb regions in a first pass, then retrying the search to include hugetlb only on failure. This allows the existing fast-path to remain the default case with a slow-path fallback to increase reliability. isolate_migrate_pages_block() has similar hugetlb filter logic, and the hugetlb code does a migratable check in folio_isolate_hugetlb() during isolation. The code servicing the allocation and migration already supports this exact use case (it's just unreachable). To test, allocate a bunch of 2MB HugeTLB pages (in this case 48GB) and then attempt to allocate some 1G HugeTLB pages (in this case 4GB) (Scale to your machine's memory capacity). echo 24576 > .../hugepages-2048kB/nr_hugepages echo 4 > .../hugepages-1048576kB/nr_hugepages Prior to this patch, the 1GB page allocation can fail if no contiguous 1GB pages remain. After this patch, the kernel will try to move 2MB pages and successfully allocate the 1GB pages (assuming overall sufficient memory is available). Also tested this while a program had the 2MB reservations mapped, and the 1GB reservation still succeeds. folio_alloc_gigantic() is the primary user of alloc_contig_pages(), other users are debug or init-time allocations and largely unaffected. - ppc/memtrace is a debugfs interface - x86/tdx memory allocation occurs once on module-init - kfence/core happens once on module (late) init - THP uses it in debug_vm_pgtable_alloc_huge_page at __init time Suggested-by: David Hildenbrand Link: https://lore.kernel.org/linux-mm/6fe3562d-49b2-4975-aa86-e139c535ad00@redhat.com/ Signed-off-by: Gregory Price --- v5: add fast-path/slow-path mechanism to retain current performance dropped tags as this changes the behavior of the patch most of the logic otherwise remains the same. mm/page_alloc.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 822e05f1a964..3ddad1fca924 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -7083,7 +7083,7 @@ static int __alloc_contig_pages(unsigned long start_pfn, } static bool pfn_range_valid_contig(struct zone *z, unsigned long start_pfn, - unsigned long nr_pages) + unsigned long nr_pages, bool search_hugetlb) { unsigned long i, end_pfn = start_pfn + nr_pages; struct page *page; @@ -7099,8 +7099,30 @@ static bool pfn_range_valid_contig(struct zone *z, unsigned long start_pfn, if (PageReserved(page)) return false; - if (PageHuge(page)) - return false; + /* + * Only consider ranges containing hugepages if those pages are + * smaller than the requested contiguous region. e.g.: + * Move 2MB pages to free up a 1GB range. + * Don't move 1GB pages to free up a 2MB range. + * + * This makes contiguous allocation more reliable if multiple + * hugepage sizes are used without causing needless movement. + */ + if (PageHuge(page)) { + unsigned int order; + + if (!IS_ENABLED(CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION)) + return false; + + if (!search_hugetlb) + return false; + + page = compound_head(page); + order = compound_order(page); + if ((order >= MAX_FOLIO_ORDER) || + (nr_pages <= (1 << order))) + return false; + } } return true; } @@ -7143,7 +7165,9 @@ struct page *alloc_contig_pages_noprof(unsigned long nr_pages, gfp_t gfp_mask, struct zonelist *zonelist; struct zone *zone; struct zoneref *z; + bool hugetlb = false; +retry: zonelist = node_zonelist(nid, gfp_mask); for_each_zone_zonelist_nodemask(zone, z, zonelist, gfp_zone(gfp_mask), nodemask) { @@ -7151,7 +7175,8 @@ struct page *alloc_contig_pages_noprof(unsigned long nr_pages, gfp_t gfp_mask, pfn = ALIGN(zone->zone_start_pfn, nr_pages); while (zone_spans_last_pfn(zone, pfn, nr_pages)) { - if (pfn_range_valid_contig(zone, pfn, nr_pages)) { + if (pfn_range_valid_contig(zone, pfn, nr_pages, + hugetlb)) { /* * We release the zone lock here because * alloc_contig_range() will also lock the zone @@ -7170,6 +7195,17 @@ struct page *alloc_contig_pages_noprof(unsigned long nr_pages, gfp_t gfp_mask, } spin_unlock_irqrestore(&zone->lock, flags); } + /* + * If we failed, retry the search, but treat regions with HugeTLB pages + * as valid targets. This retains fast-allocations on first pass + * without trying to migrate HugeTLB pages (which may fail). On the + * second pass, we will try moving HugeTLB pages when those pages are + * smaller than the requested contiguous region size. + */ + if (!hugetlb && IS_ENABLED(CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION)) { + hugetlb = true; + goto retry; + } return NULL; } #endif /* CONFIG_CONTIG_ALLOC */ -- 2.52.0