From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (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 8F37B3E44E8 for ; Sun, 26 Jul 2026 22:23:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.70 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785104634; cv=none; b=S/GP9cAu2IofHOZtzMBtZhfcaTQUw7AYzyeTR9XmhP5M/oSvpb+JV32boI8G/gvgxku0N1kYUQ8XpzHAEduhkVdRO/rmbMGVv0bniNfTpQ1MDOX9FAmcFBi5UpzxRzdpr+6xyQ4bYR0qDolg98USDSvuEm9jCQKoYm5o/tBAap0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785104634; c=relaxed/simple; bh=eY8Tpvct3P/oYrznv+cGYQOu4q8FfnNFe9JIIJhAFh8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=UIMvQ5XYRl5K/BRLdEw6xZqrXpz5S+rhM6HhZ8clj9h6LvvFjqcXNWfHaW9w9MLYro9ftKnMQ76dFcZawAgy9JGRUZzoRXe0GbBKoAj2q0IqRItCpVvI3wJHE9cevxrIRBX9tckOGsHGhnt/0HCh/gJA7Uasp3fgDbtSf9Ay/cI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=h72YOQWN; arc=none smtp.client-ip=209.85.218.70 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--jackmanb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="h72YOQWN" Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-c1c25c44d15so296995066b.1 for ; Sun, 26 Jul 2026 15:23:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1785104627; x=1785709427; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=tcSdlflfpwT5PIWdrFhCrwpAAQDN4Yx1nAAyXq4J3Vg=; b=h72YOQWNH4N1jHLM2i8da0fcae/5JDW/hmL0mCb4Je/BrChqI5op5gtNbfF2fWJHCS tgyfSR/RgOzgN1RJj33D65+8At9O8TZmzcnTBwlVHuV4efeGoj5yLarO//8tKfO763WQ LEekP5UDa2qqEYG99fH9pFHI3QxQy8lyVcvl1WSx5fNG2osEA3MupCwa8H6IE6p32Gpj Jv1dfISqLSepHoKLSTvJXH54RVR6p8vkM94j1lhk0Wa0MKIO6uTszkFEKCXiEvwApTQw t9dHQLRsg52iNnn8ji8XH31kzJKQwG4jOR8GF48KHBR/NxYn3WLa1uOokwVlB8u3kKny iPQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785104627; x=1785709427; h=content-type: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:content-type; bh=tcSdlflfpwT5PIWdrFhCrwpAAQDN4Yx1nAAyXq4J3Vg=; b=XHLfzwHzODGOPvyKR40btFhSihvPO3T58SqA9sf9F1sxVTc8z9mWXdT4bepQ08qtp5 G2AnXKPpc297A2NxbVVp6onn1XtcP7ME8+YIZG0OQMp518lzls9evQCTx8rbU+UGTT3i J0leIhg1MVS4WuAxmjDbgOfIc6GgFCs+qWcRmuBdat5CFEyQFGrNYtMDlF8KqR6ub8ys 0VdvdLMuBzqHOzsDTjXg5RHiO4WoiTXHR173Kje5dNzmvMSU6iKu8ONoF5r7kJyesGBP wivAYFYXajY+86fLzHOuN4ds7n2TUQTxoJoNANOdJG5BGxAdJ1FjXDpi6c+zL/uY68di Dzzg== X-Forwarded-Encrypted: i=1; AHgh+RojkInbKb6kl7TmANCmYcv54M6+Sp+ch0ozBqM6fhM7ytZLYYl4Z5dIt+6HXWqXR3a1J7PFH4jatl1aAeo=@vger.kernel.org X-Gm-Message-State: AOJu0Yyh1CBwenWvkkvNvh1G6Zop3DZ7noKwbMysRQYky4TOa0lJJbGD mGHSw76du+7bG36kjQrKk0BrbudLgjrKTsUssygPyTWg45Pzij0bYLgDUzoYq3eagZkZFHz6JH5 FpM1h+CVJ2104rg== X-Received: from edgi13-n2.prod.google.com ([2002:a05:6402:a58d:20b0:69e:f058:8db2]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:906:9fca:b0:c16:9d13:26ba with SMTP id a640c23a62f3a-c1f1f0ab0cdmr277102966b.35.1785104626214; Sun, 26 Jul 2026 15:23:46 -0700 (PDT) Date: Sun, 26 Jul 2026 22:22:50 +0000 In-Reply-To: <20260726-page_alloc-unmapped-v3-0-6f5729aa9832@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260726-page_alloc-unmapped-v3-0-6f5729aa9832@google.com> X-Mailer: b4 0.16-dev Message-ID: <20260726-page_alloc-unmapped-v3-17-6f5729aa9832@google.com> Subject: [PATCH v3 17/26] mm: encode freetype flags in pageblock flags From: Brendan Jackman To: Borislav Petkov , Dave Hansen , Peter Zijlstra , Andrew Morton , David Hildenbrand , Vlastimil Babka , Mike Rapoport , Wei Xu , Johannes Weiner , Zi Yan , Lorenzo Stoakes Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org, rppt@kernel.org, Sumit Garg , Will Deacon , rientjes@google.com, "Kalyazin, Nikita" , patrick.roy@linux.dev, "Itazuri, Takahiro" , Andy Lutomirski , David Kaplan , Thomas Gleixner , Yosry Ahmed , Patrick Bellasi , Reiji Watanabe , Sean Christopherson , Brendan Jackman Content-Type: text/plain; charset="utf-8" In preparation for implementing allocation from FREETYPE_UNMAPPED lists. Since it works nicely with the existing allocator logic, and also offers a simple way to amortize TLB flushing costs, ALLOC_UNMAPPED will be implemented by changing mappings at pageblock granularity. Therefore, encode the mapping state in the pageblock flags. Also add the necessary logic to record this from a freetype, and reconstruct a freetype from the pageblock flags. Acked-by: Vlastimil Babka (SUSE) Signed-off-by: Brendan Jackman --- include/linux/pageblock-flags.h | 10 ++++++++++ mm/page_alloc.c | 33 ++++++++++++++++++++------------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/include/linux/pageblock-flags.h b/include/linux/pageblock-flags.h index 9a6c3ea17684d..b634280050071 100644 --- a/include/linux/pageblock-flags.h +++ b/include/linux/pageblock-flags.h @@ -11,6 +11,8 @@ #ifndef PAGEBLOCK_FLAGS_H #define PAGEBLOCK_FLAGS_H +#include +#include #include /* Bit indices that affect a whole block of pages */ @@ -18,6 +20,9 @@ enum pageblock_bits { PB_migrate_0, PB_migrate_1, PB_migrate_2, + PB_freetype_flags, + PB_freetype_flags_end = PB_freetype_flags + NUM_FREETYPE_FLAGS - 1, + PB_compact_skip,/* If set the block is skipped by compaction */ #ifdef CONFIG_MEMORY_ISOLATION @@ -37,6 +42,7 @@ enum pageblock_bits { #define NR_PAGEBLOCK_BITS (roundup_pow_of_two(__NR_PAGEBLOCK_BITS)) #define PAGEBLOCK_MIGRATETYPE_MASK (BIT(PB_migrate_0)|BIT(PB_migrate_1)|BIT(PB_migrate_2)) +#define PAGEBLOCK_FREETYPE_FLAGS_MASK (((1 << NUM_FREETYPE_FLAGS) - 1) << PB_freetype_flags) #ifdef CONFIG_MEMORY_ISOLATION #define PAGEBLOCK_ISO_MASK BIT(PB_migrate_isolate) @@ -44,6 +50,10 @@ enum pageblock_bits { #define PAGEBLOCK_ISO_MASK 0 #endif +#define PAGEBLOCK_FREETYPE_MASK (PAGEBLOCK_MIGRATETYPE_MASK | \ + PAGEBLOCK_ISO_MASK | \ + PAGEBLOCK_FREETYPE_FLAGS_MASK) + #if defined(CONFIG_HUGETLB_PAGE) #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 4965019dc2286..33b7d354e1e03 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -363,11 +363,8 @@ get_pfnblock_bitmap_bitidx(const struct page *page, unsigned long pfn, unsigned long *bitmap; unsigned long word_bitidx; -#ifdef CONFIG_MEMORY_ISOLATION - BUILD_BUG_ON(NR_PAGEBLOCK_BITS != 8); -#else - BUILD_BUG_ON(NR_PAGEBLOCK_BITS != 4); -#endif + /* NR_PAGEBLOCK_BITS must divide word size. */ + BUILD_BUG_ON(NR_PAGEBLOCK_BITS != 4 && NR_PAGEBLOCK_BITS != 8); BUILD_BUG_ON(__MIGRATE_TYPE_END > PAGEBLOCK_MIGRATETYPE_MASK); VM_BUG_ON_PAGE(!zone_spans_pfn(page_zone(page), pfn), page); @@ -440,19 +437,20 @@ static __always_inline freetype_t __get_pfnblock_freetype(const struct page *page, unsigned long pfn, bool ignore_iso) { - unsigned long mask = PAGEBLOCK_MIGRATETYPE_MASK | PAGEBLOCK_ISO_MASK; + unsigned long mask = PAGEBLOCK_FREETYPE_MASK; + enum migratetype migratetype; + unsigned int ft_flags; unsigned long flags; - enum migratetype mt; flags = __get_pfnblock_flags_mask(page, pfn, mask); - mt = flags & PAGEBLOCK_MIGRATETYPE_MASK; + ft_flags = (flags & PAGEBLOCK_FREETYPE_FLAGS_MASK) >> PB_freetype_flags; + migratetype = flags & PAGEBLOCK_MIGRATETYPE_MASK; #ifdef CONFIG_MEMORY_ISOLATION - if (!ignore_iso && flags & BIT(PB_migrate_isolate)) - mt = MIGRATE_ISOLATE; + if (!ignore_iso && (flags & BIT(PB_migrate_isolate))) + migratetype = MIGRATE_ISOLATE; #endif - - return migrate_to_freetype(mt, 0); + return migrate_to_freetype(migratetype, ft_flags); } /** @@ -576,6 +574,15 @@ static void set_pageblock_migratetype(struct page *page, PAGEBLOCK_MIGRATETYPE_MASK | PAGEBLOCK_ISO_MASK); } +static inline void set_pageblock_freetype_flags(struct page *page, + unsigned int ft_flags) +{ + unsigned int flags = ft_flags << PB_freetype_flags; + + __set_pfnblock_flags_mask(page, page_to_pfn(page), flags, + PAGEBLOCK_FREETYPE_FLAGS_MASK); +} + void __meminit init_pageblock_migratetype(struct page *page, enum migratetype migratetype, bool isolate) @@ -599,7 +606,7 @@ void __meminit init_pageblock_migratetype(struct page *page, flags |= BIT(PB_migrate_isolate); #endif __set_pfnblock_flags_mask(page, page_to_pfn(page), flags, - PAGEBLOCK_MIGRATETYPE_MASK | PAGEBLOCK_ISO_MASK); + PAGEBLOCK_FREETYPE_MASK); } #ifdef CONFIG_DEBUG_VM -- 2.54.0