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

mm: memcontrol: use "max" instead of "infinity" in control knobs

Browse source 
The memcg control knobs indicate the highest possible value using the
symbolic name "infinity", which is long and awkward to type.

Switch to the string "max", which is just as descriptive but shorter and
sweeter.

This changes a user interface, so do it before the release and before
the development flag is dropped from the default hierarchy.

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Tejun Heo <tj@kernel.org>
Cc: Vladimir Davydov <vdavydov@parallels.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Johannes Weiner 2015-02-27 15:52:04 -08:00 committed by Linus Torvalds
parent 2ea55a2cae
commit d2973697b3
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/cgroups/unified-hierarchy.txt
View file

@ -404,8 +404,8 @@ supported and the interface files "release_agent" and
be understood as an underflow into the highest possible value, -2 or be understood as an underflow into the highest possible value, -2 or
-10M etc. do not work, so it's not consistent. -10M etc. do not work, so it's not consistent.
memory.low, memory.high, and memory.max will use the string memory.low, memory.high, and memory.max will use the string "max" to
"infinity" to indicate and set the highest possible value. indicate and set the highest possible value.
5. Planned Changes 5. Planned Changes

12
mm/memcontrol.c
View file

@ -5247,7 +5247,7 @@ static int memory_low_show(struct seq_file *m, void *v)
unsigned long low = ACCESS_ONCE(memcg->low); unsigned long low = ACCESS_ONCE(memcg->low);
if (low == PAGE_COUNTER_MAX) if (low == PAGE_COUNTER_MAX)
seq_puts(m, "infinity\n"); seq_puts(m, "max\n");
else else
seq_printf(m, "%llu\n", (u64)low * PAGE_SIZE); seq_printf(m, "%llu\n", (u64)low * PAGE_SIZE);
@ -5262,7 +5262,7 @@ static ssize_t memory_low_write(struct kernfs_open_file *of,
int err; int err;
buf = strstrip(buf); buf = strstrip(buf);
err = page_counter_memparse(buf, "infinity", &low); err = page_counter_memparse(buf, "max", &low);
if (err) if (err)
return err; return err;
@ -5277,7 +5277,7 @@ static int memory_high_show(struct seq_file *m, void *v)
unsigned long high = ACCESS_ONCE(memcg->high); unsigned long high = ACCESS_ONCE(memcg->high);
if (high == PAGE_COUNTER_MAX) if (high == PAGE_COUNTER_MAX)
seq_puts(m, "infinity\n"); seq_puts(m, "max\n");
else else
seq_printf(m, "%llu\n", (u64)high * PAGE_SIZE); seq_printf(m, "%llu\n", (u64)high * PAGE_SIZE);
@ -5292,7 +5292,7 @@ static ssize_t memory_high_write(struct kernfs_open_file *of,
int err; int err;
buf = strstrip(buf); buf = strstrip(buf);
err = page_counter_memparse(buf, "infinity", &high); err = page_counter_memparse(buf, "max", &high);
if (err) if (err)
return err; return err;
@ -5307,7 +5307,7 @@ static int memory_max_show(struct seq_file *m, void *v)
unsigned long max = ACCESS_ONCE(memcg->memory.limit); unsigned long max = ACCESS_ONCE(memcg->memory.limit);
if (max == PAGE_COUNTER_MAX) if (max == PAGE_COUNTER_MAX)
seq_puts(m, "infinity\n"); seq_puts(m, "max\n");
else else
seq_printf(m, "%llu\n", (u64)max * PAGE_SIZE); seq_printf(m, "%llu\n", (u64)max * PAGE_SIZE);
@ -5322,7 +5322,7 @@ static ssize_t memory_max_write(struct kernfs_open_file *of,
int err; int err;
buf = strstrip(buf); buf = strstrip(buf);
err = page_counter_memparse(buf, "infinity", &max); err = page_counter_memparse(buf, "max", &max);
if (err) if (err)
return err; return err;