From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Subject: [PATCH 02/10] mm/truncate: Inline invalidate_complete_page() into its one caller
Date: Mon, 14 Feb 2022 20:00:09 +0000 [thread overview]
Message-ID: <20220214200017.3150590-3-willy@infradead.org> (raw)
In-Reply-To: <20220214200017.3150590-1-willy@infradead.org>
invalidate_inode_page() is the only caller of invalidate_complete_page()
and inlining it reveals that the first check is unnecessary (because we
hold the page locked, and we just retrieved the mapping from the page).
Actually, it does make a difference, in that tail pages no longer fail
at this check, so it's now possible to remove a tail page from a mapping.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
mm/truncate.c | 28 +++++-----------------------
1 file changed, 5 insertions(+), 23 deletions(-)
diff --git a/mm/truncate.c b/mm/truncate.c
index 9dbf0b75da5d..e5e2edaa0b76 100644
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -193,27 +193,6 @@ static void truncate_cleanup_folio(struct folio *folio)
folio_clear_mappedtodisk(folio);
}
-/*
- * This is for invalidate_mapping_pages(). That function can be called at
- * any time, and is not supposed to throw away dirty pages. But pages can
- * be marked dirty at any time too, so use remove_mapping which safely
- * discards clean, unused pages.
- *
- * Returns non-zero if the page was successfully invalidated.
- */
-static int
-invalidate_complete_page(struct address_space *mapping, struct page *page)
-{
-
- if (page->mapping != mapping)
- return 0;
-
- if (page_has_private(page) && !try_to_release_page(page, 0))
- return 0;
-
- return remove_mapping(mapping, page);
-}
-
int truncate_inode_folio(struct address_space *mapping, struct folio *folio)
{
if (folio->mapping != mapping)
@@ -309,7 +288,10 @@ int invalidate_inode_page(struct page *page)
return 0;
if (page_mapped(page))
return 0;
- return invalidate_complete_page(mapping, page);
+ if (page_has_private(page) && !try_to_release_page(page, 0))
+ return 0;
+
+ return remove_mapping(mapping, page);
}
/**
@@ -584,7 +566,7 @@ void invalidate_mapping_pagevec(struct address_space *mapping,
}
/*
- * This is like invalidate_complete_page(), except it ignores the page's
+ * This is like invalidate_inode_page(), except it ignores the page's
* refcount. We do this because invalidate_inode_pages2() needs stronger
* invalidation guarantees, and cannot afford to leave pages behind because
* shrink_page_list() has a temp ref on them, or because they're transiently
--
2.34.1
next prev parent reply other threads:[~2022-02-14 20:00 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-14 20:00 [PATCH 00/10] Various fixes around invalidate_page() Matthew Wilcox (Oracle)
2022-02-14 20:00 ` [PATCH 01/10] splice: Use a folio in page_cache_pipe_buf_try_steal() Matthew Wilcox (Oracle)
2022-02-15 7:15 ` Christoph Hellwig
2022-02-15 8:32 ` Miaohe Lin
2022-02-14 20:00 ` Matthew Wilcox (Oracle) [this message]
2022-02-14 23:09 ` [PATCH 02/10] mm/truncate: Inline invalidate_complete_page() into its one caller John Hubbard
2022-02-14 23:32 ` Matthew Wilcox
2022-02-14 23:51 ` John Hubbard
2022-02-15 7:17 ` Christoph Hellwig
2022-02-15 7:45 ` Miaohe Lin
2022-02-15 20:09 ` Matthew Wilcox
2022-02-16 2:36 ` Miaohe Lin
2022-02-16 2:45 ` Miaohe Lin
2022-02-14 20:00 ` [PATCH 03/10] mm/truncate: Convert invalidate_inode_page() to use a folio Matthew Wilcox (Oracle)
2022-02-15 7:18 ` Christoph Hellwig
2022-02-15 8:32 ` Miaohe Lin
2022-02-14 20:00 ` [PATCH 04/10] mm/truncate: Replace page_mapped() call in invalidate_inode_page() Matthew Wilcox (Oracle)
2022-02-15 7:19 ` Christoph Hellwig
2022-02-15 20:12 ` Matthew Wilcox
2022-02-15 8:32 ` Miaohe Lin
2022-02-25 1:31 ` Matthew Wilcox
2022-02-25 3:27 ` Matthew Wilcox
2022-02-14 20:00 ` [PATCH 05/10] mm: Convert remove_mapping() to take a folio Matthew Wilcox (Oracle)
2022-02-15 7:21 ` Christoph Hellwig
2022-02-15 8:33 ` Miaohe Lin
2022-02-14 20:00 ` [PATCH 06/10] mm/truncate: Split invalidate_inode_page() into mapping_shrink_folio() Matthew Wilcox (Oracle)
2022-02-15 7:23 ` Christoph Hellwig
2022-02-15 9:37 ` Miaohe Lin
2022-02-14 20:00 ` [PATCH 07/10] mm/truncate: Convert __invalidate_mapping_pages() to use a folio Matthew Wilcox (Oracle)
2022-02-15 7:24 ` Christoph Hellwig
2022-02-15 9:37 ` Miaohe Lin
2022-02-14 20:00 ` [PATCH 08/10] mm: Turn deactivate_file_page() into deactivate_file_folio() Matthew Wilcox (Oracle)
2022-02-15 7:25 ` Christoph Hellwig
2022-02-15 8:26 ` Miaohe Lin
2022-02-15 20:33 ` Matthew Wilcox
2022-02-16 2:45 ` Miaohe Lin
2022-02-14 20:00 ` [PATCH 09/10] mm/truncate: Combine invalidate_mapping_pagevec() and __invalidate_mapping_pages() Matthew Wilcox (Oracle)
2022-02-15 7:26 ` Christoph Hellwig
2022-02-15 9:37 ` Miaohe Lin
2022-02-14 20:00 ` [PATCH 10/10] fs: Move many prototypes to pagemap.h Matthew Wilcox (Oracle)
2022-02-15 7:27 ` Christoph Hellwig
2022-02-15 9:38 ` Miaohe Lin
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=20220214200017.3150590-3-willy@infradead.org \
--to=willy@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.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).