From: Sidhartha Kumar <sidhartha.kumar@oracle.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: akpm@linux-foundation.org, songmuchun@bytedance.com,
mike.kravetz@oracle.com, willy@infradead.org, vbabka@suse.cz,
william.kucharski@oracle.com, dhowells@redhat.com,
peterx@redhat.com, arnd@arndb.de, ccross@google.com,
hughd@google.com, ebiederm@xmission.com,
Sidhartha Kumar <sidhartha.kumar@oracle.com>
Subject: [PATCH 5/7] mm/hugetlb: convert hugetlb_delete_from_page_cache() to use folios
Date: Mon, 29 Aug 2022 16:00:12 -0700 [thread overview]
Message-ID: <20220829230014.384722-6-sidhartha.kumar@oracle.com> (raw)
In-Reply-To: <20220829230014.384722-1-sidhartha.kumar@oracle.com>
Removes the last caller of remove_huge_page() by converting the code to its
folio equivalent.
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
---
fs/hugetlbfs/inode.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
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);
--
2.31.1
next prev parent reply other threads:[~2022-08-29 23:01 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-29 23:00 [PATCH 0/7] begin converting hugetlb code to folios Sidhartha Kumar
2022-08-29 23:00 ` [PATCH 1/7] mm/hugetlb: add folio support to hugetlb specific flag macros Sidhartha Kumar
2022-08-30 3:33 ` Matthew Wilcox
2022-08-30 18:09 ` Sidhartha Kumar
2022-09-01 16:55 ` Mike Kravetz
2022-08-29 23:00 ` [PATCH 2/7] mm: add private field of first tail to struct page and struct folio Sidhartha Kumar
2022-08-30 3:36 ` Matthew Wilcox
2022-09-01 17:32 ` Mike Kravetz
2022-09-01 18:32 ` Matthew Wilcox
2022-09-01 20:29 ` Mike Kravetz
2022-08-29 23:00 ` [PATCH 3/7] mm/hugetlb: add hugetlb_folio_subpool() helper Sidhartha Kumar
2022-08-29 23:00 ` [PATCH 4/7] mm/hugetlb: add hugetlb_set_folio_subpool() helper Sidhartha Kumar
2022-08-29 23:00 ` Sidhartha Kumar [this message]
2022-08-30 3:26 ` [PATCH 5/7] mm/hugetlb: convert hugetlb_delete_from_page_cache() to use folios Matthew Wilcox
2022-08-30 16:47 ` Sidhartha Kumar
2022-08-29 23:00 ` [PATCH 6/7] mm/hugetlb add folio_hstate() Sidhartha Kumar
2022-09-01 18:34 ` Mike Kravetz
2022-08-29 23:00 ` [PATCH 7/7] mm/migrate: use folio_hstate() in alloc_migration_target() Sidhartha Kumar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220829230014.384722-6-sidhartha.kumar@oracle.com \
--to=sidhartha.kumar@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=ccross@google.com \
--cc=dhowells@redhat.com \
--cc=ebiederm@xmission.com \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mike.kravetz@oracle.com \
--cc=peterx@redhat.com \
--cc=songmuchun@bytedance.com \
--cc=vbabka@suse.cz \
--cc=william.kucharski@oracle.com \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).