From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) (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 BEFA03D7D91 for ; Wed, 25 Feb 2026 16:34:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772037294; cv=none; b=pNjplhzSCTSxRzE/wRJTGHWthgi7aPvrBVd9mOV2McQWIysW2D28P2Enp6tfok3Hv81fOKQFGWi+d2Ap08J9ZVbSH9DMyWSn4App1XCcZE4HQUHy+7dgUdFrh+aOEoqChJN8WwQ5PxeJy3qSQ06oXlgO+ujq78Z8oyeuoaPRBIc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772037294; c=relaxed/simple; bh=GuBJPvFtQ4Em2r2ydRoPRSO8VxUF63NLsKDKDdWW/gM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=s0e6KBRU2CdLmfjuGwDfq/Oa1dJm1VHTgh5GirVFftwxWHejX8gXKsDa4Z8H9UxuEV5JObfESVPwdGy3xzchWFEDd06nt8shDFpEdJzGZxNJNajVWlKu5HriZRXu1yKnQ7M+bwoIqz+Ob979xVE0+iSD04oEGoIOL+nhry5VcVA= 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=uu4HENR4; arc=none smtp.client-ip=209.85.221.74 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="uu4HENR4" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-43992d6398fso502389f8f.1 for ; Wed, 25 Feb 2026 08:34:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1772037291; x=1772642091; 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=RlNf3cTp43SDl4VGdgu3czPaveOo7YCqos20vV6ESzs=; b=uu4HENR4SL4soo4bnabBlHxgGPGNewsSLtfYOJafAj2mA3iPhV9GwY6AIAhJkgqc8v gxC3esnE3mpFXeyMq2AEKZuFW1GlvZmU21d1mYYG5jjHf8HSlj1QTPeTvbUAOx8IjXf4 vizkJcbNgwXxRwiOiyNr3uO9UEIVel/w+HB8IJvRvex94QUgE0ENdZCa8i3SkCgkeiW0 It4TSbWCP+UlrjDMHpppA76gnT0fspKgWP/5BrjsRxUerUMpKJbicKsEIF1Ad0JeuUmu KuRr4/Y98FEMUxe9/kPzue+Ew/0pmENypfZL0C3cxQB8BoWic+tMTB1P8y5glREHdR7w F/Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772037291; x=1772642091; 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=RlNf3cTp43SDl4VGdgu3czPaveOo7YCqos20vV6ESzs=; b=X6LK1DXb2WFVdYwRvkreisiLTGl76MDDyPSiQaR6ClQwt+L/f5QOBOtMCPwxlj21Xm ez2jzWqK1NREfBEy2Crd+Y8Z6qZ2pojE2uiEAqWPan13xj8ZfeyBn07dCKjk5SNKm2qo jbVwqNZjlDCl7/ZmfMP6kN+DLwAO9zbDgp/9XI5zo84wMTYxtE/GL8y2hGWKY7KUalij MoRMqpqo2yrj7qitp3v/o5oNsoUJdqlOGOij4p4sM9cAo8zyIWMSK29UVr09JFnkJ5Oj ye+ypClL8AZ6zJHyrA5kZuqgMSM1QOyUO6z5KT7StqjM75Gi/cNOFBYE/PZhmrFuNa7t 54Og== X-Forwarded-Encrypted: i=1; AJvYcCXcg0t10g6VW8Yz2R5ze6l1/F2wEGuEprE9iOMUUOOqHHOkBkd3IODytlkkRT3ehC612VzfyaTINiXOv2A=@vger.kernel.org X-Gm-Message-State: AOJu0YyPsncrmb1OnYqF8mw19wcRtormnfzg1dTDvpLwpwmceXWa4Dfj 6I7gGXe/1cyT7BMxNW+ad8JpunFZA9206wwuZs/ImVl8bG5pjedmuHardX4PINy7JyF9glFKWK5 MugerpwPG2/VsBw== X-Received: from wrbfq13.prod.google.com ([2002:a05:6000:2a0d:b0:436:37dd:b500]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:2211:b0:439:9572:52a9 with SMTP id ffacd0b85a97d-43995725453mr896827f8f.41.1772037291074; Wed, 25 Feb 2026 08:34:51 -0800 (PST) Date: Wed, 25 Feb 2026 16:34:36 +0000 In-Reply-To: <20260225-page_alloc-unmapped-v1-0-e8808a03cd66@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260225-page_alloc-unmapped-v1-0-e8808a03cd66@google.com> X-Mailer: b4 0.14.3 Message-ID: <20260225-page_alloc-unmapped-v1-11-e8808a03cd66@google.com> Subject: [PATCH RFC 11/19] mm: rejig pageblock mask definitions From: Brendan Jackman To: Borislav Petkov , Dave Hansen , Peter Zijlstra , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Vlastimil Babka , Wei Xu , Johannes Weiner , Zi Yan Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org, rppt@kernel.org, Sumit Garg , derkling@google.com, reijiw@google.com, Will Deacon , rientjes@google.com, "Kalyazin, Nikita" , patrick.roy@linux.dev, "Itazuri, Takahiro" , Andy Lutomirski , David Kaplan , Thomas Gleixner , Brendan Jackman , Yosry Ahmed Content-Type: text/plain; charset="utf-8" A later patch will complicate the definition of these masks, this is a preparatory patch to make that patch easier to review. - More masks will be needed, so add a PAGEBLOCK_ prefix to the names to avoid polluting the "global namespace" too much. - This makes MIGRATETYPE_AND_ISO_MASK start to look pretty long. Well, that global mask only exists for quite a specific purpose so just drop it and take advantage of the newly-defined PAGEBLOCK_ISO_MASK. Signed-off-by: Brendan Jackman --- include/linux/pageblock-flags.h | 6 +++--- mm/page_alloc.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/linux/pageblock-flags.h b/include/linux/pageblock-flags.h index e046278a01fa8..9a6c3ea17684d 100644 --- a/include/linux/pageblock-flags.h +++ b/include/linux/pageblock-flags.h @@ -36,12 +36,12 @@ enum pageblock_bits { #define NR_PAGEBLOCK_BITS (roundup_pow_of_two(__NR_PAGEBLOCK_BITS)) -#define MIGRATETYPE_MASK (BIT(PB_migrate_0)|BIT(PB_migrate_1)|BIT(PB_migrate_2)) +#define PAGEBLOCK_MIGRATETYPE_MASK (BIT(PB_migrate_0)|BIT(PB_migrate_1)|BIT(PB_migrate_2)) #ifdef CONFIG_MEMORY_ISOLATION -#define MIGRATETYPE_AND_ISO_MASK (MIGRATETYPE_MASK | BIT(PB_migrate_isolate)) +#define PAGEBLOCK_ISO_MASK BIT(PB_migrate_isolate) #else -#define MIGRATETYPE_AND_ISO_MASK MIGRATETYPE_MASK +#define PAGEBLOCK_ISO_MASK 0 #endif #if defined(CONFIG_HUGETLB_PAGE) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 66d4843da8512..9635433c7d711 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -397,7 +397,7 @@ get_pfnblock_bitmap_bitidx(const struct page *page, unsigned long pfn, #else BUILD_BUG_ON(NR_PAGEBLOCK_BITS != 4); #endif - BUILD_BUG_ON(__MIGRATE_TYPE_END > MIGRATETYPE_MASK); + BUILD_BUG_ON(__MIGRATE_TYPE_END > PAGEBLOCK_MIGRATETYPE_MASK); VM_BUG_ON_PAGE(!zone_spans_pfn(page_zone(page), pfn), page); bitmap = get_pageblock_bitmap(page, pfn); @@ -501,7 +501,7 @@ get_pfnblock_freetype(const struct page *page, unsigned long pfn) __always_inline enum migratetype get_pfnblock_migratetype(const struct page *page, unsigned long pfn) { - unsigned long mask = MIGRATETYPE_AND_ISO_MASK; + unsigned long mask = PAGEBLOCK_MIGRATETYPE_MASK | PAGEBLOCK_ISO_MASK; unsigned long flags; flags = __get_pfnblock_flags_mask(page, pfn, mask); @@ -510,7 +510,7 @@ get_pfnblock_migratetype(const struct page *page, unsigned long pfn) if (flags & BIT(PB_migrate_isolate)) return MIGRATE_ISOLATE; #endif - return flags & MIGRATETYPE_MASK; + return flags & PAGEBLOCK_MIGRATETYPE_MASK; } /** @@ -598,11 +598,11 @@ static void set_pageblock_migratetype(struct page *page, } VM_WARN_ONCE(get_pageblock_isolate(page), "Use clear_pageblock_isolate() to unisolate pageblock"); - /* MIGRATETYPE_AND_ISO_MASK clears PB_migrate_isolate if it is set */ + /* PAGEBLOCK_ISO_MASK clears PB_migrate_isolate if it is set */ #endif __set_pfnblock_flags_mask(page, page_to_pfn(page), (unsigned long)migratetype, - MIGRATETYPE_AND_ISO_MASK); + PAGEBLOCK_MIGRATETYPE_MASK | PAGEBLOCK_ISO_MASK); } void __meminit init_pageblock_migratetype(struct page *page, @@ -628,7 +628,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, - MIGRATETYPE_AND_ISO_MASK); + PAGEBLOCK_MIGRATETYPE_MASK | PAGEBLOCK_ISO_MASK); } #ifdef CONFIG_DEBUG_VM -- 2.51.2