mm-split-out-a-writeout-helper-from-pageout.patch removed from -mm tree
The quilt patch titled
Subject: mm: split out a writeout helper from pageout
has been removed from the -mm tree. Its filename was
mm-split-out-a-writeout-helper-from-pageout.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Christoph Hellwig <[email protected]>
Subject: mm: split out a writeout helper from pageout
Date: Tue, 10 Jun 2025 07:49:37 +0200
Patch series "stop passing a writeback_control to swap/shmem writeout", v3.
This series was intended to remove the last remaining users of AOP_WRITEPAGE_ACTIVATE after my other pending patches removed the rest, but spectacularly failed at that.
But instead it nicely improves the code, and removes two pointers from struct writeback_control.
This patch (of 6):
Move the code to write back swap / shmem folios into a self-contained helper to keep prepare for refactoring it.
---
mm/vmscan.c | 94 +++++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 46 deletions(-)
mm/vmscan.c renamed from mm/vmscan.c~mm-split-out-a-writeout-helper-from-pageout +48 -46
@@ -652,14 +652,55 @@ typedef enum {PAGE_CLEAN , } pageout_t; +static pageout_t writeout (struct folio *folio,struct address_space *mapping, +struct swap_iocb **plug,struct list_head *folio_list) +{ +struct writeback_control wbc = { + .sync_mode =WB_SYNC_NONE , + .nr_to_write =SWAP_CLUSTER_MAX , + .range_start =0 , + .range_end =LLONG_MAX , + .for_reclaim =1 , + .swap_plug = plug, + }; +int res; + +folio_set_reclaim (folio); + +/* +* The large shmem folio can be split if CONFIG_THP_SWAP is not enabled +* or we failed to allocate contiguous swap entries. +*/ +if (shmem_mapping (mapping)) { +if (folio_test_large (folio)) + wbc.list = folio_list; + res =shmem_writeout (folio, &wbc); + }else { + res =swap_writeout (folio, &wbc); + } + +if (res <0 ) +handle_write_error (mapping, folio, res); +if (res ==AOP_WRITEPAGE_ACTIVATE ) { +folio_clear_reclaim (folio); +return PAGE_ACTIVATE ; + } + +/* synchronous write? */ +if (!folio_test_writeback (folio)) +folio_clear_reclaim (folio); + +trace_mm_vmscan_write_folio (folio); +node_stat_add_folio (folio,NR_VMSCAN_WRITE ); +return PAGE_SUCCESS ; +} +/* * pageout is called by shrink_folio_list() for each dirty folio. */ static pageout_t pageout (struct folio *folio,struct address_space *mapping,struct swap_iocb **plug,struct list_head *folio_list) { -int (*writeout)(struct folio *,struct writeback_control *); -/* * We no longer attempt to writeback filesystem folios here, other * than tmpfs/shmem. That's taken care of in page-writeback.
@@ -690,51 +731,12 @@ static pageout_t pageout(struct folio *f }return PAGE_KEEP ; } -if (shmem_mapping (mapping)) - writeout = shmem_writeout; -else if (folio_test_anon (folio)) - writeout = swap_writeout; -else -return PAGE_ACTIVATE ; - -if (folio_clear_dirty_for_io (folio)) { -int res; -struct writeback_control wbc = { - .sync_mode =WB_SYNC_NONE , - .nr_to_write =SWAP_CLUSTER_MAX , - .range_start =0 , - .range_end =LLONG_MAX , - .for_reclaim =1 , - .swap_plug = plug, - }; - -/* -* The large shmem folio can be split if CONFIG_THP_SWAP is -* not enabled or contiguous swap entries are failed to -* allocate. -*/ -if (shmem_mapping (mapping) &&folio_test_large (folio)) - wbc.list = folio_list; -folio_set_reclaim (folio); - res =writeout (folio, &wbc); -if (res <0 ) -handle_write_error (mapping, folio, res); -if (res ==AOP_WRITEPAGE_ACTIVATE ) { -folio_clear_reclaim (folio); -return PAGE_ACTIVATE ; - } - -if (!folio_test_writeback (folio)) { -/* synchronous write? */ -folio_clear_reclaim (folio); - } -trace_mm_vmscan_write_folio (folio); -node_stat_add_folio (folio,NR_VMSCAN_WRITE ); -return PAGE_SUCCESS ; - } - -return PAGE_CLEAN ; +if (!shmem_mapping (mapping) && !folio_test_anon (folio)) +return PAGE_ACTIVATE ; +if (!folio_clear_dirty_for_io (folio)) +return PAGE_CLEAN ; +return writeout (folio, mapping, plug, folio_list); }/*
_
Patches currently in -mm which might be from [email protected] are