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 2200D3BD654 for ; Mon, 11 May 2026 09:01:54 +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=1778490116; cv=none; b=kWN3YSMOFl8dnryBta1AYl9PQeq4Enroa7w/tc3gWjQHtnfBnCrXncNVQ6KS0P3Gf08AYhprdZbCGh9wheRu++2Ei3uo/GKeL3y5Dgopxr110mBvXsZUeKdBPaJXi8O4fZxkIAvNNa99jY9j1VnAYyGafAGpEAM11L4wZsiOK/o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778490116; 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=jcyumh5/AzdwnEv/LU19SXjQTwceNMSCZlUpN/0rhSbLMridBIeBdh1lGBIO/bFQbfzixa4hcBntfklyfPEijJSxLQySxpikn0veAMrWwsts7Z0LxukSrYDW1BUPgz0lMd5XMVaBZYLRRZy1fFbmxlVtU0dqNgVMyMMErVotmmg= 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=M4Z8ILe+; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=Nz7Ddn6N; 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="M4Z8ILe+"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="Nz7Ddn6N" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778490114; 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=M4Z8ILe+2JehaQMrKLRJkERLRIaVSFWmZTC3wPZhe22StUzxrJY3IVqLYA3gdk3aPUwgx1 ThHgoaV+NKDh8nLTm7XJk7aH2I0KBDmYcVj3zC/inVVwfqcP0zng7ZLf1x7VlfHPJ69w8k kvu1OFWcOg4R1vSEFCXAEJX9axu5zUQ= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-378-mF06cxbJPbSUlO0m3ogUmA-1; Mon, 11 May 2026 05:01:52 -0400 X-MC-Unique: mF06cxbJPbSUlO0m3ogUmA-1 X-Mimecast-MFC-AGG-ID: mF06cxbJPbSUlO0m3ogUmA_1778490111 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-48a5952c635so46889385e9.2 for ; Mon, 11 May 2026 02:01:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1778490111; x=1779094911; 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=Nz7Ddn6NIgZVYSGFV3o3lcVsoZRvUFNB0np6hNhOiy0hXXooRF5WGKgzDf+rk5MkiJ Mwc3vjrGtyVFrXvvLFrBjSPQxI1lQLv8wyuvW6uLd6seknXfG6k74mDOijdJqUc2BtX8 +opbaWR2C8OwZSIZC1CV8HwnLNDcgWDOtP5qAh3Z8wU5qgodMTKEKgEI8OjWuS0Rt40A DCVMkH4gyim6+RyU9cVH0B/zUqd9v6b3QL5ZaVYMqkNr3HagExKweGyYqxNm1CPrD0RQ tIKGdweIY/zA7lsiMhRqAbKlPf1i5pkQFUb0HYwaU8yztzuHiqqbU8OSnO/jzXNkmmTK /X3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778490111; x=1779094911; 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=iQf8RYmDScnmMpSXMei0eCdLELTwRaV59lcOyZkt2Tp1tsGgR2nMlPzlBkuGrItA6W l8Wv+BzZem4VsgW+JNvW5Ur9GKoIRVYPqGnAo/CtikHW9qQsqIvT2OTkmr2F14nIV/YM 4Dz4j329Oj/oWpxxAV7T2m5BsgtmN1LLKkWUucscthuDPSL6/FOiTpegXsBd1NjPhAT1 BbvoQhKshWzfoc2WUnnfbeWqa0p8bC0B5tMwA9NqC0FqZBU66z/6at4bXCn1OgCSID3X wzaHU3+d34t2EAE+uYV7/p5lX99EPFKY/HK4AnFI1i3EFAlfnejuWxMeybMVzezrKP8u Ptcg== X-Gm-Message-State: AOJu0Yzmo3NXHmmLEq7pYy6l9sEDIV5sGDlcm8q5ld+HxwTH8BS2p5nM VKS94ysuemxiFZ2V9eI1iyTrhlWR509qcYwrdDjmVK9ArcipOKvEF8ajuqe/4DY2auqXpqUdWEY mzmogNx9cnJHj2+e87yYjMM5Aoc2XhMs0YyMY0G0hA+FXNYwo+x7cuD8MRPftnYE+oOS+qzbl5l uVz0GCfbxjBoV30ptmJjkAw0OfIONk/pSdu3+m8QW8ITI= X-Gm-Gg: Acq92OFsO9bSunAz4pHjKmhVOH7YnPQnCPs7IBByaDlQMdmBU8Zyzg8LUAf/W8TCDkn fj/pfG7yZq0g2YEce89enJVZwsp7m11zRLs2ZNyiz6JZNcpg+/qojdzclwfw/1O2VyihQm+MiGW vmN7xSYLvRjU7Nbwt+RdniRvuk8h8L8iZ18rMCsieA/zTfP0FpmUc6LA7Exrbz7KXxLWT1qTIEj JhSMBsI0kpatznrio8bqOHfchYsbGUpzNkrlpuqBnYqU+381zOG+IPFHVZEwW38ZBiYWgMvSU3J 59pwhwgX7gUF8hOmc3ItGtHjrq2QAQ5/m3DfWGRijFWin3anO4r5KE/VJVTA/k6pgkG1RK613+d 4bjS+6eTkPwuoa4RRBaF3dkDNSdI3STVRa4m77v8FKmmJMRzW6Cc= X-Received: by 2002:a05:600c:46d2:b0:485:364e:9328 with SMTP id 5b1f17b1804b1-48e51f32aebmr335187425e9.16.1778490110263; Mon, 11 May 2026 02:01:50 -0700 (PDT) X-Received: by 2002:a05:600c:46d2:b0:485:364e:9328 with SMTP id 5b1f17b1804b1-48e51f32aebmr335186515e9.16.1778490109502; Mon, 11 May 2026 02:01:49 -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-48e80ca2666sm91504845e9.10.2026.05.11.02.01.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 02:01:49 -0700 (PDT) Date: Mon, 11 May 2026 05:01:44 -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 resend 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