From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759666AbZC0FFm (ORCPT ); Fri, 27 Mar 2009 01:05:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756451AbZC0FFU (ORCPT ); Fri, 27 Mar 2009 01:05:20 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:40510 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758593AbZC0FFS (ORCPT ); Fri, 27 Mar 2009 01:05:18 -0400 Date: Fri, 27 Mar 2009 14:03:46 +0900 From: KAMEZAWA Hiroyuki To: KAMEZAWA Hiroyuki Cc: "linux-kernel@vger.kernel.org" , "linux-mm@kvack.org" , "balbir@linux.vnet.ibm.com" , "kosaki.motohiro@jp.fujitsu.com" , "nishimura@mxp.nes.nec.co.jp" Subject: [RFC][PATCH 2/8] soft limit framework in memcg. Message-Id: <20090327140346.8d27b69a.kamezawa.hiroyu@jp.fujitsu.com> In-Reply-To: <20090327135933.789729cb.kamezawa.hiroyu@jp.fujitsu.com> References: <20090327135933.789729cb.kamezawa.hiroyu@jp.fujitsu.com> Organization: FUJITSU Co. LTD. X-Mailer: Sylpheed 2.5.0 (GTK+ 2.10.14; i686-pc-mingw32) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: KAMEZAWA Hiroyuki Add minimal modification for soft limit to res_counter_charge() and memcontol.c Based on Balbir Singh 's work but most of features are removed. (dropped or moved to later patch.) This is for building a frame to implement soft limit handler in memcg. - Checks soft limit status at every charge. - Adds mem_cgroup_soft_limit_check() as a function to detect we need check now or not. - mem_cgroup_update_soft_limit() is a function for updates internal status of soft limit controller of memcg. - This has no hooks in uncharge path. (see later patch.) Signed-off-by: KAMEZAWA Hiroyuki --- Index: mmotm-2.6.29-Mar23/include/linux/res_counter.h =================================================================== --- mmotm-2.6.29-Mar23.orig/include/linux/res_counter.h +++ mmotm-2.6.29-Mar23/include/linux/res_counter.h @@ -112,7 +112,8 @@ void res_counter_init(struct res_counter int __must_check res_counter_charge_locked(struct res_counter *counter, unsigned long val); int __must_check res_counter_charge(struct res_counter *counter, - unsigned long val, struct res_counter **limit_fail_at); + unsigned long val, struct res_counter **limit_fail_at, + bool *soft_limit_failure); /* * uncharge - tell that some portion of the resource is released Index: mmotm-2.6.29-Mar23/kernel/res_counter.c =================================================================== --- mmotm-2.6.29-Mar23.orig/kernel/res_counter.c +++ mmotm-2.6.29-Mar23/kernel/res_counter.c @@ -37,9 +37,11 @@ int res_counter_charge_locked(struct res } int res_counter_charge(struct res_counter *counter, unsigned long val, - struct res_counter **limit_fail_at) + struct res_counter **limit_fail_at, + bool *soft_limit_failure) { int ret; + int soft_cnt = 0; unsigned long flags; struct res_counter *c, *u; @@ -48,6 +50,8 @@ int res_counter_charge(struct res_counte for (c = counter; c != NULL; c = c->parent) { spin_lock(&c->lock); ret = res_counter_charge_locked(c, val); + if (!res_counter_soft_limit_check_locked(c)) + soft_cnt += 1; spin_unlock(&c->lock); if (ret < 0) { *limit_fail_at = c; @@ -55,6 +59,12 @@ int res_counter_charge(struct res_counte } } ret = 0; + if (soft_limit_failure) { + if (!soft_cnt) + *soft_limit_failure = false; + else + *soft_limit_failure = true; + } goto done; undo: for (u = counter; u != c; u = u->parent) { Index: mmotm-2.6.29-Mar23/mm/memcontrol.c =================================================================== --- mmotm-2.6.29-Mar23.orig/mm/memcontrol.c +++ mmotm-2.6.29-Mar23/mm/memcontrol.c @@ -897,6 +897,15 @@ static void record_last_oom(struct mem_c mem_cgroup_walk_tree(mem, NULL, record_last_oom_cb); } +static bool mem_cgroup_soft_limit_check(struct mem_cgroup *mem) +{ + return false; +} + +static void mem_cgroup_update_soft_limit(struct mem_cgroup *mem) +{ + return; +} /* * Unlike exported interface, "oom" parameter is added. if oom==true, @@ -909,6 +918,7 @@ static int __mem_cgroup_try_charge(struc struct mem_cgroup *mem, *mem_over_limit; int nr_retries = MEM_CGROUP_RECLAIM_RETRIES; struct res_counter *fail_res; + bool soft_fail; if (unlikely(test_thread_flag(TIF_MEMDIE))) { /* Don't account this! */ @@ -938,12 +948,13 @@ static int __mem_cgroup_try_charge(struc int ret; bool noswap = false; - ret = res_counter_charge(&mem->res, PAGE_SIZE, &fail_res); + ret = res_counter_charge(&mem->res, PAGE_SIZE, &fail_res, + &soft_fail); if (likely(!ret)) { if (!do_swap_account) break; ret = res_counter_charge(&mem->memsw, PAGE_SIZE, - &fail_res); + &fail_res, NULL); if (likely(!ret)) break; /* mem+swap counter fails */ @@ -985,6 +996,10 @@ static int __mem_cgroup_try_charge(struc goto nomem; } } + + if (soft_fail && mem_cgroup_soft_limit_check(mem)) + mem_cgroup_update_soft_limit(mem); + return 0; nomem: css_put(&mem->css); @@ -2409,6 +2424,7 @@ static void __mem_cgroup_free(struct mem { int node; + mem_cgroup_update_soft_limit(mem); free_css_id(&mem_cgroup_subsys, &mem->css); for_each_node_state(node, N_POSSIBLE)