diff options
| author | Kirill Tkhai <[email protected]> | 2019-05-13 17:16:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2019-05-14 09:47:45 -0700 |
| commit | 9851ac13592df77958ae7bac6ba39e71420c38ec (patch) | |
| tree | 831ed62fcdaebb9b326dd61a483f9528ce5727af | |
| parent | 886cf1901db962cee5f8b82b9b260079a5e8a4eb (diff) | |
mm: move nr_deactivate accounting to shrink_active_list()
We know which LRU is not active.
[[email protected]: fix build on !CONFIG_MEMCG]
Link: http://lkml.kernel.org/r/[email protected]
Link: http://lkml.kernel.org/r/155290128498.31489.18250485448913338607.stgit@localhost.localdomain
Signed-off-by: Kirill Tkhai <[email protected]>
Signed-off-by: Chris Down <[email protected]>
Reviewed-by: Daniel Jordan <[email protected]>
Cc: Michal Hocko <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
| -rw-r--r-- | include/linux/memcontrol.h | 6 | ||||
| -rw-r--r-- | mm/vmscan.c | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index dbb6118370c1..b238403f95b2 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1117,6 +1117,12 @@ static inline void count_memcg_events(struct mem_cgroup *memcg, { } +static inline void __count_memcg_events(struct mem_cgroup *memcg, + enum vm_event_item idx, + unsigned long count) +{ +} + static inline void count_memcg_page_event(struct page *page, int idx) { diff --git a/mm/vmscan.c b/mm/vmscan.c index e6913e68db2e..5002cc43e32f 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2040,12 +2040,6 @@ static unsigned move_active_pages_to_lru(struct lruvec *lruvec, } } - if (!is_active_lru(lru)) { - __count_vm_events(PGDEACTIVATE, nr_moved); - count_memcg_events(lruvec_memcg(lruvec), PGDEACTIVATE, - nr_moved); - } - return nr_moved; } @@ -2137,6 +2131,10 @@ static void shrink_active_list(unsigned long nr_to_scan, nr_activate = move_active_pages_to_lru(lruvec, &l_active, &l_hold, lru); nr_deactivate = move_active_pages_to_lru(lruvec, &l_inactive, &l_hold, lru - LRU_ACTIVE); + + __count_vm_events(PGDEACTIVATE, nr_deactivate); + __count_memcg_events(lruvec_memcg(lruvec), PGDEACTIVATE, nr_deactivate); + __mod_node_page_state(pgdat, NR_ISOLATED_ANON + file, -nr_taken); spin_unlock_irq(&pgdat->lru_lock); |