diff mbox series

[v2,20/26] mm/shmem: Add shmem_alloc_folio()

Message ID	20220504182857.4013401-21-willy@infradead.org (mailing list archive)
State	New
Headers	show Return-Path: <owner-linux-mm@kvack.org> From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: akpm@linuxfoundation.org, linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org> Subject: [PATCH v2 20/26] mm/shmem: Add shmem_alloc_folio() Date: Wed, 4 May 2022 19:28:51 +0100 Message-Id: <20220504182857.4013401-21-willy@infradead.org> In-Reply-To: <20220504182857.4013401-1-willy@infradead.org> References: <20220504182857.4013401-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	Folio patches for 5.19 \| expand [v2,00/26] Folio patches for 5.19 [v2,01/26] shmem: Convert shmem_alloc_hugepage() to use vma_alloc_folio() [v2,02/26] mm/huge_memory: Convert do_huge_pmd_anonymous_page() to use vma_alloc_folio() [v2,03/26] alpha: Fix alloc_zeroed_user_highpage_movable() [v2,04/26] mm: Remove alloc_pages_vma() [v2,05/26] vmscan: Use folio_mapped() in shrink_page_list() [v2,06/26] vmscan: Convert the writeback handling in shrink_page_list() to folios [v2,07/26] swap: Turn get_swap_page() into folio_alloc_swap() [v2,08/26] swap: Convert add_to_swap() to take a folio [v2,09/26] vmscan: Convert dirty page handling to folios [v2,10/26] vmscan: Convert page buffer handling to use folios [v2,11/26] vmscan: Convert lazy freeing to folios [v2,12/26] vmscan: Move initialisation of mapping down [v2,13/26] vmscan: Convert the activate_locked portion of shrink_page_list to folios [v2,14/26] mm: Allow can_split_folio() to be called when THP are disabled [v2,15/26] vmscan: Remove remaining uses of page in shrink_page_list [v2,16/26] mm/shmem: Use a folio in shmem_unused_huge_shrink [v2,17/26] mm/swap: Add folio_throttle_swaprate [v2,18/26] mm/shmem: Convert shmem_add_to_page_cache to take a folio [v2,19/26] mm/shmem: Turn shmem_should_replace_page into shmem_should_replace_folio [v2,20/26] mm/shmem: Add shmem_alloc_folio() [v2,21/26] mm/shmem: Convert shmem_alloc_and_acct_page to use a folio [v2,22/26] mm/shmem: Convert shmem_getpage_gfp to use a folio [v2,23/26] mm/shmem: Convert shmem_swapin_page() to shmem_swapin_folio() [v2,24/26] mm: Add folio_mapping_flags() [v2,25/26] mm: Add folio_test_movable() [v2,26/26] mm/migrate: Convert move_to_new_page() into move_to_new_folio()

Commit Message

Matthew Wilcox May 4, 2022, 6:28 p.m. UTC

Call vma_alloc_folio() directly instead of alloc_page_vma().
Add a shmem_alloc_page() wrapper to avoid changing the callers.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 mm/shmem.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

Comments

Christoph Hellwig May 5, 2022, 3:40 p.m. UTC | #1

Looks good:

Reviewed-by: Christoph Hellwig <hch@lst.de>

diff mbox series

Patch

diff --git a/mm/shmem.c b/mm/shmem.c
index 7946ccbc60bf..36a4d7f07e0b 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1543,17 +1543,23 @@  static struct page *shmem_alloc_hugepage(gfp_t gfp,
 	return &folio->page;
 }
 
-static struct page *shmem_alloc_page(gfp_t gfp,
+static struct folio *shmem_alloc_folio(gfp_t gfp,
 			struct shmem_inode_info *info, pgoff_t index)
 {
 	struct vm_area_struct pvma;
-	struct page *page;
+	struct folio *folio;
 
 	shmem_pseudo_vma_init(&pvma, info, index);
-	page = alloc_page_vma(gfp, &pvma, 0);
+	folio = vma_alloc_folio(gfp, 0, &pvma, 0, false);
 	shmem_pseudo_vma_destroy(&pvma);
 
-	return page;
+	return folio;
+}
+
+static struct page *shmem_alloc_page(gfp_t gfp,
+			struct shmem_inode_info *info, pgoff_t index)
+{
+	return &shmem_alloc_folio(gfp, info, index)->page;
 }
 
 static struct page *shmem_alloc_and_acct_page(gfp_t gfp,