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 C4C021DDC35 for ; Sun, 26 Apr 2026 21:47:40 +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=1777240062; cv=none; b=faRgmUgm+P1iFU4b5UuXrYvbyeplRVEPGX3EiB+h5rMqkZ5Q71pTuTsWvjqUDLNauep2e72uBaMRwsDpK57srm/vICvGRp/rV5npzg2w2WFkVKXQuXjD5khQXBKiBksuoAYoP6nRz3ZBnqpZZg21q6KcxwHbHC23i4Z8h23LpFE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777240062; c=relaxed/simple; bh=3yv7g0qz2r8KeF7Q/4i8eq2vYhnDxLUrftD/JPsDNIo=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=pFRLyIynuJsSUNrLVuNEzBTFyRna7HJgFYIs3CM6yP95EvuQSpQSL0A7Agjb+l6GicrIT51jmGm+mpLYkhxMSKQD61dpiwA6t5hXR6idOTGL0abFnt14qphwo/8Es8EwWGnkyjdtLQq4dRxyjQjA+/2XIbHSz7B7hrs2m1XN1hw= 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=RXYaGlOg; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=G8WT0/XT; 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="RXYaGlOg"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="G8WT0/XT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1777240059; 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=yXr1u1aEvptlqN9vuxArrnVOz3uXJxzDs4ChyPf8Auw=; b=RXYaGlOgPfzRmZgzkBBEu2j+sDfnlHYDCmE9j6mhMAwgkGfChrn7rgZ6HAdg74ehBxaFFZ roOyL2rFodsCOdRW5To8N/2v5BePHvhthwadSNco9+/uxwphQQSZRPZBGUEuCzc1N+SKp2 +JMdkPheRRbkgiCYF2CZwUb7wk5EGok= 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-259-VYuc8FxsMAuzGzhBGbKkYw-1; Sun, 26 Apr 2026 17:47:38 -0400 X-MC-Unique: VYuc8FxsMAuzGzhBGbKkYw-1 X-Mimecast-MFC-AGG-ID: VYuc8FxsMAuzGzhBGbKkYw_1777240057 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-43d1fec59c9so6059473f8f.0 for ; Sun, 26 Apr 2026 14:47:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1777240057; x=1777844857; 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=yXr1u1aEvptlqN9vuxArrnVOz3uXJxzDs4ChyPf8Auw=; b=G8WT0/XTQ5ESRkPWYBgPF8qH0sfKQ722nffGAZMEr7BiKDzdOrjQvlgvz63Xou8YlU 1ZpKZcqoqL8GlZLDYylNP1ZCrj0QxTfRgDXy7gJUYqrkDf1mTkE53D6fNndB2Gh7Fw8p UScdP3vAENwPjXypIv3+EiaRRRrkU1jYgBCNIAlQs0qt0HZBqcznJZ3h3b3eKcK4Rm14 t7Mlbe5BoUouU0/DgX1zNwPnxMrV9Nzp+G3KzUaETgUIVP3R6vKcBKLF033AQWeIdLju jXcKlnlnBnaHzOFIZ8idFBLQ4JBUPqUcllLT5T4qT6sTADgBwev/i/iP3QBpBD8+Ju+k AeSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777240057; x=1777844857; 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=yXr1u1aEvptlqN9vuxArrnVOz3uXJxzDs4ChyPf8Auw=; b=Ba8lARR+nJhGkHsTjq8IOXoI8hg3Ugvi+RicWS3je9KkBEke0puy3VWQXICJlMMdpX ZXZ3OxaCzVMuLOsSkYnCPptimYPQPILExs2A/lXu7XD3ZKDkQ18B9XRPxgfZIVYsiH45 fQCqG6mqmxd5ix6Ov+JRC35igawlBxP+K72aXCkdBdkR5p3WpoDV4cW1zUZzFNBdK9dK IvowB0ZiAVhTYPO/LmjZ2gtV/UzuBRGep516iomdM2Othp2MbA28Xv0MzIyMcCotLnQy fEtwVBzTGVVNJQkGWpq8tQfvbxHfEOidqPaYwbDstyDwCH46dFMDELY91tgByPy06f7B 4niQ== X-Gm-Message-State: AOJu0Yywsn7m3sjsokm25EwOsiffr1Gh4Rxxb+FmDfXya4t8qHrA2cDu UlwX+UYSX9FCCmAGWFQRyijWxE56/6g+IeLsCRdz4qzljXPPimFgT4tMVNeZ2L9lyXRUB9ZP5al FHWluBn2g3TnpkvJg/RO7PwKUaT2MiDgc8EAzQXcHeGvWsjYWEzDSldUj/ropMKH68Qpvy9JEzZ 0oQwUYKeK218xfEQbYn02Sh7QcENm/yNWr0GPghW0b1L4= X-Gm-Gg: AeBDiesZKOZVo/3D+Q0DMXUH1zHoIKw9JHrTEz0Wi0VHzHmS7kN+jrk8qySdXDCbn3b EclXbjEnuxPbctTtuY0VHhvB88iLNEbD2Ge4F7dSef8Mu2u6Pa8uFtF3rEPmfprwQ4pfw1wvuAt QOG6aw4ptSF+72UHcXinj702XsqxMW/vXqUsDDNVViF9IJW3SlNimYzImOExL/iNn5RKJqV9bXZ mZgTFNEjz576UVZs+B9KFYKCPbhXhbItNCjoolw06T6MKvwfWpHa47uG+sjx5ajhq1r9BmLz1Rm ImV4Kmoo7EGkVQauQzspPZFb5ru2Frqjd3xUc/yEZzb3+kgtTk8UAhoCVOztCznxx/x3YxMvFt0 QKgq4rRPjf4zHp8JahBgakfAqX2q7CySFrLF7mEl9U03zNAfYRoFYL+In X-Received: by 2002:a05:6000:4709:b0:441:2397:f40f with SMTP id ffacd0b85a97d-4412397f431mr33247012f8f.4.1777240057163; Sun, 26 Apr 2026 14:47:37 -0700 (PDT) X-Received: by 2002:a05:6000:4709:b0:441:2397:f40f with SMTP id ffacd0b85a97d-4412397f431mr33246952f8f.4.1777240056601; Sun, 26 Apr 2026 14:47:36 -0700 (PDT) Received: from redhat.com (IGLD-80-230-47-179.inter.net.il. [80.230.47.179]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43fe4e4daf2sm73823721f8f.33.2026.04.26.14.47.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2026 14:47:36 -0700 (PDT) Date: Sun, 26 Apr 2026 17:47:33 -0400 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Andrew Morton , David Hildenbrand , Vlastimil Babka , Brendan Jackman , Michal Hocko , Suren Baghdasaryan , Jason Wang , Andrea Arcangeli , Gregory Price , linux-mm@kvack.org, virtualization@lists.linux.dev, Johannes Weiner , Zi Yan , Lorenzo Stoakes , "Liam R. Howlett" , Mike Rapoport , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Ying Huang , Alistair Popple Subject: [PATCH RFC v4 01/22] mm: move vma_alloc_folio 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. The declaration is moved outside the #ifdef CONFIG_NUMA block so both configs use the same real function. On NUMA, it calls the mempolicy allocation path as before. On !NUMA, it calls folio_alloc_noprof() directly. This prepares for a subsequent patch that will thread user_addr through the allocator: having vma_alloc_folio 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. No functional change. Signed-off-by: Michael S. Tsirkin Assisted-by: Claude:claude-opus-4-6 --- include/linux/gfp.h | 9 ++------- mm/mempolicy.c | 17 ----------------- mm/page_alloc.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 24 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 0e5175f1c767..f0f85c89da82 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -2524,23 +2524,6 @@ struct folio *folio_alloc_mpol_noprof(gfp_t gfp, unsigned int order, * * 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 2d4b6f1a554e..0e6ec7310087 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5297,6 +5297,34 @@ struct folio *__folio_alloc_noprof(gfp_t gfp, unsigned int order, int preferred_ } EXPORT_SYMBOL(__folio_alloc_noprof); +#ifdef CONFIG_NUMA +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