Commit 650c5e56 authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: page_counter: pull "-1" handling out of page_counter_memparse()



The unified hierarchy interface for memory cgroups will no longer use "-1"
to mean maximum possible resource value.  In preparation for this, make
the string an argument and let the caller supply it.
Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Cc: Vladimir Davydov <vdavydov@parallels.com>
Cc: Greg Thelen <gthelen@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8d29e18a
...@@ -41,7 +41,8 @@ int page_counter_try_charge(struct page_counter *counter, ...@@ -41,7 +41,8 @@ int page_counter_try_charge(struct page_counter *counter,
struct page_counter **fail); struct page_counter **fail);
void page_counter_uncharge(struct page_counter *counter, unsigned long nr_pages); void page_counter_uncharge(struct page_counter *counter, unsigned long nr_pages);
int page_counter_limit(struct page_counter *counter, unsigned long limit); int page_counter_limit(struct page_counter *counter, unsigned long limit);
int page_counter_memparse(const char *buf, unsigned long *nr_pages); int page_counter_memparse(const char *buf, const char *max,
unsigned long *nr_pages);
static inline void page_counter_reset_watermark(struct page_counter *counter) static inline void page_counter_reset_watermark(struct page_counter *counter)
{ {
......
...@@ -279,7 +279,7 @@ static ssize_t hugetlb_cgroup_write(struct kernfs_open_file *of, ...@@ -279,7 +279,7 @@ static ssize_t hugetlb_cgroup_write(struct kernfs_open_file *of,
return -EINVAL; return -EINVAL;
buf = strstrip(buf); buf = strstrip(buf);
ret = page_counter_memparse(buf, &nr_pages); ret = page_counter_memparse(buf, "-1", &nr_pages);
if (ret) if (ret)
return ret; return ret;
......
...@@ -3414,7 +3414,7 @@ static ssize_t mem_cgroup_write(struct kernfs_open_file *of, ...@@ -3414,7 +3414,7 @@ static ssize_t mem_cgroup_write(struct kernfs_open_file *of,
int ret; int ret;
buf = strstrip(buf); buf = strstrip(buf);
ret = page_counter_memparse(buf, &nr_pages); ret = page_counter_memparse(buf, "-1", &nr_pages);
if (ret) if (ret)
return ret; return ret;
...@@ -3786,7 +3786,7 @@ static int __mem_cgroup_usage_register_event(struct mem_cgroup *memcg, ...@@ -3786,7 +3786,7 @@ static int __mem_cgroup_usage_register_event(struct mem_cgroup *memcg,
unsigned long usage; unsigned long usage;
int i, size, ret; int i, size, ret;
ret = page_counter_memparse(args, &threshold); ret = page_counter_memparse(args, "-1", &threshold);
if (ret) if (ret)
return ret; return ret;
......
...@@ -166,18 +166,19 @@ int page_counter_limit(struct page_counter *counter, unsigned long limit) ...@@ -166,18 +166,19 @@ int page_counter_limit(struct page_counter *counter, unsigned long limit)
/** /**
* page_counter_memparse - memparse() for page counter limits * page_counter_memparse - memparse() for page counter limits
* @buf: string to parse * @buf: string to parse
* @max: string meaning maximum possible value
* @nr_pages: returns the result in number of pages * @nr_pages: returns the result in number of pages
* *
* Returns -EINVAL, or 0 and @nr_pages on success. @nr_pages will be * Returns -EINVAL, or 0 and @nr_pages on success. @nr_pages will be
* limited to %PAGE_COUNTER_MAX. * limited to %PAGE_COUNTER_MAX.
*/ */
int page_counter_memparse(const char *buf, unsigned long *nr_pages) int page_counter_memparse(const char *buf, const char *max,
unsigned long *nr_pages)
{ {
char unlimited[] = "-1";
char *end; char *end;
u64 bytes; u64 bytes;
if (!strncmp(buf, unlimited, sizeof(unlimited))) { if (!strcmp(buf, max)) {
*nr_pages = PAGE_COUNTER_MAX; *nr_pages = PAGE_COUNTER_MAX;
return 0; return 0;
} }
......
...@@ -120,7 +120,7 @@ static ssize_t tcp_cgroup_write(struct kernfs_open_file *of, ...@@ -120,7 +120,7 @@ static ssize_t tcp_cgroup_write(struct kernfs_open_file *of,
switch (of_cft(of)->private) { switch (of_cft(of)->private) {
case RES_LIMIT: case RES_LIMIT:
/* see memcontrol.c */ /* see memcontrol.c */
ret = page_counter_memparse(buf, &nr_pages); ret = page_counter_memparse(buf, "-1", &nr_pages);
if (ret) if (ret)
break; break;
mutex_lock(&tcp_limit_mutex); mutex_lock(&tcp_limit_mutex);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment