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.129.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 5764D3C8195 for ; Tue, 12 May 2026 21:05:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778619942; cv=none; b=dgUD74XSfGN2ClD8QXEOmKodA1wJ2KUlXXd+ASpgZ2HiGecEmwzUp/BC2IGH9fja7BJsOwUsp0emdiD1jQbdzRXoze3IVVy1TIE2eGyITVGxJ6lVL3hFyOyLYDYx2ZPqpeJ9w37odb1l9KNAWR7B4Nyfay1dGUTh5EfEvroQ6jo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778619942; c=relaxed/simple; bh=ePR7uNlotrezAJookcUJ/8DLykTQxnwcGZYCYwhIa5o=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=DObnHJqWHZMfjdEtsHb++z83z+skmCMbENj1BOZ9ze4Jgz9ngiYeo163jF/QuOB3oMpq5TV6KGZDFMkYZQPK3LGr20PQiLMTrzVpbkSPVBamORjBKGb2PlQ4y1Xar1uysQLL0RfFY8wpQlEQp91nFjtU3qcBt8D2Hu+8unKxpMY= 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=dykh9N7m; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=lUhsojKs; arc=none smtp.client-ip=170.10.129.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="dykh9N7m"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="lUhsojKs" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778619940; 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=uXm+f+MkYB5oL4CzdS91ST7c4wCcchxSd9UlyIAHNL0=; b=dykh9N7myHH5nkzF5PHivZ2tcUCIZDtKNo/tcGuW8m1GpZComc1FFtofWWsSap0TqNOLGA 3g9VSoQLlUM6nh6jYjcL/DxRD1IIWFKlHitO1oyrXrAI5eqy9Sb3laDVJCXeWVyuOBSYvQ dPZAFWgmSZErfWYPSQXlczHnX/wqYQA= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-619-v5TyrjV0OPmgrgUvaYcngQ-1; Tue, 12 May 2026 17:05:39 -0400 X-MC-Unique: v5TyrjV0OPmgrgUvaYcngQ-1 X-Mimecast-MFC-AGG-ID: v5TyrjV0OPmgrgUvaYcngQ_1778619938 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-45aeac88af4so1004986f8f.3 for ; Tue, 12 May 2026 14:05:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1778619937; x=1779224737; 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=uXm+f+MkYB5oL4CzdS91ST7c4wCcchxSd9UlyIAHNL0=; b=lUhsojKsn9Vs4tfswasb6NPQNWacxwA0Tx+P/nGp0YPP8s1vnR76IylCP1TBuNScrw DkeiUe4PxbCXAm+NhuWu7iIzVtWVllh0lZCBwgNYYm0zQ9t6zAKquAvfkNl5+P5VkJsG s/GvWa+qECY8Skb57lSlasoj9jgOeKmMwtn+lrjkqqd6ZkXQLaLVcqJpbuuI2VzoyKMG tUTMqG26Tkn0NJ9rAdlgmtdTzTVVfM9RQzrmE7yzbFysAto+ZeZ58i85LxWzGSjihN1c bQbK5wyitDFQWjvBMZV+0dLpe/w8UGPnwK1I2e1YkewmKijPQz9sMbWXzMNsQn17iqhs r68A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778619937; x=1779224737; 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=uXm+f+MkYB5oL4CzdS91ST7c4wCcchxSd9UlyIAHNL0=; b=cZglGoQReYmWM/eWOXG/tUJBs9zgnTTtevieT4JUSsUHtSYhyu4iitCzFsgI3USaSr 4Z/nbrvYCUlf2YsCRktphAZkSAnU2tt/mTr2q3ETlE+5wG7QtB5q1fnmVGiSlHtPWZHP xi0OBecOt9OJiUTKAXqs9xu7rxuCGgSi2mhMh3PSAJThDDcwy11nvQID//WxqbF5Qtld RdqG4pm66WwP4gQVkdiO9i5GeOU+/qV41sNrQ43RcS2/hd1OMgLYAqv3b2DeiB3orgOS 7AXX+6BNzgD/m96YoZn/RDJ/t0/81pAyACNCwdILmFbt8cACDFdseOQ3JjtWTZa+Vurh Hn2A== X-Gm-Message-State: AOJu0YwO3AUqPe1fH1u+ju2WtvYGUdU3QSbOSRlb+Fbal8BZwNHhQowt eEN5IthxZFgyhfI836mQHxWI8SGsghB+obV+NBzIxSBsXLw6xuFX+a72ooZvZG7bxhxPqJ/1ryl EBeahdkE/D46hAN8Ub2u9SKZZoqoBnO9CLhql1J6Pbt1COrwrla6IYc1Q0hcQCwwoK59ZNle4Iw 8jLpoKjhLOKisWQABo+oNLsgHEwTDxGSjJMgGmqN6QO+A= X-Gm-Gg: Acq92OHhrWPWuumpeVbsoe67+3GWBGrdT2NRTQ3PzwDpfeTn6dxTXY+PlD7giOrDiP0 644grO/hETuiBARN8hxdOdWoZwTiWcIzY9xoPjJW0Fx89w7UHMZqX9FuRPsScDnQUCqxTteTbn8 HStG8JSsGp69cT9AwFHGEZ+jKHfd2NqLXhZF9gr38Ry2vtA4Zdpb+sNHeTSGhy8J++Bm4YXJkQ4 jxw8UZxfcgK2nXGDo9ewEvxTHowNF2J5T1mu2RyHtZGOKeWy3PWH9sSp1xFYTRH8m+tWdJ3wTyv XBOHdV1FaSYg6XX3ojJctWwKoB9kwCsWlG1M/kma2cpyKY3CluihOnKi3A47YPHJBGRnXkY8299 dKzjF07vU/M1YC0KeaJEBrW+js7mNJ+CQ1D/q3eI7 X-Received: by 2002:a05:6000:26cf:b0:45a:ff7d:9800 with SMTP id ffacd0b85a97d-45c584a868bmr548672f8f.15.1778619937291; Tue, 12 May 2026 14:05:37 -0700 (PDT) X-Received: by 2002:a05:6000:26cf:b0:45a:ff7d:9800 with SMTP id ffacd0b85a97d-45c584a868bmr548593f8f.15.1778619936563; Tue, 12 May 2026 14:05:36 -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 ffacd0b85a97d-4548ec6aea4sm40612389f8f.10.2026.05.12.14.05.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2026 14:05:36 -0700 (PDT) Date: Tue, 12 May 2026 17:05:31 -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 Subject: [PATCH v7 05/31] mm: move vma_alloc_folio_noprof to page_alloc.c Message-ID: <17711d281fa0cb9751da2c856e693e9da6d1efa9.1778616612.git.mst@redhat.com> 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 b2c21ed1fd84..39e556e3d263 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -2516,38 +2516,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 e40fd39acbd0..4c5610b45de5 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5285,6 +5285,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