redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

mm: page_counter: let page_counter_try_charge() return bool 

page_counter_try_charge() currently returns 0 on success and -ENOMEM on
failure, which is surprising behavior given the function name.

Make it follow the expected pattern of try_stuff() functions that return a
boolean true to indicate success, or false for failure.

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Vladimir Davydov <vdavydov@virtuozzo.com
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
hifive-unleashed-5.1
Johannes Weiner 2015-11-05 18:50:26 -08:00 committed by Linus Torvalds
parent f5fc3c5d81
commit 6071ca5201
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/page_counter.h
View File

@ -36,9 +36,9 @@ static inline unsigned long page_counter_read(struct page_counter *counter)
void page_counter_cancel(struct page_counter *counter, unsigned long nr_pages); void page_counter_cancel(struct page_counter *counter, unsigned long nr_pages);
void page_counter_charge(struct page_counter *counter, unsigned long nr_pages); void page_counter_charge(struct page_counter *counter, unsigned long nr_pages);
int page_counter_try_charge(struct page_counter *counter, bool page_counter_try_charge(struct page_counter *counter,
unsigned long nr_pages, unsigned long nr_pages,
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, const char *max, int page_counter_memparse(const char *buf, const char *max,

3
mm/hugetlb_cgroup.c
View File

@ -186,7 +186,8 @@ again:
} }
rcu_read_unlock(); rcu_read_unlock();
ret = page_counter_try_charge(&h_cg->hugepage[idx], nr_pages, &counter); if (!page_counter_try_charge(&h_cg->hugepage[idx], nr_pages, &counter))
ret = -ENOMEM;
css_put(&h_cg->css); css_put(&h_cg->css);
done: done:
*ptr = h_cg; *ptr = h_cg;

11
mm/memcontrol.c
View File

@ -2016,8 +2016,8 @@ retry:
return 0; return 0;
if (!do_swap_account || if (!do_swap_account ||
!page_counter_try_charge(&memcg->memsw, batch, &counter)) { page_counter_try_charge(&memcg->memsw, batch, &counter)) {
if (!page_counter_try_charge(&memcg->memory, batch, &counter)) if (page_counter_try_charge(&memcg->memory, batch, &counter))
goto done_restock; goto done_restock;
if (do_swap_account) if (do_swap_account)
page_counter_uncharge(&memcg->memsw, batch); page_counter_uncharge(&memcg->memsw, batch);
@ -2381,14 +2381,13 @@ int __memcg_kmem_charge_memcg(struct page *page, gfp_t gfp, int order,
{ {
unsigned int nr_pages = 1 << order; unsigned int nr_pages = 1 << order;
struct page_counter *counter; struct page_counter *counter;
int ret = 0; int ret;
if (!memcg_kmem_is_active(memcg)) if (!memcg_kmem_is_active(memcg))
return 0; return 0;
ret = page_counter_try_charge(&memcg->kmem, nr_pages, &counter); if (!page_counter_try_charge(&memcg->kmem, nr_pages, &counter))
if (ret) return -ENOMEM;
return ret;
ret = try_charge(memcg, gfp, nr_pages); ret = try_charge(memcg, gfp, nr_pages);
if (ret) { if (ret) {

14
mm/page_counter.c
View File

@ -56,12 +56,12 @@ void page_counter_charge(struct page_counter *counter, unsigned long nr_pages)
* @nr_pages: number of pages to charge * @nr_pages: number of pages to charge
* @fail: points first counter to hit its limit, if any * @fail: points first counter to hit its limit, if any
* *
* Returns 0 on success, or -ENOMEM and @fail if the counter or one of * Returns %true on success, or %false and @fail if the counter or one
* its ancestors has hit its configured limit. * of its ancestors has hit its configured limit.
*/ */
int page_counter_try_charge(struct page_counter *counter, bool page_counter_try_charge(struct page_counter *counter,
unsigned long nr_pages, unsigned long nr_pages,
struct page_counter **fail) struct page_counter **fail)
{ {
struct page_counter *c; struct page_counter *c;
@ -99,13 +99,13 @@ int page_counter_try_charge(struct page_counter *counter,
if (new > c->watermark) if (new > c->watermark)
c->watermark = new; c->watermark = new;
} }
return 0; return true;
failed: failed:
for (c = counter; c != *fail; c = c->parent) for (c = counter; c != *fail; c = c->parent)
page_counter_cancel(c, nr_pages); page_counter_cancel(c, nr_pages);
return -ENOMEM; return false;
} }
/** /**