korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

mm/swap: convert lru_lazyfree to a folio_batch

Browse Source 
Using folios instead of pages removes several calls to compound_head(),
shrinking the kernel by 1089 bytes of text.

Link: https://lkml.kernel.org/r/20220617175020.717127-8-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-06-17 18:50:05 +01:00 committed by akpm
parent 85cd7791a8
commit cec394bafa
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
mm/swap.c
View File

@ -64,7 +64,7 @@ struct lru_pvecs {
struct folio_batch lru_add; struct folio_batch lru_add;
struct folio_batch lru_deactivate_file; struct folio_batch lru_deactivate_file;
struct folio_batch lru_deactivate; struct folio_batch lru_deactivate;
struct pagevec lru_lazyfree; struct folio_batch lru_lazyfree;
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
struct pagevec activate_page; struct pagevec activate_page;
#endif #endif
@ -639,22 +639,22 @@ static void lru_deactivate_fn(struct lruvec *lruvec, struct folio *folio)
} }
} }
static void lru_lazyfree_fn(struct page *page, struct lruvec *lruvec) static void lru_lazyfree_fn(struct lruvec *lruvec, struct folio *folio)
{ {
if (PageAnon(page) && PageSwapBacked(page) && if (folio_test_anon(folio) && folio_test_swapbacked(folio) &&
!PageSwapCache(page) && !PageUnevictable(page)) { !folio_test_swapcache(folio) && !folio_test_unevictable(folio)) {
int nr_pages = thp_nr_pages(page); long nr_pages = folio_nr_pages(folio);
del_page_from_lru_list(page, lruvec); lruvec_del_folio(lruvec, folio);
ClearPageActive(page); folio_clear_active(folio);
ClearPageReferenced(page); folio_clear_referenced(folio);
/* /*
* Lazyfree pages are clean anonymous pages. They have * Lazyfree folios are clean anonymous folios. They have
* PG_swapbacked flag cleared, to distinguish them from normal * the swapbacked flag cleared, to distinguish them from normal
* anonymous pages * anonymous folios
*/ */
ClearPageSwapBacked(page); folio_clear_swapbacked(folio);
add_page_to_lru_list(page, lruvec); lruvec_add_folio(lruvec, folio);
__count_vm_events(PGLAZYFREE, nr_pages); __count_vm_events(PGLAZYFREE, nr_pages);
__count_memcg_events(lruvec_memcg(lruvec), PGLAZYFREE, __count_memcg_events(lruvec_memcg(lruvec), PGLAZYFREE,
@ -670,7 +670,6 @@ static void lru_lazyfree_fn(struct page *page, struct lruvec *lruvec)
void lru_add_drain_cpu(int cpu) void lru_add_drain_cpu(int cpu)
{ {
struct folio_batch *fbatch = &per_cpu(lru_pvecs.lru_add, cpu); struct folio_batch *fbatch = &per_cpu(lru_pvecs.lru_add, cpu);
struct pagevec *pvec;
if (folio_batch_count(fbatch)) if (folio_batch_count(fbatch))
folio_batch_move_lru(fbatch, lru_add_fn); folio_batch_move_lru(fbatch, lru_add_fn);
@ -694,9 +693,9 @@ void lru_add_drain_cpu(int cpu)
if (folio_batch_count(fbatch)) if (folio_batch_count(fbatch))
folio_batch_move_lru(fbatch, lru_deactivate_fn); folio_batch_move_lru(fbatch, lru_deactivate_fn);
pvec = &per_cpu(lru_pvecs.lru_lazyfree, cpu); fbatch = &per_cpu(lru_pvecs.lru_lazyfree, cpu);
if (pagevec_count(pvec)) if (folio_batch_count(fbatch))
pagevec_lru_move_fn(pvec, lru_lazyfree_fn); folio_batch_move_lru(fbatch, lru_lazyfree_fn);
activate_page_drain(cpu); activate_page_drain(cpu);
} }
@ -759,15 +758,17 @@ void deactivate_page(struct page *page)
*/ */
void mark_page_lazyfree(struct page *page) void mark_page_lazyfree(struct page *page)
{ {
if (PageLRU(page) && PageAnon(page) && PageSwapBacked(page) && struct folio *folio = page_folio(page);
!PageSwapCache(page) && !PageUnevictable(page)) {
struct pagevec *pvec;
if (folio_test_lru(folio) && folio_test_anon(folio) &&
folio_test_swapbacked(folio) && !folio_test_swapcache(folio) &&
!folio_test_unevictable(folio)) {
struct folio_batch *fbatch;
folio_get(folio);
local_lock(&lru_pvecs.lock); local_lock(&lru_pvecs.lock);
pvec = this_cpu_ptr(&lru_pvecs.lru_lazyfree); fbatch = this_cpu_ptr(&lru_pvecs.lru_lazyfree);
get_page(page); folio_batch_add_and_move(fbatch, folio, lru_lazyfree_fn);
if (pagevec_add_and_need_flush(pvec, page))
pagevec_lru_move_fn(pvec, lru_lazyfree_fn);
local_unlock(&lru_pvecs.lock); local_unlock(&lru_pvecs.lock);
} }
} }
@ -899,7 +900,7 @@ static inline void __lru_add_drain_all(bool force_all_cpus)
data_race(folio_batch_count(&per_cpu(lru_rotate.fbatch, cpu))) || data_race(folio_batch_count(&per_cpu(lru_rotate.fbatch, cpu))) ||
folio_batch_count(&per_cpu(lru_pvecs.lru_deactivate_file, cpu)) || folio_batch_count(&per_cpu(lru_pvecs.lru_deactivate_file, cpu)) ||
folio_batch_count(&per_cpu(lru_pvecs.lru_deactivate, cpu)) || folio_batch_count(&per_cpu(lru_pvecs.lru_deactivate, cpu)) ||
pagevec_count(&per_cpu(lru_pvecs.lru_lazyfree, cpu)) || folio_batch_count(&per_cpu(lru_pvecs.lru_lazyfree, cpu)) ||
need_activate_page_drain(cpu) || need_activate_page_drain(cpu) ||
need_mlock_page_drain(cpu) || need_mlock_page_drain(cpu) ||
has_bh_in_lru(cpu, NULL)) { has_bh_in_lru(cpu, NULL)) {