From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.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 9B275437856 for ; Thu, 16 Jul 2026 14:30:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784212225; cv=none; b=u6O8zxl9iZOzcgtA0dvrFBtlgV0TGEZpzOo391o7V1ES9FEsbY+kjG6bq9muxFYNYZkx4qcOOkgXk7cCwzdCybkR2Y7pZIO5rArXMEMP/v/zBwHi5pbWnZwQW7iybX0M9ZaK47wgOV8hKrChcu4JJc/+wPzzlou27E4ZwHe+z/c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784212225; c=relaxed/simple; bh=qzD/CNlHTImzTpy/YkW9yoSxvDfct3ktpkoKGeDbIF4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=feXdfsGrKMPwuMvK83/Ed3+QVYa/jNkpOQWLXTIk+QbzlGnUqrgiFVgQRDfj6FTMIlwiQiZce/Q7orC7m7xmHXvgGyhXQyIOriDK7Uydwbye9UNQ5dtU1eEr3BPajtxrmVNgBJ3jX0Y+gOyBw5k/uH0lSxo2X82yXgm/iP4fOxA= 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=aMNLje+o; arc=none smtp.client-ip=209.85.208.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="aMNLje+o" Received: by mail-ed1-f74.google.com with SMTP id 4fb4d7f45d1cf-69c2b3b0a32so7646792a12.0 for ; Thu, 16 Jul 2026 07:30:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1784212222; x=1784817022; 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=qPPMQZI6K5BD2JSD4w/twAcndg7pfdwRcZm6mUR6S/U=; b=aMNLje+ouipiMyzVuEwVIuF9Nzlc4MlzMvFwV5yIG2OXN24XAGc0OcPoFDxrCaHMaq gsvkBB8o6FPzqjkcd/kYs6EUdqZ29TFSyNmW5ghQpMDx1H5Hs5opKJx1ww4lNL6eOxSm k5fhb9ks2J9J0hvMW+cLFNGdRW3ahpDdj36IpKM+ZWWMZ0TT23fcBi7yaUvpdQ6N8WEU CsMl8odXntm9LtXWYNXvnjW9L0b3wmowcZd9u6iKkR18N0AinDjTHXorqfEnva1w7AoK RucuBD0UdvycDQfC2FfyapHEpgAxUPvs6v8ZlQYc/G8DuiMXtIxh3ZQS3ICnDbcetGKN B/Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784212222; x=1784817022; 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=qPPMQZI6K5BD2JSD4w/twAcndg7pfdwRcZm6mUR6S/U=; b=cn5NMCopg6YcjDQq26SsUBGKwOGwyIkyPBYxJvpz92jxj1fQM5VhMmiGjGKQFZP5aF 3puoGCaN2w3JjQdmeMOw3+54qlM9jr5WrD2LMdHXroSNui8yx0uZYk3coaIdTKUe3OfF xqHaARmT6zo7/y57ZDDhYE63gu+JVeqN8IhD2E2JQX6PF+d8aA84ji2O0OMX5oWBOgsI 8pbLhBBr5CS5dKaxEsbIOCqPa6RdrjGYTvzmWcVxDfg7soUaJQy0PUhVwqXFU28yqLW+ S0DVy5KT+Hui13DIPu9GtjU5CnGM+fCPOttYB4i9TJRU3BdH92WRjUSyt7K+dkSvxKcc AXUg== X-Forwarded-Encrypted: i=1; AHgh+Rr+MIYhge2YLaSKYzZbcitwbGx1Edmfi/uYZYUQJuFVt/euz0eXwymFI241+VRjGCD16dBj+H4=@vger.kernel.org X-Gm-Message-State: AOJu0Yy4z+07ouIHqUfb6hIoLyIOkjT801HhAaSFF1kaGWtMkb7rw/Xw pfKRedW9U0R6OjYyRZnDRzZwGLUXd52Sd1akzB53K3TSfsgwXROMcZeY2sfdl647yBKdX7xCTWx aFAm2X9yAVdFnUw== X-Received: from edl2-n2.prod.google.com ([2002:a05:6402:4242:20b0:698:c0d2:794d]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:3596:b0:69c:72e2:a3d9 with SMTP id 4fb4d7f45d1cf-69e199c3870mr3879463a12.21.1784212219530; Thu, 16 Jul 2026 07:30:19 -0700 (PDT) Date: Thu, 16 Jul 2026 14:30:12 +0000 In-Reply-To: <20260716-folio-alloc-cleanups-v1-0-5363b8e92d33@google.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260716-folio-alloc-cleanups-v1-0-5363b8e92d33@google.com> X-Mailer: b4 0.15.2 Message-ID: <20260716-folio-alloc-cleanups-v1-3-5363b8e92d33@google.com> Subject: [PATCH 3/3] mm: move __folio_alloc() to page_alloc.h From: Brendan Jackman To: Andrew Morton , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Johannes Weiner , Zi Yan , "Matthew Wilcox (Oracle)" , Jan Kara , Joshua Hahn , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , Hugh Dickins , Baolin Wang , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , Barry Song , Youngjun Park , "Joerg Roedel (AMD)" , Will Deacon , Robin Murphy , Huacai Chen , WANG Xuerui , Thomas Gleixner , Chuck Lever , Jeff Layton , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, iommu@lists.linux.dev, loongarch@lists.linux.dev, linux-nfs@vger.kernel.org, netdev@vger.kernel.org, Brendan Jackman Content-Type: text/plain; charset="utf-8" This is no longer used outside of mm so reduce the scope. Ulterior motive for the move to mm/: A later patch will add an alloc_flags arg here. Signed-off-by: Brendan Jackman --- include/linux/gfp.h | 4 ---- mm/page_alloc.c | 1 - mm/page_alloc.h | 4 ++++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 572605d84e30e..17c14b8ca007d 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -203,10 +203,6 @@ static inline void arch_free_page(struct page *page, int order) { } static inline void arch_alloc_page(struct page *page, int order) { } #endif -struct folio *__folio_alloc_noprof(gfp_t gfp, unsigned int order, int preferred_nid, - nodemask_t *nodemask); -#define __folio_alloc(...) alloc_hooks(__folio_alloc_noprof(__VA_ARGS__)) - unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid, nodemask_t *nodemask, int nr_pages, struct page **page_array); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 86922270df157..ff8515e173e1e 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5446,7 +5446,6 @@ struct folio *__folio_alloc_noprof(gfp_t gfp, unsigned int order, int preferred_ preferred_nid, nodemask, ALLOC_DEFAULT); return page_rmappable_folio(page); } -EXPORT_SYMBOL(__folio_alloc_noprof); struct folio *folio_alloc_node_noprof(gfp_t gfp, unsigned int order, int nid) { diff --git a/mm/page_alloc.h b/mm/page_alloc.h index b9259deddb59d..409be31898ae7 100644 --- a/mm/page_alloc.h +++ b/mm/page_alloc.h @@ -258,6 +258,10 @@ struct page *__alloc_pages_noprof(gfp_t gfp, unsigned int order, int preferred_n nodemask_t *nodemask, unsigned int alloc_flags); #define __alloc_pages(...) alloc_hooks(__alloc_pages_noprof(__VA_ARGS__)) +struct folio *__folio_alloc_noprof(gfp_t gfp, unsigned int order, int preferred_nid, + nodemask_t *nodemask); +#define __folio_alloc(...) alloc_hooks(__folio_alloc_noprof(__VA_ARGS__)) + extern void zone_pcp_reset(struct zone *zone); extern void zone_pcp_disable(struct zone *zone); extern void zone_pcp_enable(struct zone *zone); -- 2.54.0