UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-05-12 20:23:03 -07:00 committed by Andrew Morton
parent 5441d4902f
commit 246b648038
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mm/vmscan.c
View File

@ -1946,15 +1946,16 @@ activate_locked_split:
} }
activate_locked: activate_locked:
/* Not a candidate for swapping, so reclaim swap space. */ /* Not a candidate for swapping, so reclaim swap space. */
if (PageSwapCache(page) && (mem_cgroup_swap_full(page) || if (folio_test_swapcache(folio) &&
PageMlocked(page))) (mem_cgroup_swap_full(&folio->page) ||
try_to_free_swap(page); folio_test_mlocked(folio)))
VM_BUG_ON_PAGE(PageActive(page), page); try_to_free_swap(&folio->page);
if (!PageMlocked(page)) { VM_BUG_ON_FOLIO(folio_test_active(folio), folio);
int type = page_is_file_lru(page); if (!folio_test_mlocked(folio)) {
SetPageActive(page); int type = folio_is_file_lru(folio);
folio_set_active(folio);
stat->nr_activate[type] += nr_pages; stat->nr_activate[type] += nr_pages;
count_memcg_page_event(page, PGACTIVATE); count_memcg_folio_events(folio, PGACTIVATE, nr_pages);
} }
keep_locked: keep_locked:
unlock_page(page); unlock_page(page);