Commit 84b18490 authored by KOSAKI Motohiro's avatar KOSAKI Motohiro Committed by Linus Torvalds
Browse files

vmscan: get_scan_ratio() cleanup 



The get_scan_ratio() should have all scan-ratio related calculations.
Thus, this patch move some calculation into get_scan_ratio.

Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: default avatarRik van Riel <riel@redhat.com>
Reviewed-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Reviewed-by: default avatarMinchan Kim <minchan.kim@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 45973d74

mm/vmscan.c

+14 −9
Original line number Original line Diff line number Diff line
@@ -1501,6 +1501,13 @@ static void get_scan_ratio(struct zone *zone, struct scan_control *sc, 
	unsigned long ap, fp;

	unsigned long ap, fp;

	struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(zone, sc);

	struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(zone, sc);





	/* If we have no swap space, do not bother scanning anon pages. */

	if (!sc->may_swap || (nr_swap_pages <= 0)) {

		percent[0] = 0;

		percent[1] = 100;

		return;

	}



	anon  = zone_nr_lru_pages(zone, sc, LRU_ACTIVE_ANON) +

	anon  = zone_nr_lru_pages(zone, sc, LRU_ACTIVE_ANON) +

		zone_nr_lru_pages(zone, sc, LRU_INACTIVE_ANON);

		zone_nr_lru_pages(zone, sc, LRU_INACTIVE_ANON);

	file  = zone_nr_lru_pages(zone, sc, LRU_ACTIVE_FILE) +

	file  = zone_nr_lru_pages(zone, sc, LRU_ACTIVE_FILE) +
@@ -1598,22 +1605,20 @@ static void shrink_zone(int priority, struct zone *zone, 
	unsigned long nr_reclaimed = sc->nr_reclaimed;

	unsigned long nr_reclaimed = sc->nr_reclaimed;

	unsigned long nr_to_reclaim = sc->nr_to_reclaim;

	unsigned long nr_to_reclaim = sc->nr_to_reclaim;

	struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(zone, sc);

	struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(zone, sc);

	int noswap = 0;





	/* If we have no swap space, do not bother scanning anon pages. */

	if (!sc->may_swap || (nr_swap_pages <= 0)) {

		noswap = 1;

		percent[0] = 0;

		percent[1] = 100;

	} else

	get_scan_ratio(zone, sc, percent);

	get_scan_ratio(zone, sc, percent);





	for_each_evictable_lru(l) {

	for_each_evictable_lru(l) {

		int file = is_file_lru(l);

		int file = is_file_lru(l);

		unsigned long scan;

		unsigned long scan;





		if (percent[file] == 0) {

			nr[l] = 0;

			continue;

		}



		scan = zone_nr_lru_pages(zone, sc, l);

		scan = zone_nr_lru_pages(zone, sc, l);

		if (priority || noswap) {

		if (priority) {

			scan >>= priority;

			scan >>= priority;

			scan = (scan * percent[file]) / 100;

			scan = (scan * percent[file]) / 100;

		}

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE