[v2,24/57] shmem: Add shmem_get_folio()

Message ID	20220902194653.1739778-25-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: Andrew Morton <akpm@linux-foundation.org> Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, linux-mm@kvack.org Subject: [PATCH v2 24/57] shmem: Add shmem_get_folio() Date: Fri, 2 Sep 2022 20:46:20 +0100 Message-Id: <20220902194653.1739778-25-willy@infradead.org> In-Reply-To: <20220902194653.1739778-1-willy@infradead.org> References: <20220902194653.1739778-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	MM folio changes for 6.1 \| expand [v2,00/57] MM folio changes for 6.1 [v2,01/57] mm/vmscan: Fix a lot of comments [v2,02/57] mm: Add the first tail page to struct folio [v2,03/57] mm: Reimplement folio_order() and folio_nr_pages() [v2,04/57] mm: Add split_folio() [v2,05/57] mm: Add folio_add_lru_vma() [v2,06/57] shmem: Convert shmem_writepage() to use a folio throughout [v2,07/57] shmem: Convert shmem_delete_from_page_cache() to take a folio [v2,08/57] shmem: Convert shmem_replace_page() to use folios throughout [v2,09/57] mm/swapfile: Remove page_swapcount() [v2,10/57] mm/swapfile: Convert try_to_free_swap() to folio_free_swap() [v2,11/57] mm/swap: Convert __read_swap_cache_async() to use a folio [v2,12/57] mm/swap: Convert add_to_swap_cache() to take a folio [v2,13/57] mm/swap: Convert put_swap_page() to put_swap_folio() [v2,14/57] mm: Convert do_swap_page() to use a folio [v2,15/57] mm: Convert do_swap_page()'s swapcache variable to a folio [v2,16/57] memcg: Convert mem_cgroup_swapin_charge_page() to mem_cgroup_swapin_charge_folio() [v2,17/57] shmem: Convert shmem_mfill_atomic_pte() to use a folio [v2,18/57] shmem: Convert shmem_replace_page() to shmem_replace_folio() [v2,19/57] swap: Add swap_cache_get_folio() [v2,20/57] shmem: Eliminate struct page from shmem_swapin_folio() [v2,21/57] shmem: Convert shmem_getpage_gfp() to shmem_get_folio_gfp() [v2,22/57] shmem: Convert shmem_fault() to use shmem_get_folio_gfp() [v2,23/57] shmem: Convert shmem_read_mapping_page_gfp() to use shmem_get_folio_gfp() [v2,24/57] shmem: Add shmem_get_folio() [v2,25/57] shmem: Convert shmem_get_partial_folio() to use shmem_get_folio() [v2,26/57] shmem: Convert shmem_write_begin() to use shmem_get_folio() [v2,27/57] shmem: Convert shmem_file_read_iter() to use shmem_get_folio() [v2,28/57] shmem: Convert shmem_fallocate() to use a folio [v2,29/57] shmem: Convert shmem_symlink() to use a folio [v2,30/57] shmem: Convert shmem_get_link() to use a folio [v2,31/57] khugepaged: Call shmem_get_folio() [v2,32/57] userfaultfd: Convert mcontinue_atomic_pte() to use a folio [v2,33/57] shmem: Remove shmem_getpage() [v2,34/57] swapfile: Convert try_to_unuse() to use a folio [v2,35/57] swapfile: Convert __try_to_reclaim_swap() to use a folio [v2,36/57] swapfile: Convert unuse_pte_range() to use a folio [v2,37/57] mm: Convert do_swap_page() to use swap_cache_get_folio() [v2,38/57] mm: Remove lookup_swap_cache() [v2,39/57] swap_state: Convert free_swap_cache() to use a folio [v2,40/57] swap: Convert swap_writepage() to use a folio [v2,41/57] mm: Convert do_wp_page() to use a folio [v2,42/57] huge_memory: Convert do_huge_pmd_wp_page() to use a folio [v2,43/57] madvise: Convert madvise_free_pte_range() to use a folio [v2,44/57] uprobes: Use folios more widely in __replace_page() [v2,45/57] ksm: Use a folio in replace_page() [v2,46/57] mm: Convert do_swap_page() to use folio_free_swap() [v2,47/57] memcg: Convert mem_cgroup_swap_full() to take a folio [v2,48/57] mm: Remove try_to_free_swap() [v2,49/57] rmap: Convert page_move_anon_rmap() to use a folio [v2,50/57] migrate: Convert __unmap_and_move() to use folios [v2,51/57] migrate: Convert unmap_and_move_huge_page() to use folios [v2,52/57] huge_memory: Convert split_huge_page_to_list() to use a folio [v2,53/57] huge_memory: Convert unmap_page() to unmap_folio() [v2,54/57] mm: Convert page_get_anon_vma() to folio_get_anon_vma() [v2,55/57] rmap: Remove page_unlock_anon_vma_read() [v2,56/57] uprobes: Use new_folio in __replace_page() [v2,57/57] mm: Convert lock_page_or_retry() to folio_lock_or_retry()

Message ID

20220902194653.1739778-25-willy@infradead.org (mailing list archive)

State

New

Headers

From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
	linux-mm@kvack.org
Subject: [PATCH v2 24/57] shmem: Add shmem_get_folio()
Date: Fri,  2 Sep 2022 20:46:20 +0100
Message-Id: <20220902194653.1739778-25-willy@infradead.org>
In-Reply-To: <20220902194653.1739778-1-willy@infradead.org>
References: <20220902194653.1739778-1-willy@infradead.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: owner-linux-mm@kvack.org
Precedence: bulk

Series

MM folio changes for 6.1 | expand

Commit Message

Matthew Wilcox (Oracle) Sept. 2, 2022, 7:46 p.m. UTC

With no remaining callers of shmem_getpage_gfp(), add shmem_get_folio()
and reimplement shmem_getpage() as a call to shmem_get_folio().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 include/linux/shmem_fs.h |  2 ++
 mm/shmem.c               | 23 ++++++++++-------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
index ff0b990de83d..f4bd50b08a91 100644
--- a/include/linux/shmem_fs.h
+++ b/include/linux/shmem_fs.h
@@ -113,6 +113,8 @@  enum sgp_type {
 
 extern int shmem_getpage(struct inode *inode, pgoff_t index,
 		struct page **pagep, enum sgp_type sgp);
+int shmem_get_folio(struct inode *inode, pgoff_t index, struct folio **foliop,
+		enum sgp_type sgp);
 
 static inline struct page *shmem_read_mapping_page(
 				struct address_space *mapping, pgoff_t index)
diff --git a/mm/shmem.c b/mm/shmem.c
index 107b8f019373..eb9e024f7cf4 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2025,14 +2025,18 @@  static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index,
 	return error;
 }
 
-static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,
-		struct page **pagep, enum sgp_type sgp,
-		gfp_t gfp, struct vm_area_struct *vma,
-		struct vm_fault *vmf, vm_fault_t *fault_type)
+int shmem_get_folio(struct inode *inode, pgoff_t index, struct folio **foliop,
+		enum sgp_type sgp)
+{
+	return shmem_get_folio_gfp(inode, index, foliop, sgp,
+			mapping_gfp_mask(inode->i_mapping), NULL, NULL, NULL);
+}
+
+int shmem_getpage(struct inode *inode, pgoff_t index,
+		struct page **pagep, enum sgp_type sgp)
 {
 	struct folio *folio = NULL;
-	int ret = shmem_get_folio_gfp(inode, index, &folio, sgp, gfp, vma,
-			vmf, fault_type);
+	int ret = shmem_get_folio(inode, index, &folio, sgp);
 
 	if (folio)
 		*pagep = folio_file_page(folio, index);
@@ -2041,13 +2045,6 @@  static int shmem_getpage_gfp(struct inode *inode, pgoff_t index,
 	return ret;
 }
 
-int shmem_getpage(struct inode *inode, pgoff_t index,
-		struct page **pagep, enum sgp_type sgp)
-{
-	return shmem_getpage_gfp(inode, index, pagep, sgp,
-		mapping_gfp_mask(inode->i_mapping), NULL, NULL, NULL);
-}
-
 /*
  * This is like autoremove_wake_function, but it removes the wait queue
  * entry unconditionally - even if something else had already woken the

[v2,24/57] shmem: Add shmem_get_folio()

Commit Message

Patch