aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c64
-rw-r--r--mm/vmscan.c2
2 files changed, 32 insertions, 34 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index ab2ecbb95b8d..c7d78eca8363 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -166,9 +166,6 @@ struct mem_cgroup {
166 166
167 unsigned int swappiness; 167 unsigned int swappiness;
168 168
169
170 unsigned int inactive_ratio;
171
172 /* 169 /*
173 * statistics. This must be placed at the end of memcg. 170 * statistics. This must be placed at the end of memcg.
174 */ 171 */
@@ -432,15 +429,43 @@ void mem_cgroup_record_reclaim_priority(struct mem_cgroup *mem, int priority)
432 spin_unlock(&mem->reclaim_param_lock); 429 spin_unlock(&mem->reclaim_param_lock);
433} 430}
434 431
435int mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg, struct zone *zone) 432static int calc_inactive_ratio(struct mem_cgroup *memcg, unsigned long *present_pages)
436{ 433{
437 unsigned long active; 434 unsigned long active;
438 unsigned long inactive; 435 unsigned long inactive;
436 unsigned long gb;
437 unsigned long inactive_ratio;
439 438
440 inactive = mem_cgroup_get_all_zonestat(memcg, LRU_INACTIVE_ANON); 439 inactive = mem_cgroup_get_all_zonestat(memcg, LRU_INACTIVE_ANON);
441 active = mem_cgroup_get_all_zonestat(memcg, LRU_ACTIVE_ANON); 440 active = mem_cgroup_get_all_zonestat(memcg, LRU_ACTIVE_ANON);
442 441
443 if (inactive * memcg->inactive_ratio < active) 442 gb = (inactive + active) >> (30 - PAGE_SHIFT);
443 if (gb)
444 inactive_ratio = int_sqrt(10 * gb);
445 else
446 inactive_ratio = 1;
447
448 if (present_pages) {
449 present_pages[0] = inactive;
450 present_pages[1] = active;
451 }
452
453 return inactive_ratio;
454}
455
456int mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg)
457{
458 unsigned long active;
459 unsigned long inactive;
460 unsigned long present_pages[2];
461 unsigned long inactive_ratio;
462
463 inactive_ratio = calc_inactive_ratio(memcg, present_pages);
464
465 inactive = present_pages[0];
466 active = present_pages[1];
467
468 if (inactive * inactive_ratio < active)
444 return 1; 469 return 1;
445 470
446 return 0; 471 return 0;
@@ -1432,29 +1457,6 @@ int mem_cgroup_shrink_usage(struct mm_struct *mm, gfp_t gfp_mask)
1432 return 0; 1457 return 0;
1433} 1458}
1434 1459
1435/*
1436 * The inactive anon list should be small enough that the VM never has to
1437 * do too much work, but large enough that each inactive page has a chance
1438 * to be referenced again before it is swapped out.
1439 *
1440 * this calculation is straightforward porting from
1441 * page_alloc.c::setup_per_zone_inactive_ratio().
1442 * it describe more detail.
1443 */
1444static void mem_cgroup_set_inactive_ratio(struct mem_cgroup *memcg)
1445{
1446 unsigned int gb, ratio;
1447
1448 gb = res_counter_read_u64(&memcg->res, RES_LIMIT) >> 30;
1449 if (gb)
1450 ratio = int_sqrt(10 * gb);
1451 else
1452 ratio = 1;
1453
1454 memcg->inactive_ratio = ratio;
1455
1456}
1457
1458static DEFINE_MUTEX(set_limit_mutex); 1460static DEFINE_MUTEX(set_limit_mutex);
1459 1461
1460static int mem_cgroup_resize_limit(struct mem_cgroup *memcg, 1462static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
@@ -1496,9 +1498,6 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
1496 if (!progress) retry_count--; 1498 if (!progress) retry_count--;
1497 } 1499 }
1498 1500
1499 if (!ret)
1500 mem_cgroup_set_inactive_ratio(memcg);
1501
1502 return ret; 1501 return ret;
1503} 1502}
1504 1503
@@ -1858,7 +1857,7 @@ static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft,
1858 } 1857 }
1859 1858
1860#ifdef CONFIG_DEBUG_VM 1859#ifdef CONFIG_DEBUG_VM
1861 cb->fill(cb, "inactive_ratio", mem_cont->inactive_ratio); 1860 cb->fill(cb, "inactive_ratio", calc_inactive_ratio(mem_cont, NULL));
1862 1861
1863 { 1862 {
1864 int nid, zid; 1863 int nid, zid;
@@ -2150,7 +2149,6 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
2150 res_counter_init(&mem->res, NULL); 2149 res_counter_init(&mem->res, NULL);
2151 res_counter_init(&mem->memsw, NULL); 2150 res_counter_init(&mem->memsw, NULL);
2152 } 2151 }
2153 mem_cgroup_set_inactive_ratio(mem);
2154 mem->last_scanned_child = NULL; 2152 mem->last_scanned_child = NULL;
2155 spin_lock_init(&mem->reclaim_param_lock); 2153 spin_lock_init(&mem->reclaim_param_lock);
2156 2154
diff --git a/mm/vmscan.c b/mm/vmscan.c
index ece2f405187f..9a27c44aa327 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1340,7 +1340,7 @@ static int inactive_anon_is_low(struct zone *zone, struct scan_control *sc)
1340 if (scanning_global_lru(sc)) 1340 if (scanning_global_lru(sc))
1341 low = inactive_anon_is_low_global(zone); 1341 low = inactive_anon_is_low_global(zone);
1342 else 1342 else
1343 low = mem_cgroup_inactive_anon_is_low(sc->mem_cgroup, zone); 1343 low = mem_cgroup_inactive_anon_is_low(sc->mem_cgroup);
1344 return low; 1344 return low;
1345} 1345}
1346 1346