mm-lru-move-lock-into-lru_note_cost.patch removed from -mm tree
The patch titled
Subject: mm/lru: move lock into lru_note_cost
has been removed from the -mm tree. Its filename was
mm-lru-move-lock-into-lru_note_cost.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Alex Shi <[email protected]>
Subject: mm/lru: move lock into lru_note_cost
We have to move lru_lock into lru_note_cost, since it cycle up on memcg tree, for future per lruvec lru_lock replace. It's a bit ugly and may cost a bit more locking, but benefit from multiple memcg locking could cover the lost.
---
mm/swap.c | 3 +++ mm/vmscan.c | 4 +--- mm/workingset.c | 2 -- 3 files changed, 4 insertions(+), 5 deletions(-)
mm/swap.c renamed from mm/swap.c~mm-lru-move-lock-into-lru_note_cost +3 -0
@@ -268,7 +268,9 @@ void lru_note_cost(struct lruvec *lruvec { do { unsigned long lrusize; + struct pglist_data *pgdat = lruvec_pgdat(lruvec); + spin_lock_irq(&pgdat->lru_lock); /* Record cost event */ if (file) lruvec->file_cost += nr_pages;
@@ -292,6 +294,7 @@ void lru_note_cost(struct lruvec *lruvec lruvec->file_cost /=2 ; lruvec->anon_cost /=2 ; } +spin_unlock_irq (&pgdat->lru_lock); }while ((lruvec =parent_lruvec (lruvec))); }
mm/vmscan.c renamed from mm/vmscan.c~mm-lru-move-lock-into-lru_note_cost +1 -3
@@ -1971,19 +1971,17 @@ shrink_inactive_list(unsigned long nr_to nr_reclaimed =shrink_page_list (&page_list, pgdat, sc, &stat, false);spin_lock_irq (&pgdat->lru_lock); -move_pages_to_lru (lruvec, &page_list);__mod_node_page_state (pgdat,NR_ISOLATED_ANON + file, -nr_taken); -lru_note_cost (lruvec, file, stat.nr_pageout); item =current_is_kswapd () ?PGSTEAL_KSWAPD :PGSTEAL_DIRECT ;if (!cgroup_reclaim (sc))__count_vm_events (item, nr_reclaimed);__count_memcg_events (lruvec_memcg (lruvec), item, nr_reclaimed);__count_vm_events (PGSTEAL_ANON + file, nr_reclaimed); -spin_unlock_irq (&pgdat->lru_lock); +lru_note_cost (lruvec, file, stat.nr_pageout);mem_cgroup_uncharge_list (&page_list);free_unref_page_list (&page_list);
mm/workingset.c renamed from mm/workingset.c~mm-lru-move-lock-into-lru_note_cost +0 -2
@@ -381,9 +381,7 @@ void workingset_refault(struct page *pagif (workingset) {SetPageWorkingset (page);/* XXX: Move to lru_cache_add() when it supports new vs putback */ -spin_lock_irq (&page_pgdat (page)->lru_lock);lru_note_cost_page (page); -spin_unlock_irq (&page_pgdat (page)->lru_lock);inc_lruvec_state (lruvec,WORKINGSET_RESTORE_BASE + file); } out:
_
Patches currently in -mm which might be from [email protected] are
mm-vmscan-__isolate_lru_page_prepare-clean-up.patch fs-nilfs2-remove-some-unused-macros-to-tame-gcc.patch gcov-fix-kernel-doc-markup-issue.patch mm-memcg-bail-early-from-swap-accounting-if-memcg-disabled.patch mm-memcg-warning-on-memcg-after-readahead-page-charged.patch mm-memcontrol-rewrite-mem_cgroup_page_lruvec-fix.patch