Skip to content

Commit 0aa2e1b

Browse files
dhowellsbrauner
authored andcommitted
mm: Fix missing folio invalidation calls during truncation
When AS_RELEASE_ALWAYS is set on a mapping, the ->release_folio() and ->invalidate_folio() calls should be invoked even if PG_private and PG_private_2 aren't set. This is used by netfslib to keep track of the point above which reads can be skipped in favour of just zeroing pagecache locally. There are a couple of places in truncation in which invalidation is only called when folio_has_private() is true. Fix these to check folio_needs_release() instead. Without this, the generic/075 and generic/112 xfstests (both fsx-based tests) fail with minimum folio size patches applied[1]. Fixes: b4fa966 ("mm, netfs, fscache: stop read optimisation when folio removed from pagecache") Signed-off-by: David Howells <[email protected]> Link: https://lore.kernel.org/r/[email protected]/ [1] Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Matthew Wilcox (Oracle) <[email protected]> cc: Matthew Wilcox (Oracle) <[email protected]> cc: Pankaj Raghav <[email protected]> cc: Jeff Layton <[email protected]> cc: Marc Dionne <[email protected]> cc: [email protected] cc: [email protected] cc: [email protected] cc: [email protected] Signed-off-by: Christian Brauner <[email protected]>
1 parent d10771d commit 0aa2e1b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

mm/truncate.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ static void truncate_cleanup_folio(struct folio *folio)
157157
if (folio_mapped(folio))
158158
unmap_mapping_folio(folio);
159159

160-
if (folio_has_private(folio))
160+
if (folio_needs_release(folio))
161161
folio_invalidate(folio, 0, folio_size(folio));
162162

163163
/*
@@ -219,7 +219,7 @@ bool truncate_inode_partial_folio(struct folio *folio, loff_t start, loff_t end)
219219
if (!mapping_inaccessible(folio->mapping))
220220
folio_zero_range(folio, offset, length);
221221

222-
if (folio_has_private(folio))
222+
if (folio_needs_release(folio))
223223
folio_invalidate(folio, offset, length);
224224
if (!folio_test_large(folio))
225225
return true;

0 commit comments

Comments
 (0)