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 47F863C1985 for ; Fri, 29 May 2026 15:22:40 +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=1780068162; cv=none; b=WAeoPppzNv553Ssi6rJmWis+XYayYGGRNyQ1mA8QkBPQiWFKx1yYbABOkSKflQocS01wDqihnoBwUOU7/DrpZqNQ/jFl7In1V/nZRihhabci9jpu9AUmnM4rRT1u1bK/nVsBF+4cPuMyk7QUABfMU2S+NLoNuTUt4UsgH6CFsbw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780068162; c=relaxed/simple; bh=UliapvFzBZgGZQz4lzdPjxY0rdM8nGKqjKGuh8rusnI=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=eAlscTmevbMPjH8H974ekkfdQKnCCN5Q/gKJMfj982AWKGLvHArZqaE2K49nzdqkywIjFGpJfi7v8JNeZbDaPR21sc+FmmQzyfUaiL6qLIYZxzwHcIIjevqDka5z8iMMxEK/JoSUO+IWMr+TEzOQuWvIRFYYei2Y5icOsmh80ag= 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=B9rbl8N5; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=UVczpk9P; 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="B9rbl8N5"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="UVczpk9P" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1780068160; 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=1d6/7ocvnM9x5v92z8cdenZMlPT5Fb+FBGOKjHhSxWM=; b=B9rbl8N5HN3M8rYrLTO8GdWfLYDIQcUyX3voGdL+XaJBgT9S9659Jp8eto2lG2mO0iYOgB XU3nVWHxIlfn+WPYqZeA4mEKDOwOAq56H++mXIvv8r1XcQBg8RsALnabAUhzAWeEKSunmQ u4dHejHn4eJRqV0w2Sgis5wFtCvnFGE= 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-582--8Kap3CnPgGYvZrpG4putQ-1; Fri, 29 May 2026 11:22:38 -0400 X-MC-Unique: -8Kap3CnPgGYvZrpG4putQ-1 X-Mimecast-MFC-AGG-ID: -8Kap3CnPgGYvZrpG4putQ_1780068157 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-43d7a5b9678so8348747f8f.2 for ; Fri, 29 May 2026 08:22:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1780068157; x=1780672957; 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=1d6/7ocvnM9x5v92z8cdenZMlPT5Fb+FBGOKjHhSxWM=; b=UVczpk9P9Z//ma+vyJlGPNn5qDuZ0ZfzZ/JIw/vijnos+OjkOp+JFFOwumr2kym4tD lRxhz4NSH65oFeDFUclOmKEp6XCo8C/GzWFEWXe3Qw1hiGxH26xpRJrhxP+Pll2riCYr Lo6vfZUF4g5Iandq/LJ/Gz4yVB2l8r8ws+ALGttj0p1mdjEiNb7OuFSCL+gN3fD0qtyD h1++xHPKf8ubZ4wjbatYvenho/b+kiTQ2i86Ku1HhVqybC8hPoLbWbXIb48rYngYbys8 L31EibKkd163Jq5bXNF+OblWC6/RDRLtvjzJZ/qnsZRGbJGuFJxMzAOkYEbZWatVK2AQ SJaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780068157; x=1780672957; 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=1d6/7ocvnM9x5v92z8cdenZMlPT5Fb+FBGOKjHhSxWM=; b=Msi8Fl+JFsF/kbymzMiaK7nHOXZCdKuhJ51zk1azCvV2a1s5mKAGnWPFdYtORXexmy o70ly6gEwYTYFpJYTLhxW5eNXj+oIRhzUH/TNDvcsGb9gJ6rkOIG8gUD0h4Wt2xoLiam C5e2gfgApkhT4CKRlZIXKACdW0LOd0ofSAQLvc8tT7s54TzpSQWReKZQSjEia4HESb18 zp/r/VJTjbWG/8FufQXfznCUrotvaRByhiHFgiXQhS+SitOMdHXxjBbbXMWPgfk7Wuxo 9aUzZh6nh7tjNWewgIhJUuAQ++h3Ydw4YKZ1zPQvm07K7X1VyCuAEpME0UIE/gGS/xhQ qUEQ== X-Gm-Message-State: AOJu0YzA1PqfkVD7/9rt5wa0T3qgKTLYAA54LAU3mhubbZMvBWKNdFGZ PGlt2A5EmlNGkP2379BD1eWdBsHIAkz23gakXYaaxqZzTUaU/MEVrOUG6iuVcG7oE45BKY/2AIJ BIchiMYOPPyCLo6M5ObZ21bnbQ2RJMNpZ8P4TO/5PYZhuIzyUllqaJjXXkIKZTPD2J+cJwp82Nw h6sx/j0TEsxC6oGGhr5ov3Kk1JPLgqNSoU7tZ1qnYe+lM= X-Gm-Gg: Acq92OEDR+TLmVqurB3KRbhM0IAcGjvRvPy2HihFhl2FMPasshMm4NOIRK8mFmlj36m QPrxo4W7As+LjspjwcyWqpa1fe3Y6RgEX5mLMt9yNqE2Adxy1pNwjhznka5gKZZpis8yHc7BzKN la0TbR/6CyugA0YedmEdPKrR+hCMXtwyFoFxF4NzZzssWo4R94zCWKZTQfcZSYLgX+lsDvkU/z7 350bM0Nz2a4XhY7HNCZjRdVqkJ2dLbbQgGdXvuI7VCzEdZA5d8tsdTkMKRpM9r2683tIgLE+QC8 VEq5gyVRIsJ/ox7cHR+duw/ETBoOP3ENkaMzcyIgnl4/jfM0tWcBS0U7FXHMG7lPmWFW+HFNHeV sp8wprQf2UcJZe/3hM6mg6hqHBqP1RK01bwe4gVxqUnXRSNbLFJgcSw== X-Received: by 2002:a05:600d:8444:20b0:490:44eb:c1d9 with SMTP id 5b1f17b1804b1-490a2947c86mr1027405e9.28.1780068157078; Fri, 29 May 2026 08:22:37 -0700 (PDT) X-Received: by 2002:a05:600d:8444:20b0:490:44eb:c1d9 with SMTP id 5b1f17b1804b1-490a2947c86mr1026475e9.28.1780068156493; Fri, 29 May 2026 08:22:36 -0700 (PDT) Received: from redhat.com (IGLD-80-230-25-45.inter.net.il. [80.230.25.45]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4909c0e8c1bsm22645615e9.3.2026.05.29.08.22.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2026 08:22:35 -0700 (PDT) Date: Fri, 29 May 2026 11:22: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 v9 06/37] mm: move vma_alloc_folio_noprof to page_alloc.c Message-ID: <926990355eadc624f8ef12b30b50f8aaf67118f0.1780067977.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 d139b074a599..a1707ad498a8 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 1192c4e47da4..0c4f4c678233 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5288,6 +5288,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