Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f46b7912 authored by Kirill Tkhai's avatar Kirill Tkhai Committed by Linus Torvalds
Browse files

mm/vmscan.c: simplify shrink_inactive_list() 

This merges together duplicated patterns of code.  Also, replace
count_memcg_events() with its irq-careless namesake, because they are
already called in interrupts disabled context.

Link: http://lkml.kernel.org/r/2ece1df4-2989-bc9b-6172-61e9fdde5bfd@virtuozzo.com


Signed-off-by: default avatarKirill Tkhai <ktkhai@virtuozzo.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Reviewed-by: default avatarDaniel Jordan <daniel.m.jordan@oracle.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Baoquan He <bhe@redhat.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>

Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c553ea4f

mm/vmscan.c

+9 −22
Original line number Diff line number Diff line
@@ -1907,6 +1907,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec, 
	unsigned long nr_taken;

	struct reclaim_stat stat;

	int file = is_file_lru(lru);

	enum vm_event_item item;

	struct pglist_data *pgdat = lruvec_pgdat(lruvec);

	struct zone_reclaim_stat *reclaim_stat = &lruvec->reclaim_stat;

	bool stalled = false;
@@ -1934,17 +1935,10 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec, 
	__mod_node_page_state(pgdat, NR_ISOLATED_ANON + file, nr_taken);

	reclaim_stat->recent_scanned[file] += nr_taken;



	if (current_is_kswapd()) {

		if (global_reclaim(sc))

			__count_vm_events(PGSCAN_KSWAPD, nr_scanned);

		count_memcg_events(lruvec_memcg(lruvec), PGSCAN_KSWAPD,

				   nr_scanned);

	} else {

	item = current_is_kswapd() ? PGSCAN_KSWAPD : PGSCAN_DIRECT;

	if (global_reclaim(sc))

			__count_vm_events(PGSCAN_DIRECT, nr_scanned);

		count_memcg_events(lruvec_memcg(lruvec), PGSCAN_DIRECT,

				   nr_scanned);

	}

		__count_vm_events(item, nr_scanned);

	__count_memcg_events(lruvec_memcg(lruvec), item, nr_scanned);

	spin_unlock_irq(&pgdat->lru_lock);



	if (nr_taken == 0)
@@ -1955,17 +1949,10 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec, 


	spin_lock_irq(&pgdat->lru_lock);



	if (current_is_kswapd()) {

		if (global_reclaim(sc))

			__count_vm_events(PGSTEAL_KSWAPD, nr_reclaimed);

		count_memcg_events(lruvec_memcg(lruvec), PGSTEAL_KSWAPD,

				   nr_reclaimed);

	} else {

	item = current_is_kswapd() ? PGSTEAL_KSWAPD : PGSTEAL_DIRECT;

	if (global_reclaim(sc))

			__count_vm_events(PGSTEAL_DIRECT, nr_reclaimed);

		count_memcg_events(lruvec_memcg(lruvec), PGSTEAL_DIRECT,

				   nr_reclaimed);

	}

		__count_vm_events(item, nr_reclaimed);

	__count_memcg_events(lruvec_memcg(lruvec), item, nr_reclaimed);

	reclaim_stat->recent_rotated[0] = stat.nr_activate[0];

	reclaim_stat->recent_rotated[1] = stat.nr_activate[1];