From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 52FF13BADB6 for ; Mon, 11 May 2026 08:52:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778489579; cv=none; b=UHYBGQEDa6WWyI2qTU599TYz9DE2oT/j71xjygt4YBeKy7FLsfXC0iI3LE9TQNiiNwLyjVypDmxuspB3Mx48ZhFnZ4a3O5FUGBVe8pj1jz9ChJjzDbLyINDuAwDcVJqIi0mop0F8xoB5y8vkon2+i+jb/AKjX5isEXGJSKztcH8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778489579; c=relaxed/simple; bh=9w/BOdxv/UPl05k6lc7Ua9O+VaMhaIMHRfLJTh0Clsg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=ZxRM/ZBXwzM+MLKTbDsqN+PIK2GnbH92dzi6vqtclARpoM34kBnUB3eFO09CbEF4RFqR1rbvwcExeJ3pDBI1d2MDZM8bjAvgcV8FwT+LAdtpFI/GHtgkbTWQ5G2sLHuLgBaS06H+0q5Cy2BO7HP2C7zqM+jSJiVtCOr4hVystzw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=fHAPbnwC; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=ikB4LyMm; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fHAPbnwC"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="ikB4LyMm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778489576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=hsz4Yb9WaP0J2d/ovLyM+GlU9a8IJXiQXaVWXPUNWME=; b=fHAPbnwCMPRTKsGdf+XYZeBIytAjY1s8MUvposM1W57+9ZEewXB+myE0tzSEhbz1ZQ7jp6 JEhp2Bkj64MR0q8/Zyk/O9jaMs/NspXzMY2A0Rl4BuCGJ+tKxOFCaoqZHgpCP7SlMLy99O a0w31472dHRILNzAwufkfFFtSjT8tGI= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-194-2Db6XLefM-y17ZCuvhNvQg-1; Mon, 11 May 2026 04:52:54 -0400 X-MC-Unique: 2Db6XLefM-y17ZCuvhNvQg-1 X-Mimecast-MFC-AGG-ID: 2Db6XLefM-y17ZCuvhNvQg_1778489574 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-449dcfe8005so3832493f8f.3 for ; Mon, 11 May 2026 01:52:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1778489573; x=1779094373; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=hsz4Yb9WaP0J2d/ovLyM+GlU9a8IJXiQXaVWXPUNWME=; b=ikB4LyMmiLp40SemrRP1WBN0/tnTXffPOoViwKZBFaAu5piPoj8t3ThIjPmbzIF0A/ ddOoUWjwibGDMoZUW7oFS8nuEN64z8HAP30AVu/oNUxbVZxCPva89oizDohTOhRYjXwv 9tOTHHW5j14+opEtRI/vIBBDBUtUUDabA/0OnH6dn89rgHYqAedSoR7SjvN5tT7MowTe 8yONzFhWzHi3vBNHqw4iKr41ivMUW6Y+ohkpipmlhTjThvj8JwKd0MZY0BYY+er6qUzT AwH8+zZ2CWZ0n+i2qIWJbOGE8sn3WZRDqZ27x/uY573gDU409maXwo8TA7VxKVEcYt63 ymCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778489573; x=1779094373; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hsz4Yb9WaP0J2d/ovLyM+GlU9a8IJXiQXaVWXPUNWME=; b=CLbDTPgGC0jcYsih4NOhy1PBObN74xf8KU4PEhLLpFQFm3Tf2fL6fJ1bLAiPMQUEwc UN1EVDrdfyZIfZK3qCRH8Vkn1pt8kaZcOEpUufzWcdSYvmv4MHQ9YTY77lAmVI+OgRVj SNq2Jmz47r7Z5YKYm2N6zpcHDalVOo5fyvzRcbDcSbVVrGbJJn5gf9DV5JoLwAEpgxpE twpqaKXk3m8cs4HXt0eh4vp4FxdW+599n7HZMCgdzeT1NuO4cAwpYASTpkzR4YVQnTWI JJz9Afyzb94aszB1FEGDroRXgvm797A47qs3k+esYBims18kLJSebMRTznU1xR8BE6zY 2F4Q== X-Gm-Message-State: AOJu0YyjYAMD/wuNaGsbZMkW5ayNFHNAzMWynVya+RdNOvp3P2rkOQoK dMxaF/WGvI8hGFuUi8P8IgnC8f+sGPz0ONS3BDV8p+mt6atOfLTL8DcOsGUGouCteMcznCi3FXe aU6wbNTU8K0rYnvta7oirhMdqzA9U51DUsB/CGhMQkpTNcKweRbKGi1bO/y0Txp0HbnjZz4CmPE Fr6X7m/SETY24HVqv8DRQNJBwZ6WGZq7D2JCxCsW8yN5i0BA== X-Gm-Gg: Acq92OEnKv4xfEQQGACrC+dDUSWssXqwLS8P3f4pKejEmaBAIhRH4BR3MHsU9GAy135 gyr/BJh90IYLZyn4n876IRlJTH1RkY+D9UtCl1WxCrZZ6vkevFlEuE3GdxewlACmZZx2fbvItPd veV5Or8/ZiAZ/lDqyrwUIyCJAPcOSED3QCyfmAftB3oxb9covjev9qz+97ankzp3jtqTglbj9Q/ YsMUIX6P76c3K3XiTOUNLvnxTVOcAbODkg6ziEXSA6D1999nrk4OIejyFAEFJ1KO8ijw29A/f4i W1KYoa5c1z+DmClTf3yp0SHMUgdW2nHklPkMyb5QBt70RkHW9nOrdlyDsYL0VL8Fyv5vpV1S2Ry N6sOjzbCOJcRropMyAN8VOocNymPR22Up6xMARYvZaJmoDUaz+W0= X-Received: by 2002:a05:600c:1da8:b0:48e:635a:18d7 with SMTP id 5b1f17b1804b1-48e635a1ba0mr253137345e9.0.1778489573228; Mon, 11 May 2026 01:52:53 -0700 (PDT) X-Received: by 2002:a05:600c:1da8:b0:48e:635a:18d7 with SMTP id 5b1f17b1804b1-48e635a1ba0mr253136485e9.0.1778489572590; Mon, 11 May 2026 01:52:52 -0700 (PDT) Received: from redhat.com (IGLD-80-230-48-7.inter.net.il. [80.230.48.7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e6daf496bsm82372475e9.4.2026.05.11.01.52.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 01:52:52 -0700 (PDT) Date: Mon, 11 May 2026 04:52:47 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: "David Hildenbrand (Arm)" , Jason Wang , Xuan Zhuo , Eugenio =?utf-8?B?UMOpcmV6?= , Muchun Song , Oscar Salvador , Andrew Morton , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Johannes Weiner , Zi Yan , Baolin Wang , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , Lance Yang , Hugh Dickins , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , Christoph Lameter , David Rientjes , Roman Gushchin , Harry Yoo , Axel Rasmussen , Yuanchu Xie , Wei Xu , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Baoquan He , virtualization@lists.linux.dev, linux-mm@kvack.org, Andrea Arcangeli , "Liam R. Howlett" Subject: [PATCH v6 01/30] mm: move vma_alloc_folio_noprof to page_alloc.c Message-ID: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Move vma_alloc_folio_noprof() from an inline in gfp.h (for !NUMA) and mempolicy.c (for NUMA) to page_alloc.c. This prepares for a subsequent patch that will thread user_addr through the allocator: having vma_alloc_folio_noprof in page_alloc.c means user_addr can be passed to the internal allocation path without changing public API signatures or duplicating plumbing in both gfp.h and mempolicy.c. The !NUMA path gains the VM_DROPPABLE -> __GFP_NOWARN check that the NUMA path already had. Signed-off-by: Michael S. Tsirkin Assisted-by: Claude:claude-opus-4-6 Assisted-by: cursor-agent:GPT-5.4-xhigh --- include/linux/gfp.h | 9 ++------- mm/mempolicy.c | 32 -------------------------------- mm/page_alloc.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 39 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 51ef13ed756e..7ccbda35b9ad 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -318,13 +318,13 @@ static inline struct page *alloc_pages_node_noprof(int nid, gfp_t gfp_mask, #define alloc_pages_node(...) alloc_hooks(alloc_pages_node_noprof(__VA_ARGS__)) +struct folio *vma_alloc_folio_noprof(gfp_t gfp, int order, + struct vm_area_struct *vma, unsigned long addr); #ifdef CONFIG_NUMA struct page *alloc_pages_noprof(gfp_t gfp, unsigned int order); struct folio *folio_alloc_noprof(gfp_t gfp, unsigned int order); struct folio *folio_alloc_mpol_noprof(gfp_t gfp, unsigned int order, struct mempolicy *mpol, pgoff_t ilx, int nid); -struct folio *vma_alloc_folio_noprof(gfp_t gfp, int order, struct vm_area_struct *vma, - unsigned long addr); #else static inline struct page *alloc_pages_noprof(gfp_t gfp_mask, unsigned int order) { @@ -339,11 +339,6 @@ static inline struct folio *folio_alloc_mpol_noprof(gfp_t gfp, unsigned int orde { return folio_alloc_noprof(gfp, order); } -static inline struct folio *vma_alloc_folio_noprof(gfp_t gfp, int order, - struct vm_area_struct *vma, unsigned long addr) -{ - return folio_alloc_noprof(gfp, order); -} #endif #define alloc_pages(...) alloc_hooks(alloc_pages_noprof(__VA_ARGS__)) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 4e4421b22b59..6832cc68120f 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -2515,38 +2515,6 @@ struct folio *folio_alloc_mpol_noprof(gfp_t gfp, unsigned int order, return page_rmappable_folio(page); } -/** - * vma_alloc_folio - Allocate a folio for a VMA. - * @gfp: GFP flags. - * @order: Order of the folio. - * @vma: Pointer to VMA. - * @addr: Virtual address of the allocation. Must be inside @vma. - * - * Allocate a folio for a specific address in @vma, using the appropriate - * NUMA policy. The caller must hold the mmap_lock of the mm_struct of the - * VMA to prevent it from going away. Should be used for all allocations - * for folios that will be mapped into user space, excepting hugetlbfs, and - * excepting where direct use of folio_alloc_mpol() is more appropriate. - * - * Return: The folio on success or NULL if allocation fails. - */ -struct folio *vma_alloc_folio_noprof(gfp_t gfp, int order, struct vm_area_struct *vma, - unsigned long addr) -{ - struct mempolicy *pol; - pgoff_t ilx; - struct folio *folio; - - if (vma->vm_flags & VM_DROPPABLE) - gfp |= __GFP_NOWARN; - - pol = get_vma_policy(vma, addr, order, &ilx); - folio = folio_alloc_mpol_noprof(gfp, order, pol, ilx, numa_node_id()); - mpol_cond_put(pol); - return folio; -} -EXPORT_SYMBOL(vma_alloc_folio_noprof); - struct page *alloc_frozen_pages_noprof(gfp_t gfp, unsigned order) { struct mempolicy *pol = &default_policy; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 227d58dc3de6..fc7327ebdf6c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5273,6 +5273,49 @@ struct folio *__folio_alloc_noprof(gfp_t gfp, unsigned int order, int preferred_ } EXPORT_SYMBOL(__folio_alloc_noprof); +#ifdef CONFIG_NUMA +/** + * vma_alloc_folio - Allocate a folio for a VMA. + * @gfp: GFP flags. + * @order: Order of the folio. + * @vma: Pointer to VMA. + * @addr: Virtual address of the allocation. Must be inside @vma. + * + * Allocate a folio for a specific address in @vma, using the appropriate + * NUMA policy. The caller must hold the mmap_lock of the mm_struct of the + * VMA to prevent it from going away. Should be used for all allocations + * for folios that will be mapped into user space, excepting hugetlbfs, and + * excepting where direct use of folio_alloc_mpol() is more appropriate. + * + * Return: The folio on success or NULL if allocation fails. + */ +struct folio *vma_alloc_folio_noprof(gfp_t gfp, int order, + struct vm_area_struct *vma, unsigned long addr) +{ + struct mempolicy *pol; + pgoff_t ilx; + struct folio *folio; + + if (vma->vm_flags & VM_DROPPABLE) + gfp |= __GFP_NOWARN; + + pol = get_vma_policy(vma, addr, order, &ilx); + folio = folio_alloc_mpol_noprof(gfp, order, pol, ilx, numa_node_id()); + mpol_cond_put(pol); + return folio; +} +#else +struct folio *vma_alloc_folio_noprof(gfp_t gfp, int order, + struct vm_area_struct *vma, unsigned long addr) +{ + if (vma->vm_flags & VM_DROPPABLE) + gfp |= __GFP_NOWARN; + + return folio_alloc_noprof(gfp, order); +} +#endif +EXPORT_SYMBOL(vma_alloc_folio_noprof); + /* * Common helper functions. Never use with __GFP_HIGHMEM because the returned * address cannot represent highmem pages. Use alloc_pages and then kmap if -- MST