memcg: add inactive_anon_is_low()
The inactive_anon_is_low() is key component of active/inactive anon balancing on reclaim. However current inactive_anon_is_low() function only consider global reclaim. Therefore, we need following ugly scan_global_lru() condition. if (lru == LRU_ACTIVE_ANON && (!scan_global_lru(sc) || inactive_anon_is_low(zone))) { shrink_active_list(nr_to_scan, zone, sc, priority, file); return 0; it cause that memcg reclaim always deactivate pages when shrink_list() is called. To make mem_cgroup_inactive_anon_is_low() improve active/inactive anon balancing of memcgroup. Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Rik van Riel <riel@redhat.com> Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Cc: Cyrill Gorcunov <gorcunov@gmail.com> Cc: "Pekka Enberg" <penberg@cs.helsinki.fi> Cc: Balbir Singh <balbir@in.ibm.com> Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Cc: Hugh Dickins <hugh@veritas.com> Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
549927620b
commit
14797e2363
37
mm/vmscan.c
37
mm/vmscan.c
@@ -1310,14 +1310,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
|
||||
pagevec_release(&pvec);
|
||||
}
|
||||
|
||||
/**
|
||||
* inactive_anon_is_low - check if anonymous pages need to be deactivated
|
||||
* @zone: zone to check
|
||||
*
|
||||
* Returns true if the zone does not have enough inactive anon pages,
|
||||
* meaning some active anon pages need to be deactivated.
|
||||
*/
|
||||
static int inactive_anon_is_low(struct zone *zone)
|
||||
static int inactive_anon_is_low_global(struct zone *zone)
|
||||
{
|
||||
unsigned long active, inactive;
|
||||
|
||||
@@ -1330,6 +1323,25 @@ static int inactive_anon_is_low(struct zone *zone)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* inactive_anon_is_low - check if anonymous pages need to be deactivated
|
||||
* @zone: zone to check
|
||||
* @sc: scan control of this context
|
||||
*
|
||||
* Returns true if the zone does not have enough inactive anon pages,
|
||||
* meaning some active anon pages need to be deactivated.
|
||||
*/
|
||||
static int inactive_anon_is_low(struct zone *zone, struct scan_control *sc)
|
||||
{
|
||||
int low;
|
||||
|
||||
if (scan_global_lru(sc))
|
||||
low = inactive_anon_is_low_global(zone);
|
||||
else
|
||||
low = mem_cgroup_inactive_anon_is_low(sc->mem_cgroup, zone);
|
||||
return low;
|
||||
}
|
||||
|
||||
static unsigned long shrink_list(enum lru_list lru, unsigned long nr_to_scan,
|
||||
struct zone *zone, struct scan_control *sc, int priority)
|
||||
{
|
||||
@@ -1340,8 +1352,7 @@ static unsigned long shrink_list(enum lru_list lru, unsigned long nr_to_scan,
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (lru == LRU_ACTIVE_ANON &&
|
||||
(!scan_global_lru(sc) || inactive_anon_is_low(zone))) {
|
||||
if (lru == LRU_ACTIVE_ANON && inactive_anon_is_low(zone, sc)) {
|
||||
shrink_active_list(nr_to_scan, zone, sc, priority, file);
|
||||
return 0;
|
||||
}
|
||||
@@ -1509,9 +1520,7 @@ static void shrink_zone(int priority, struct zone *zone,
|
||||
* Even if we did not try to evict anon pages at all, we want to
|
||||
* rebalance the anon lru active/inactive ratio.
|
||||
*/
|
||||
if (!scan_global_lru(sc) || inactive_anon_is_low(zone))
|
||||
shrink_active_list(SWAP_CLUSTER_MAX, zone, sc, priority, 0);
|
||||
else if (!scan_global_lru(sc))
|
||||
if (inactive_anon_is_low(zone, sc))
|
||||
shrink_active_list(SWAP_CLUSTER_MAX, zone, sc, priority, 0);
|
||||
|
||||
throttle_vm_writeout(sc->gfp_mask);
|
||||
@@ -1807,7 +1816,7 @@ loop_again:
|
||||
* Do some background aging of the anon list, to give
|
||||
* pages a chance to be referenced before reclaiming.
|
||||
*/
|
||||
if (inactive_anon_is_low(zone))
|
||||
if (inactive_anon_is_low(zone, &sc))
|
||||
shrink_active_list(SWAP_CLUSTER_MAX, zone,
|
||||
&sc, priority, 0);
|
||||
|
||||
|
Reference in New Issue
Block a user