aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-04-29 04:00:21 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-29 11:06:10 -0400
commit29f2a4dac856e9433a502b05b40e8e90385d8e27 (patch)
tree242772a246a6a5170ed5183d3fe3944a6f36a169 /mm
parent85cc59db12724e1248f5e4841e61339cf485d5c7 (diff)
memcgroup: implement failcounter reset
This is a very common requirement from people using the resource accounting facilities (not only memcgroup but also OpenVZ beancounters). They want to put the cgroup in an initial state without re-creating it. For example after re-configuring a group people want to observe how this new configuration fits the group needs without saving the previous failcnt value. Merge two resets into one mem_cgroup_reset() function to demonstrate how multiplexing work. Besides, I have plans to move the files, that correspond to res_counter to the res_counter.c file and somehow "import" them into controller. I don't know how to make it gracefully yet, but merging resets of max_usage and failcnt in one function will be there for sure. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: Balbir Singh <balbir@in.ibm.com> Cc: Paul Menage <menage@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index dc3472f9f68c..f891876efee1 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -857,12 +857,19 @@ static ssize_t mem_cgroup_write(struct cgroup *cont, struct cftype *cft,
857 mem_cgroup_write_strategy); 857 mem_cgroup_write_strategy);
858} 858}
859 859
860static int mem_cgroup_max_reset(struct cgroup *cont, unsigned int event) 860static int mem_cgroup_reset(struct cgroup *cont, unsigned int event)
861{ 861{
862 struct mem_cgroup *mem; 862 struct mem_cgroup *mem;
863 863
864 mem = mem_cgroup_from_cont(cont); 864 mem = mem_cgroup_from_cont(cont);
865 res_counter_reset_max(&mem->res); 865 switch (event) {
866 case RES_MAX_USAGE:
867 res_counter_reset_max(&mem->res);
868 break;
869 case RES_FAILCNT:
870 res_counter_reset_failcnt(&mem->res);
871 break;
872 }
866 return 0; 873 return 0;
867} 874}
868 875
@@ -916,7 +923,7 @@ static struct cftype mem_cgroup_files[] = {
916 { 923 {
917 .name = "max_usage_in_bytes", 924 .name = "max_usage_in_bytes",
918 .private = RES_MAX_USAGE, 925 .private = RES_MAX_USAGE,
919 .trigger = mem_cgroup_max_reset, 926 .trigger = mem_cgroup_reset,
920 .read_u64 = mem_cgroup_read, 927 .read_u64 = mem_cgroup_read,
921 }, 928 },
922 { 929 {
@@ -928,6 +935,7 @@ static struct cftype mem_cgroup_files[] = {
928 { 935 {
929 .name = "failcnt", 936 .name = "failcnt",
930 .private = RES_FAILCNT, 937 .private = RES_FAILCNT,
938 .trigger = mem_cgroup_reset,
931 .read_u64 = mem_cgroup_read, 939 .read_u64 = mem_cgroup_read,
932 }, 940 },
933 { 941 {