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 ECF813D4114 for ; Fri, 3 Jul 2026 12:32:30 +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=1783081955; cv=none; b=kRT77E8XDM16+rLi/sYfyLIxnwP1boEDUAh4HA1I7rVBMsSHgilfcK7KU76vSv+Cn0lfJsWXB7oMYJzqCc1lAdrPJB1IDDCL7r9YLemkuYt2KfpoJzwegX+7DtksqGO1MnARcBiYpHaITEdryM+/f2ealjg62NCyXzEKHfB2Lro= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783081955; c=relaxed/simple; bh=22vkACm3zMTGwjU3/Ko9sIv39tcaXETpTXXq3Ombx3E=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Q0K3ofOn85KXkVCx+JJcbW8SkLeV/3Xipq6MqU91FV2JwHK0FbAkrX35DJUFy0xkekFxskNIOImBdYqmPM2nWxCmM8yhHNOyTfo7ZVHIl8/eL/YaZaXNnoVssOoHVGga2vBvreXaX5+Pec7bwzg2Ra4qH+Dn5vxge89q+ziJnS4= 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=EyShewFm; 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="EyShewFm" Received: by mail-ej1-f73.google.com with SMTP id a640c23a62f3a-c126399a328so59335466b.1 for ; Fri, 03 Jul 2026 05:32:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1783081948; x=1783686748; 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=kjqMpiMEIhi+v1xNPECWvli3AP0POG8k3VRaLZYrcmk=; b=EyShewFm55Q9PVGX2xT2RnNB+RKZHYNgyOWRISdtKUTk9aG46+dEJPrv8T1voDdN8+ 6t5gvKrG8JjCPK1AGWAZCQ++a3KuG6lf9c8TfnmuNXFKmZUdXzakIp1oDwAqKuAyDW3b JGZ//9tA5ntjieR0hn0gvkyaRLZPVmeUdBiYBULqc4Dnl0OCHIioARlesckRe3aNjUst lJT6IPj78+0tGZypXSAOr+XsePrR83jTld/XfDh126/JS0kylUen9XVNJ/lNOeescBVm mB+xtDCyoAhL5w5oXam1gIFWCcs39gIhv5yJgiiCQy/fiOshelSGobONrDbWv1HDl9SF XEKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783081948; x=1783686748; 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=kjqMpiMEIhi+v1xNPECWvli3AP0POG8k3VRaLZYrcmk=; b=BxlmYRst1ZabFXqD6v3SlMfV41LWOHH/Mt974AA0huO1/NunWZLoalItrxIa/+x3gv AvOV9rBYpjQElVvH3RWzxrB+jGfJiHdjCMp9k+doksYeDD6k++TDo0ZeOKYrR1jNloy7 vOdzeySoQarFvqDy9Zzt2BMJvnb3QEWJk1qyTREQuV7rqdVFHvblZcWBbz/yw1yZcNZX ys9xC/quTVsJYp0UIdgM4FGcpC9xnU/W7PaK3xrGag2WAWvhvaOmJKx7XK2f0WXyrRqg 1ZEYglnpv6q7U+Bjl8XhkhvYEgyUM22L3mH4EGE80r2avBGhPQiCtXamtb9dlkaP7WN6 kKkQ== X-Forwarded-Encrypted: i=1; AHgh+RqPUNcqYibLcmkBF+XJTMX4BTlBo6PxraQj4yGMF+YW5RZoxewQM7kACC9JlhHIHHoi4C/QXuZWQUZifXM=@vger.kernel.org X-Gm-Message-State: AOJu0Yyj41yneXRRKBsLx10fiiV5I8OJVRZxrX/WSTrw5OApjqFPmPzG feTsnnl+onn8ybtSdA1yQFUaEoxTcc/fI6l0VI77NlHXHyWOEaf3JBiH7PT/GmQHh/JiBxsy84f BtrJM+Pw3xcQtNg== X-Received: from ejdj17.prod.google.com ([2002:a17:906:951:b0:c12:8a76:87bc]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:906:261a:b0:c11:f4d6:48fc with SMTP id a640c23a62f3a-c12aa336682mr327263566b.45.1783081947831; Fri, 03 Jul 2026 05:32:27 -0700 (PDT) Date: Fri, 03 Jul 2026 12:31:47 +0000 In-Reply-To: <20260703-alloc-trylock-v5-0-c87b714e19d3@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260703-alloc-trylock-v5-0-c87b714e19d3@google.com> X-Mailer: b4 0.15.2 Message-ID: <20260703-alloc-trylock-v5-7-c87b714e19d3@google.com> Subject: [PATCH v5 07/18] 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, derkling@google.com, reijiw@google.com, Brendan Jackman , Yosry Ahmed 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. Reviewed-by: Vlastimil Babka (SUSE) Signed-off-by: Brendan Jackman --- include/linux/gfp.h | 26 -------------------------- mm/page_alloc.h | 27 +++++++++++++++++++++++++++ mm/vmstat.c | 1 + 3 files changed, 28 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 a4f4b325381ad..2d60551b4453f 100644 --- a/mm/page_alloc.h +++ b/mm/page_alloc.h @@ -266,6 +266,33 @@ 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 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