[5/7] mm/hugetlb: convert hugetlb_delete_from_page_cache() to use folios

Commit Message

Sidhartha Kumar Aug. 29, 2022, 11 p.m. UTC

Removes the last caller of remove_huge_page() by converting the code to its
folio equivalent.

Signed-off-by: Sidhartha Kumar <[e-mail]>
---
 fs/hugetlbfs/inode.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Matthew Wilcox (Oracle) Aug. 30, 2022, 3:26 a.m. UTC | #1

On Mon, Aug 29, 2022 at 04:00:12PM -0700, Sidhartha Kumar wrote:
>  static void hugetlb_delete_from_page_cache(struct page *page)
>  {
> -	ClearPageDirty(page);
> -	ClearPageUptodate(page);
> -	delete_from_page_cache(page);
> +	folio_clear_dirty(folio);
> +	folio_clear_uptodate(folio);
> +	filemap_remove_folio(folio);
>  }

Did you send the right version of this patch?  It doesn't look like it'll
compile.

Sidhartha Kumar Aug. 30, 2022, 4:47 p.m. UTC | #2

On 8/29/22 8:26 PM, Matthew Wilcox wrote:
> On Mon, Aug 29, 2022 at 04:00:12PM -0700, Sidhartha Kumar wrote:
>>   static void hugetlb_delete_from_page_cache(struct page *page)
>>   {
>> -	ClearPageDirty(page);
>> -	ClearPageUptodate(page);
>> -	delete_from_page_cache(page);
>> +	folio_clear_dirty(folio);
>> +	folio_clear_uptodate(folio);
>> +	filemap_remove_folio(folio);
>>   }
> Did you send the right version of this patch?  It doesn't look like it'll
> compile.
I missed changing the function argument to struct folio while rebasing 
onto Mike's patch,
will fix in a v2.

Patch

diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 3b5c941e49a7..7ede356cc01e 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -366,9 +366,9 @@  static int hugetlbfs_write_end(struct file *file, struct address_space *mapping,
 
 static void hugetlb_delete_from_page_cache(struct page *page)
 {
-	ClearPageDirty(page);
-	ClearPageUptodate(page);
-	delete_from_page_cache(page);
+	folio_clear_dirty(folio);
+	folio_clear_uptodate(folio);
+	filemap_remove_folio(folio);
 }
 
 static void
@@ -486,15 +486,15 @@  static void remove_inode_hugepages(struct inode *inode, loff_t lstart,
 
 			folio_lock(folio);
 			/*
-			 * We must free the huge page and remove from page
+			 * We must free the hugetlb folio and remove from page
 			 * cache BEFORE removing the * region/reserve map
 			 * (hugetlb_unreserve_pages).  In rare out of memory
 			 * conditions, removal of the region/reserve map could
 			 * fail. Correspondingly, the subpool and global
 			 * reserve usage count can need to be adjusted.
 			 */
-			VM_BUG_ON(HPageRestoreReserve(&folio->page));
-			hugetlb_delete_from_page_cache(&folio->page);
+			VM_BUG_ON_FOLIO(folio_test_hugetlb_restore_reserve(folio), folio);
+			hugetlb_delete_from_page_cache(folio);
 			freed++;
 			if (!truncate_op) {
 				if (unlikely(hugetlb_unreserve_pages(inode,
@@ -993,7 +993,7 @@  static int hugetlbfs_error_remove_page(struct address_space *mapping,
 	struct inode *inode = mapping->host;
 	pgoff_t index = page->index;
 
-	hugetlb_delete_from_page_cache(page);
+	hugetlb_delete_from_page_cache(page_folio(page));
 	if (unlikely(hugetlb_unreserve_pages(inode, index, index + 1, 1)))
 		hugetlb_fix_reserve_counts(inode);