mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
mm: zswap: drop cold writeback folios via swap dropbehind
zswap writeback decompresses an entry into a fresh swap cache folio and writes it back. The folio is cold by construction, yet it is left on the LRU for reclaim to find and free later, wasting a reclaim scan and keeping cold memory resident longer than necessary. Allocate the folio off the LRU and mark it PG_dropbehind so the swap dropbehind path frees it from the swap cache once writeback completes. __swap_cache_alloc_folio() evaluates a refault on the new folio, and workingset_refault() sets PG_active when it looks recent. Until now folio_add_lru() consumed that flag and __page_cache_release() cleared it once the folio left the LRU. This folio never reaches the LRU, so nothing would clear PG_active and the folio would be freed with a PAGE_FLAGS_CHECK_AT_FREE flag set, tripping bad_page() under CONFIG_DEBUG_VM. Clear it after allocation. That is a workaround: the refault should not be evaluated on a writeback buffer at all. A fix for that is on the mailing list [1]. Link: https://lore.kernel.org/[email protected] Link: https://lore.kernel.org/linux-mm/[email protected]/ [1] Signed-off-by: Alexandre Ghiti <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Suggested-by: Johannes Weiner <[email protected]> Suggested-by: Nhat Pham <[email protected]> Reviewed-by: Nhat Pham <[email protected]> Reviewed-by: Kunwu Chan <[email protected]> Cc: Al Viro <[email protected]> Cc: Axel Rasmussen <[email protected]> Cc: Baoquan He <[email protected]> Cc: Barry Song <[email protected]> Cc: Chengming Zhou <[email protected]> Cc: Chis Li <[email protected]> Cc: Christian Brauner (Amutable) <[email protected]> Cc: "David Hildenbrand (arm)" <[email protected]> Cc: Jan Kara <[email protected]> Cc: Kairui Song <[email protected]> Cc: Kemeng Shi <[email protected]> Cc: Lorenzo Stoakes (ARM) <[email protected]> Cc: Matthew Wilcox <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Qi Zheng <[email protected]> Cc: Shakeel Butt <[email protected]> Cc: Tal Zussman <[email protected]> Cc: Usama Arif <[email protected]> Cc: Wei Xu <[email protected]> Cc: Yosry Ahmed <[email protected]> Cc: Youngjun Park <[email protected]> Cc: Yuanchu Xie <[email protected]>
This commit is contained in:
committed by
Andrew Morton
parent
7ccf5a3e5b
commit
4fce3f3c69
+23
-10
@@ -1032,7 +1032,8 @@ static int zswap_writeback_entry(struct zswap_entry *entry,
|
||||
*/
|
||||
if (IS_ERR(folio))
|
||||
return PTR_ERR(folio);
|
||||
folio_add_lru(folio);
|
||||
|
||||
folio_clear_active(folio);
|
||||
|
||||
/*
|
||||
* folio is locked, and the swapcache is now secured against
|
||||
@@ -1046,12 +1047,12 @@ static int zswap_writeback_entry(struct zswap_entry *entry,
|
||||
tree = swap_zswap_tree(swpentry);
|
||||
if (entry != xa_load(tree, offset)) {
|
||||
ret = -ENOMEM;
|
||||
goto out;
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (!zswap_decompress(entry, folio)) {
|
||||
ret = -EIO;
|
||||
goto out;
|
||||
goto err;
|
||||
}
|
||||
|
||||
xa_erase(tree, offset);
|
||||
@@ -1065,18 +1066,30 @@ static int zswap_writeback_entry(struct zswap_entry *entry,
|
||||
/* folio is up to date */
|
||||
folio_mark_uptodate(folio);
|
||||
|
||||
/* move it to the tail of the inactive list after end_writeback */
|
||||
folio_set_reclaim(folio);
|
||||
folio_set_dropbehind(folio);
|
||||
|
||||
/*
|
||||
* Drop our reference before starting writeback so the swap cache holds
|
||||
* the only one: the drop in folio_end_writeback() needs that for
|
||||
* remove_mapping_set_shadow() to succeed, otherwise the folio is
|
||||
* handed back to reclaim instead.
|
||||
*
|
||||
* Nothing can free the folio in the meantime: we hold the folio lock
|
||||
* until writeback starts, PG_writeback then blocks swap cache removal,
|
||||
* and folio_end_writeback() takes its own reference before clearing
|
||||
* PG_writeback and donates it to the drop.
|
||||
*/
|
||||
folio_put(folio);
|
||||
|
||||
/* start writeback */
|
||||
__swap_writeout(&ctx, folio);
|
||||
swap_write_submit(&ctx);
|
||||
|
||||
out:
|
||||
if (ret) {
|
||||
swap_cache_del_folio(folio);
|
||||
folio_unlock(folio);
|
||||
}
|
||||
return 0;
|
||||
|
||||
err:
|
||||
swap_cache_del_folio(folio);
|
||||
folio_unlock(folio);
|
||||
folio_put(folio);
|
||||
return ret;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user