diff options
| author | Matthew Wilcox (Oracle) | 2022-05-12 20:23:03 -0700 |
|---|---|---|
| committer | Andrew Morton | 2022-05-13 07:20:15 -0700 |
| commit | 246b648038096c6024a812aac354d27e8da987a2 (patch) | |
| tree | 9fa3e95f3650af6aa6c393ca987399bbe03fff59 /mm/vmscan.c | |
| parent | 5441d4902f969293b5bfe057e26038db1a8b342e (diff) | |
vmscan: convert the activate_locked portion of shrink_page_list to folios
This accounts the number of pages activated correctly for large folios.
Link: https://lkml.kernel.org/r/20220504182857.4013401-14-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'mm/vmscan.c')
| -rw-r--r-- | mm/vmscan.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 725a291e9dad..0a527cebdff2 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1946,15 +1946,16 @@ activate_locked_split: } activate_locked: /* Not a candidate for swapping, so reclaim swap space. */ - if (PageSwapCache(page) && (mem_cgroup_swap_full(page) || - PageMlocked(page))) - try_to_free_swap(page); - VM_BUG_ON_PAGE(PageActive(page), page); - if (!PageMlocked(page)) { - int type = page_is_file_lru(page); - SetPageActive(page); + if (folio_test_swapcache(folio) && + (mem_cgroup_swap_full(&folio->page) || + folio_test_mlocked(folio))) + try_to_free_swap(&folio->page); + VM_BUG_ON_FOLIO(folio_test_active(folio), folio); + if (!folio_test_mlocked(folio)) { + int type = folio_is_file_lru(folio); + folio_set_active(folio); stat->nr_activate[type] += nr_pages; - count_memcg_page_event(page, PGACTIVATE); + count_memcg_folio_events(folio, PGACTIVATE, nr_pages); } keep_locked: unlock_page(page); |