mm/page-writeback: drop usage of folio_index
Subsystems (2)
PATCH 1/1 mm/page-writeback: drop usage of folio_index
From: Kairui Song <[email protected]>
folio_index is only needed for mixed usage of page cache and swap cache. The remaining three caller in page-writeback are for page cache tag marking. Swap cache space doesn't use tag (explicitly sets mapping_set_no_writeback_tags), so use folio->index here directly.
--- mm/page-writeback.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
mm/page-writeback.c +4 -4
@@ -2739,8 +2739,8 @@ void __folio_mark_dirty(struct folio *folio, struct address_space *mapping,if (folio->mapping) {/* Race with truncate? */ WARN_ON_ONCE (warn && !folio_test_uptodate (folio));folio_account_dirtied (folio, mapping); -__xa_set_mark (&mapping->i_pages,folio_index (folio), -PAGECACHE_TAG_DIRTY ); +__xa_set_mark (&mapping->i_pages, folio->index, +PAGECACHE_TAG_DIRTY ); }xa_unlock_irqrestore (&mapping->i_pages, flags); }
@@ -3019,7 +3019,7 @@ bool __folio_end_writeback(struct folio *folio)xa_lock_irqsave (&mapping->i_pages, flags); ret =folio_xor_flags_has_waiters (folio,1 << PG_writeback); -__xa_clear_mark (&mapping->i_pages,folio_index (folio), +__xa_clear_mark (&mapping->i_pages, folio->index,PAGECACHE_TAG_WRITEBACK );if (bdi->capabilities &BDI_CAP_WRITEBACK_ACCT ) {struct bdi_writeback *wb =inode_to_wb (inode);
@@ -3056,7 +3056,7 @@ void __folio_start_writeback(struct folio *folio, bool keep_write)VM_BUG_ON_FOLIO (!folio_test_locked (folio), folio);if (mapping &&mapping_use_writeback_tags (mapping)) { -XA_STATE (xas, &mapping->i_pages,folio_index (folio)); +XA_STATE (xas, &mapping->i_pages, folio->index);struct inode *inode = mapping->host;struct backing_dev_info *bdi =inode_to_bdi (inode);unsigned long flags;
Signature · 1 line
2.50.1
Matthew Wilcox
maintainermm/page-writeback.c void __folio_mark_dirty(struct folio *folio, struct address_space *mapping, · line 2746
Quoted 12 lines · Kairui Song
+++
b/mm/page-writeback.cmm/page-writeback.c +2
-2@@ -2739,8 +2739,8 @@ void __folio_mark_dirty(struct folio *folio, struct address_space *mapping,if (folio->mapping) {/* Race with truncate? */ WARN_ON_ONCE (warn && !folio_test_uptodate (folio));folio_account_dirtied (folio, mapping); -__xa_set_mark (&mapping->i_pages,folio_index (folio), -PAGECACHE_TAG_DIRTY ); +__xa_set_mark (&mapping->i_pages, folio->index, +PAGECACHE_TAG_DIRTY ); }xa_unlock_irqrestore (&mapping->i_pages, flags); }
What about a shmem folio that's been moved to the swap cache? I used folio_index() here because I couldn't prove to my satisfaction that this couldn't happen.
Quoted 18 lines · Matthew Wilcox
mm/page-writeback.c void __folio_mark_dirty(struct folio *folio, struct address_space *mapping, · line 2746
Quoted 12 lines · Kairui Song
+++
b/mm/page-writeback.cmm/page-writeback.c +2
-2@@ -2739,8 +2739,8 @@ void __folio_mark_dirty(struct folio *folio, struct address_space *mapping,if (folio->mapping) {/* Race with truncate? */ WARN_ON_ONCE (warn && !folio_test_uptodate (folio));folio_account_dirtied (folio, mapping); -__xa_set_mark (&mapping->i_pages,folio_index (folio), -PAGECACHE_TAG_DIRTY ); +__xa_set_mark (&mapping->i_pages, folio->index, +PAGECACHE_TAG_DIRTY ); }xa_unlock_irqrestore (&mapping->i_pages, flags); }What about a shmem folio that's been moved to the swap cache? I used
folio_index()here because I couldn't prove to my satisfaction that this couldn't happen.
I just checked all callers of __folio_mark_dirty:
- block_dirty_folio
__folio_mark_dirty
- filemap_dirty_folio
__folio_mark_dirty
For these two, all their caller are from other fs not related to shmem/swap cache)
- mark_buffer_dirty
__folio_mark_dirty (mapping is folio->mapping)
- folio_redirty_for_writepage
filemap_dirty_folio
__folio_mark_dirty (mapping is folio->mapping)For these two, __folio_mark_dirty is called with folio->mapping, and swap cache space is never set to folio->mapping. If the folio is a swap cache here, folio_index returns its swap cache index, which is not equal to its index in shmem or any other map, things will go very wrong.
And, currently both shmem / swap cache uses noop_dirty_folio, so they should never call into the helper here.
I think I can add below sanity check here, just to clarify things and for debugging:
/*
* Shmem writeback relies on swap, and swap writeback
* is LRU based, not using the dirty mark.
*/VM_WARN_ON(shmem_mapping(mapping) || folio_test_swapcache(folio))
And maybe we can also have a VM_WARN_ON for folio->mapping != mapping here?
Matthew Wilcox
maintainerQuoted 38 lines · Kairui Song
Quoted 18 lines · Matthew Wilcox
mm/page-writeback.c void __folio_mark_dirty(struct folio *folio, struct address_space *mapping, · line 2746
Quoted 12 lines · Kairui Song
+++
b/mm/page-writeback.cmm/page-writeback.c +2
-2@@ -2739,8 +2739,8 @@ void __folio_mark_dirty(struct folio *folio, struct address_space *mapping,if (folio->mapping) {/* Race with truncate? */ WARN_ON_ONCE (warn && !folio_test_uptodate (folio));folio_account_dirtied (folio, mapping); -__xa_set_mark (&mapping->i_pages,folio_index (folio), -PAGECACHE_TAG_DIRTY ); +__xa_set_mark (&mapping->i_pages, folio->index, +PAGECACHE_TAG_DIRTY ); }xa_unlock_irqrestore (&mapping->i_pages, flags); }What about a shmem folio that's been moved to the swap cache? I used
folio_index()here because I couldn't prove to my satisfaction that this couldn't happen.I just checked all callers of
__folio_mark_dirty:-
block_dirty_folio
__folio_mark_dirty-
filemap_dirty_folio
__folio_mark_dirtyFor these two, all their caller are from other fs not related to shmem/swap cache)
-
mark_buffer_dirty__folio_mark_dirty (mapping is folio->mapping)-
folio_redirty_for_writepagefilemap_dirty_folio __folio_mark_dirty (mapping is folio->mapping)
Quoted 8 lines
For these two,
__folio_mark_dirtyis called withfolio->mapping, and swap cache space is never set tofolio->mapping. If the folio is a swap cache here,folio_indexreturns its swap cache index, which is not equal to its index in shmem or any other map, things will go very wrong.And, currently both shmem / swap cache uses
noop_dirty_folio, so they should never call into the helper here.
Yes, we've made quite a few changes around here and maybe it can't happen now.
Quoted 8 lines
I think I can add below sanity check here, just to clarify things and for debugging:
/*
* Shmem writeback relies on swap, and swap writeback
* is LRU based, not using the dirty mark.
*/VM_WARN_ON(shmem_mapping(mapping) || folio_test_swapcache(folio))
That might be a good idea.
Quoted 1 line
And maybe we can also have a
VM_WARN_ONforfolio->mapping != mappinghere?
I don't think that will work. We can definitely see folio->mapping == NULL as the zap_page_range() path blocks folio freeing with the page table lock rather than by taking the folio lock. So truncation can start but not complete (as it will wait on the PTL for mapped folios).
I think it's always true that folio->mapping will be either NULL or equal to mapping, but maybe there's another case I've forgotten about.