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>
Subject: [PATCH 12/27] mm/hugetlb: set migratetype for bootmem folios
Date: Mon, 27 Jan 2025 23:21:52 +0000 [thread overview]
Message-ID: <20250127232207.3888640-13-fvdl@google.com> (raw)
In-Reply-To: <20250127232207.3888640-1-fvdl@google.com>
The pageblocks that back memblock allocated hugetlb folios might
not have the migrate type set, in the CONFIG_DEFERRED_STRUCT_PAGE_INIT
case.
memblock allocated hugetlb folios might be given to the buddy allocator
eventually (if nr_hugepages is lowered), so make sure that the migrate
type for the pageblocks contained in them is set when initializing them.
Set it to the default that memmap init also uses (MIGRATE_MOVABLE).
Signed-off-by: Frank van der Linden <fvdl@google.com>
---
mm/hugetlb.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index a95ab44d5545..9969717b7dd8 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -36,6 +36,7 @@
#include <linux/memory.h>
#include <linux/mm_inline.h>
#include <linux/padata.h>
+#include <linux/page-isolation.h>
#include <asm/page.h>
#include <asm/pgalloc.h>
@@ -3258,6 +3259,26 @@ static void __init hugetlb_folio_init_vmemmap(struct folio *folio,
prep_compound_head((struct page *)folio, huge_page_order(h));
}
+/*
+ * memblock-allocated pageblocks might not have the migrate type set
+ * if marked with the 'noinit' flag. Set it to the default (MIGRATE_MOVABLE)
+ * here.
+ *
+ * Note that this will not write the page struct, it is ok (and necessary)
+ * to do this on vmemmap optimized folios.
+ */
+static void __init hugetlb_bootmem_init_migratetype(struct folio *folio,
+ struct hstate *h)
+{
+ unsigned long nr_pages = pages_per_huge_page(h), i;
+
+ WARN_ON_ONCE(!pageblock_aligned(folio_pfn(folio)));
+
+ for (i = 0; i < nr_pages; i += pageblock_nr_pages)
+ set_pageblock_migratetype(folio_page(folio, i),
+ MIGRATE_MOVABLE);
+}
+
static void __init prep_and_add_bootmem_folios(struct hstate *h,
struct list_head *folio_list)
{
@@ -3279,6 +3300,7 @@ static void __init prep_and_add_bootmem_folios(struct hstate *h,
HUGETLB_VMEMMAP_RESERVE_PAGES,
pages_per_huge_page(h));
}
+ hugetlb_bootmem_init_migratetype(folio, h);
/* Subdivide locks to achieve better parallel performance */
spin_lock_irqsave(&hugetlb_lock, flags);
__prep_account_new_huge_page(h, folio_nid(folio));
--
2.48.1.262.g85cc9f2d1e-goog
next prev parent reply other threads:[~2025-01-27 23:22 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-27 23:21 [PATCH 00/27] hugetlb/CMA improvements for large systems Frank van der Linden
2025-01-27 23:21 ` [PATCH 01/27] mm/cma: export total and free number of pages for CMA areas Frank van der Linden
2025-01-27 23:21 ` [PATCH 02/27] mm, cma: support multiple contiguous ranges, if requested Frank van der Linden
2025-01-28 4:19 ` Andrew Morton
2025-01-28 5:15 ` Frank van der Linden
2025-01-27 23:21 ` [PATCH 03/27] mm/cma: introduce cma_intersects function Frank van der Linden
2025-01-27 23:21 ` [PATCH 04/27] mm, hugetlb: use cma_declare_contiguous_multi Frank van der Linden
2025-01-27 23:21 ` [PATCH 05/27] mm/hugetlb: fix round-robin bootmem allocation Frank van der Linden
2025-01-27 23:21 ` [PATCH 06/27] mm/hugetlb: remove redundant __ClearPageReserved Frank van der Linden
2025-01-27 23:21 ` [PATCH 07/27] mm/hugetlb: use online nodes for bootmem allocation Frank van der Linden
2025-01-27 23:21 ` [PATCH 08/27] mm/hugetlb: convert cmdline parameters from setup to early Frank van der Linden
2025-01-27 23:21 ` [PATCH 09/27] x86/mm: make register_page_bootmem_memmap handle PTE mappings Frank van der Linden
2025-01-27 23:21 ` [PATCH 10/27] mm/bootmem_info: export register_page_bootmem_memmap Frank van der Linden
2025-01-27 23:21 ` [PATCH 11/27] mm/sparse: allow for alternate vmemmap section init at boot Frank van der Linden
2025-01-27 23:21 ` Frank van der Linden [this message]
2025-01-27 23:21 ` [PATCH 13/27] mm: define __init_reserved_page_zone function Frank van der Linden
2025-01-27 23:21 ` [PATCH 14/27] mm/hugetlb: check bootmem pages for zone intersections Frank van der Linden
2025-01-27 23:21 ` [PATCH 15/27] mm/sparse: add vmemmap_*_hvo functions Frank van der Linden
2025-01-27 23:21 ` [PATCH 16/27] mm/hugetlb: deal with multiple calls to hugetlb_bootmem_alloc Frank van der Linden
2025-01-27 23:21 ` [PATCH 17/27] mm/hugetlb: move huge_boot_pages list init " Frank van der Linden
2025-01-27 23:21 ` [PATCH 18/27] mm/hugetlb: add pre-HVO framework Frank van der Linden
2025-01-27 23:21 ` [PATCH 19/27] mm/hugetlb_vmemmap: fix hugetlb_vmemmap_restore_folios definition Frank van der Linden
2025-01-27 23:22 ` [PATCH 20/27] mm/hugetlb: do pre-HVO for bootmem allocated pages Frank van der Linden
2025-01-27 23:22 ` [PATCH 21/27] x86/setup: call hugetlb_bootmem_alloc early Frank van der Linden
2025-01-27 23:22 ` [PATCH 22/27] x86/mm: set ARCH_WANT_SPARSEMEM_VMEMMAP_PREINIT Frank van der Linden
2025-01-27 23:22 ` [PATCH 23/27] mm/cma: simplify zone intersection check Frank van der Linden
2025-01-27 23:22 ` [PATCH 24/27] mm/cma: introduce a cma validate function Frank van der Linden
2025-01-27 23:22 ` [PATCH 25/27] mm/cma: introduce interface for early reservations Frank van der Linden
2025-01-27 23:22 ` [PATCH 26/27] mm/hugetlb: add hugetlb_cma_only cmdline option Frank van der Linden
2025-01-27 23:22 ` [PATCH 27/27] mm/hugetlb: enable bootmem allocation from CMA areas Frank van der Linden
2025-01-28 8:55 ` Christophe Leroy
2025-01-28 17:52 ` Frank van der Linden
2025-01-29 22:43 ` Frank van der Linden
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250127232207.3888640-13-fvdl@google.com \
--to=fvdl@google.com \
--cc=akpm@linux-foundation.org \
--cc=joao.m.martins@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=muchun.song@linux.dev \
--cc=roman.gushchin@linux.dev \
--cc=usama.arif@bytedance.com \
--cc=yuzhao@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®