From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.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 4EB94411672 for ; Mon, 29 Jun 2026 13:12:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782738748; cv=none; b=LNttzetQ58p4acIf8S9ij5tkOH5FarplsqBC+4nRkxCWyM71eOXCeoauAPbDANsXn0iOj3Q+YZMR0oRqA+qt/1t7Bm/zJcBwF4vNSx0lYhycekUbG9cMLU3xRZVQzcYrYymjrJ8uWzrTZY7251Y2BDfVSwNfAr6Ftv+CTR0Ameg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782738748; c=relaxed/simple; bh=JW40cAXM1eoOofUNrVE6e84eWLUSW5fZtM+zK/Zmeus=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=WBUu1UCyO1pGOwLY7Y1Q95PyjLknMU/E5F/ckPotzmjSm1RmLjGO8GxqFpj0kJGdcDJCmh3o2AmpQzTAgr/9HC796uSus/mlJ1R1jHUlyoOm0CBh3Tn8U9//rwkMVQDusO0f3EBhKzS4gzgIuIrDNQ5uR3G54X716aEN8gyZLqI= 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=cAOp083U; arc=none smtp.client-ip=209.85.218.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--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="cAOp083U" Received: by mail-ej1-f73.google.com with SMTP id a640c23a62f3a-c1271887c33so61326166b.3 for ; Mon, 29 Jun 2026 06:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782738746; x=1783343546; 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=e2Xbl3DpTg332+B3HXNH9gd21p1cWVBDgn76IACGTuM=; b=cAOp083UeWE75Hf4d/is9iMrFbWc5UT0+wZAWivSfB/qWnXAWnwlynPI18POOTT6jQ w6A31Gw6DYfg3500dB139J6HvI/MvyPSIGGrIEN7+vXd6khxi0WAcaoLTRNaLwdT84LY 10vrP0VRn/2zOJvLqGR/RnSBrUxeYL90zQjTa7PY4gz5pqVHTSvPq6TvLcksOApIEoed +x+wc1rKza/7fXn9g1pJXlwUaJECGGELz1t05MW9VDBvZBpMjaEFQfxWmhfsP1Dg0aIK hUNGdKUEvKJqS48hXqo4zwxzU5/jooiiQJpSwJ4T1eONfR0iUD+VAPxW1qPG3JA7rw99 j2Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782738746; x=1783343546; 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=e2Xbl3DpTg332+B3HXNH9gd21p1cWVBDgn76IACGTuM=; b=BX00R51R0J2RfOF83g5lpF0ZkQE9IXSKXEpYC7KinW0DevkZQJ//UGAit1UpiVYSui Jf0BnTfXwssApMHdYxNccED3yK42MNsppEB5qfigOerx3MZt5a2ZyzbuZZJXak5+uPkz 9W/zJXPOTeEalGb/w4mN36PGtBpZ+JcN3NqVj2Mq0YuXSncGuWcOCT5uPK3oSqOWL87y xNvg9i03ysjGCctK9BaufNViesA6JIoJBNT5yiHX+g+NFvVd72s6KjuNKI+Uciirqyv8 QQ+jrJl8G8vas9OS6H1HKMriZHf8L16JZHcoRUydbIz+YzdZAQLYm2/i7GBan4p0uCCp uz7Q== X-Forwarded-Encrypted: i=1; AHgh+RqafIHaVYGHLGgMWlk2uqW0AECgC5Dthk2pHTDiMCTtFVsy7zzaH6jmh1JdYjyVvnJkLbcHYg42PlZBnAA=@vger.kernel.org X-Gm-Message-State: AOJu0YyFVzcePV18FDbOAB64y9XQg0WsIcldjShii6rP24xKN8lDPyA/ Msy/2+ThhtclaGo398UyxSNAhLKIechI8kXtCKNcAODvNSqAx7q2DyrG6GIhJgDfhE9NwZ/LwG2 df47ZNG+JXQMH3g== X-Received: from edge12-n2.prod.google.com ([2002:a05:6402:a54c:20b0:698:6fd7:ef0c]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:906:9f8a:b0:bee:f541:1dca with SMTP id a640c23a62f3a-c1205eb8582mr908967466b.28.1782738743913; Mon, 29 Jun 2026 06:12:23 -0700 (PDT) Date: Mon, 29 Jun 2026 13:11:56 +0000 In-Reply-To: <20260629-alloc-trylock-v3-0-57bef0eadbc2@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260629-alloc-trylock-v3-0-57bef0eadbc2@google.com> X-Mailer: b4 0.15.2 Message-ID: <20260629-alloc-trylock-v3-7-57bef0eadbc2@google.com> Subject: [PATCH v3 07/16] mm: move some stuff to mm/page_alloc.h From: Brendan Jackman To: Andrew Morton , Vlastimil Babka , Suren Baghdasaryan , Michal Hocko , Johannes Weiner , Zi Yan , Muchun Song , Oscar Salvador , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Mike Rapoport , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Ying Huang , Alistair Popple , Hao Li , Christoph Lameter , David Rientjes , Roman Gushchin , Sebastian Andrzej Siewior , Clark Williams , Steven Rostedt Cc: "Harry Yoo (Oracle)" , Gregory Price , Johannes Weiner , Alexei Starovoitov , Matthew Wilcox , Hao Ge , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev, Brendan Jackman Content-Type: text/plain; charset="utf-8" Some of this stuff in the public header is only used internally so shrink the scope to avoid silently growing new users. drain_local_pages() is still used from kernel/power/snapshot.c so that needs to stay behind. Signed-off-by: Brendan Jackman --- include/linux/gfp.h | 26 -------------------------- mm/page_alloc.h | 28 ++++++++++++++++++++++++++++ mm/vmstat.c | 1 + 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index cdf95a9f0b87c..01d6d2591f49e 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -17,28 +17,6 @@ struct mempolicy; #define __default_gfp(a,b,...) b #define default_gfp(...) __default_gfp(,##__VA_ARGS__,GFP_KERNEL) -/* Convert GFP flags to their corresponding migrate type */ -#define GFP_MOVABLE_MASK (__GFP_RECLAIMABLE|__GFP_MOVABLE) -#define GFP_MOVABLE_SHIFT 3 - -static inline int gfp_migratetype(const gfp_t gfp_flags) -{ - VM_WARN_ON((gfp_flags & GFP_MOVABLE_MASK) == GFP_MOVABLE_MASK); - BUILD_BUG_ON((1UL << GFP_MOVABLE_SHIFT) != ___GFP_MOVABLE); - BUILD_BUG_ON((___GFP_MOVABLE >> GFP_MOVABLE_SHIFT) != MIGRATE_MOVABLE); - BUILD_BUG_ON((___GFP_RECLAIMABLE >> GFP_MOVABLE_SHIFT) != MIGRATE_RECLAIMABLE); - BUILD_BUG_ON(((___GFP_MOVABLE | ___GFP_RECLAIMABLE) >> - GFP_MOVABLE_SHIFT) != MIGRATE_HIGHATOMIC); - - if (unlikely(page_group_by_mobility_disabled)) - return MIGRATE_UNMOVABLE; - - /* Group based on mobility */ - return (__force unsigned long)(gfp_flags & GFP_MOVABLE_MASK) >> GFP_MOVABLE_SHIFT; -} -#undef GFP_MOVABLE_MASK -#undef GFP_MOVABLE_SHIFT - static inline bool gfpflags_allow_blocking(const gfp_t gfp_flags) { return !!(gfp_flags & __GFP_DIRECT_RECLAIM); @@ -395,10 +373,6 @@ extern void free_pages(unsigned long addr, unsigned int order); #define __free_page(page) __free_pages((page), 0) #define free_page(addr) free_pages((addr), 0) -void page_alloc_init_cpuhp(void); -bool decay_pcp_high(struct zone *zone, struct per_cpu_pages *pcp); -void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp); -void drain_all_pages(struct zone *zone); void drain_local_pages(struct zone *zone); void page_alloc_init_late(void); diff --git a/mm/page_alloc.h b/mm/page_alloc.h index e16f905f859a7..af83764788b96 100644 --- a/mm/page_alloc.h +++ b/mm/page_alloc.h @@ -266,6 +266,34 @@ static inline bool free_area_empty(struct free_area *area, int migratetype) return list_empty(&area->free_list[migratetype]); } +/* Convert GFP flags to their corresponding migrate type */ +#define GFP_MOVABLE_MASK (__GFP_RECLAIMABLE|__GFP_MOVABLE) +#define GFP_MOVABLE_SHIFT 3 + +static inline int gfp_migratetype(const gfp_t gfp_flags) +{ + VM_WARN_ON((gfp_flags & GFP_MOVABLE_MASK) == GFP_MOVABLE_MASK); + BUILD_BUG_ON((1UL << GFP_MOVABLE_SHIFT) != ___GFP_MOVABLE); + BUILD_BUG_ON((___GFP_MOVABLE >> GFP_MOVABLE_SHIFT) != MIGRATE_MOVABLE); + BUILD_BUG_ON((___GFP_RECLAIMABLE >> GFP_MOVABLE_SHIFT) != MIGRATE_RECLAIMABLE); + BUILD_BUG_ON(((___GFP_MOVABLE | ___GFP_RECLAIMABLE) >> + GFP_MOVABLE_SHIFT) != MIGRATE_HIGHATOMIC); + + if (unlikely(page_group_by_mobility_disabled)) + return MIGRATE_UNMOVABLE; + + /* Group based on mobility */ + return (__force unsigned long)(gfp_flags & GFP_MOVABLE_MASK) >> GFP_MOVABLE_SHIFT; +} +#undef GFP_MOVABLE_MASK +#undef GFP_MOVABLE_SHIFT + +bool decay_pcp_high(struct zone *zone, struct per_cpu_pages *pcp); +void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp); +void drain_all_pages(struct zone *zone); +void drain_local_pages(struct zone *zone); + +void page_alloc_init_cpuhp(void); void page_alloc_sysctl_init(void); #endif /* __MM_PAGE_ALLOC_H */ diff --git a/mm/vmstat.c b/mm/vmstat.c index 7b93fbf9af092..3b5cb1031f720 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -30,6 +30,7 @@ #include #include "internal.h" +#include "page_alloc.h" #ifdef CONFIG_PROC_FS #ifdef CONFIG_NUMA -- 2.54.0