kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

memory controller: soft limit refactor reclaim flags

Browse source 
Refactor mem_cgroup_hierarchical_reclaim()

Refactor the arguments passed to mem_cgroup_hierarchical_reclaim() into
flags, so that new parameters don't have to be passed as we make the
reclaim routine more flexible

Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Li Zefan <lizf@cn.fujitsu.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:
Balbir Singh 2009-09-23 15:56:38 -07:00 committed by Linus Torvalds
parent f64c3f5494
commit 75822b4495
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
mm/memcontrol.c
View file

@ -252,6 +252,14 @@ enum charge_type {
#define MEMFILE_TYPE(val) (((val) >> 16) & 0xffff) #define MEMFILE_TYPE(val) (((val) >> 16) & 0xffff)
#define MEMFILE_ATTR(val) ((val) & 0xffff) #define MEMFILE_ATTR(val) ((val) & 0xffff)
/*
* Reclaim flags for mem_cgroup_hierarchical_reclaim
*/
#define MEM_CGROUP_RECLAIM_NOSWAP_BIT 0x0
#define MEM_CGROUP_RECLAIM_NOSWAP (1 << MEM_CGROUP_RECLAIM_NOSWAP_BIT)
#define MEM_CGROUP_RECLAIM_SHRINK_BIT 0x1
#define MEM_CGROUP_RECLAIM_SHRINK (1 << MEM_CGROUP_RECLAIM_SHRINK_BIT)
static void mem_cgroup_get(struct mem_cgroup *mem); static void mem_cgroup_get(struct mem_cgroup *mem);
static void mem_cgroup_put(struct mem_cgroup *mem); static void mem_cgroup_put(struct mem_cgroup *mem);
static struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *mem); static struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *mem);
@ -1029,11 +1037,14 @@ mem_cgroup_select_victim(struct mem_cgroup *root_mem)
* If shrink==true, for avoiding to free too much, this returns immedieately. * If shrink==true, for avoiding to free too much, this returns immedieately.
*/ */
static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem, static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem,
gfp_t gfp_mask, bool noswap, bool shrink) gfp_t gfp_mask,
unsigned long reclaim_options)
{ {
struct mem_cgroup *victim; struct mem_cgroup *victim;
int ret, total = 0; int ret, total = 0;
int loop = 0; int loop = 0;
bool noswap = reclaim_options & MEM_CGROUP_RECLAIM_NOSWAP;
bool shrink = reclaim_options & MEM_CGROUP_RECLAIM_SHRINK;
/* If memsw_is_minimum==1, swap-out is of-no-use. */ /* If memsw_is_minimum==1, swap-out is of-no-use. */
if (root_mem->memsw_is_minimum) if (root_mem->memsw_is_minimum)
@ -1171,7 +1182,7 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
while (1) { while (1) {
int ret; int ret;
bool noswap = false; unsigned long flags = 0;
ret = res_counter_charge(&mem->res, PAGE_SIZE, &fail_res, ret = res_counter_charge(&mem->res, PAGE_SIZE, &fail_res,
&soft_fail_res); &soft_fail_res);
@ -1184,7 +1195,7 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
break; break;
/* mem+swap counter fails */ /* mem+swap counter fails */
res_counter_uncharge(&mem->res, PAGE_SIZE, NULL); res_counter_uncharge(&mem->res, PAGE_SIZE, NULL);
noswap = true; flags |= MEM_CGROUP_RECLAIM_NOSWAP;
mem_over_limit = mem_cgroup_from_res_counter(fail_res, mem_over_limit = mem_cgroup_from_res_counter(fail_res,
memsw); memsw);
} else } else
@ -1196,7 +1207,7 @@ static int __mem_cgroup_try_charge(struct mm_struct *mm,
goto nomem; goto nomem;
ret = mem_cgroup_hierarchical_reclaim(mem_over_limit, gfp_mask, ret = mem_cgroup_hierarchical_reclaim(mem_over_limit, gfp_mask,
noswap, false); flags);
if (ret) if (ret)
continue; continue;
@ -2008,7 +2019,7 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
break; break;
progress = mem_cgroup_hierarchical_reclaim(memcg, GFP_KERNEL, progress = mem_cgroup_hierarchical_reclaim(memcg, GFP_KERNEL,
false, true); MEM_CGROUP_RECLAIM_SHRINK);
curusage = res_counter_read_u64(&memcg->res, RES_USAGE); curusage = res_counter_read_u64(&memcg->res, RES_USAGE);
/* Usage is reduced ? */ /* Usage is reduced ? */
if (curusage >= oldusage) if (curusage >= oldusage)
@ -2060,7 +2071,9 @@ static int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg,
if (!ret) if (!ret)
break; break;
mem_cgroup_hierarchical_reclaim(memcg, GFP_KERNEL, true, true); mem_cgroup_hierarchical_reclaim(memcg, GFP_KERNEL,
MEM_CGROUP_RECLAIM_NOSWAP |
MEM_CGROUP_RECLAIM_SHRINK);
curusage = res_counter_read_u64(&memcg->memsw, RES_USAGE); curusage = res_counter_read_u64(&memcg->memsw, RES_USAGE);
/* Usage is reduced ? */ /* Usage is reduced ? */
if (curusage >= oldusage) if (curusage >= oldusage)