adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

memcg: add interface to reset limits

Browse source 
We don't have an interface to reset mem.limit or memsw.limit now.

This patch allows to reset mem.limit or memsw.limit when they are being
set to -1.

Signed-off-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Dhaval Giani <dhaval@linux.vnet.ibm.com>
Cc: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Daisuke Nishimura 2009-06-17 16:27:20 -07:00 committed by Linus Torvalds
parent 22a668d7c3
commit c5b947b288
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Documentation/cgroups/memory.txt
View file

@ -209,6 +209,7 @@ We can alter the memory limit:
NOTE: We can use a suffix (k, K, m, M, g or G) to indicate values in kilo, NOTE: We can use a suffix (k, K, m, M, g or G) to indicate values in kilo,
mega or gigabytes. mega or gigabytes.
NOTE: We can write "-1" to reset the *.limit_in_bytes(unlimited).
# cat /cgroups/0/memory.limit_in_bytes # cat /cgroups/0/memory.limit_in_bytes
4194304 4194304

2
include/linux/res_counter.h
View file

@ -49,6 +49,8 @@ struct res_counter {
struct res_counter *parent; struct res_counter *parent;
}; };
#define RESOURCE_MAX (unsigned long long)LLONG_MAX
/** /**
* Helpers to interact with userspace * Helpers to interact with userspace
* res_counter_read_u64() - returns the value of the specified member. * res_counter_read_u64() - returns the value of the specified member.

12
kernel/res_counter.c
View file

@ -18,7 +18,7 @@
void res_counter_init(struct res_counter *counter, struct res_counter *parent) void res_counter_init(struct res_counter *counter, struct res_counter *parent)
{ {
spin_lock_init(&counter->lock); spin_lock_init(&counter->lock);
counter->limit = (unsigned long long)LLONG_MAX; counter->limit = RESOURCE_MAX;
counter->parent = parent; counter->parent = parent;
} }
@ -133,6 +133,16 @@ int res_counter_memparse_write_strategy(const char *buf,
unsigned long long *res) unsigned long long *res)
{ {
char *end; char *end;
/* return RESOURCE_MAX(unlimited) if "-1" is specified */
if (*buf == '-') {
*res = simple_strtoull(buf + 1, &end, 10);
if (*res != 1 || *end != '\0')
return -EINVAL;
*res = RESOURCE_MAX;
return 0;
}
/* FIXME - make memparse() take const char* args */ /* FIXME - make memparse() take const char* args */
*res = memparse((char *)buf, &end); *res = memparse((char *)buf, &end);
if (*end != '\0') if (*end != '\0')