mm: move nr_deactivate accounting to shrink_active_list() (9851ac13) · Commits · 戴 / test

Daniel Jordan <daniel.m.jordan@oracle.com> Cc: Michal Hocko <mhocko@kernel.org> Signed-off-by:

include/linux/memcontrol.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -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)
		{

+4 −6

Original line number	Diff line number	Diff line
		@@ -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);