Re: [PATCH] memcg: refactor mem_cgroup_resize_limit()

2017-06-04 Thread Yu Zhao 
On Fri, Jun 02, 2017 at 10:32:52AM +0300, Nikolay Borisov wrote:
> 
> 
> On  2.06.2017 02:02, Yu Zhao wrote:
> > mem_cgroup_resize_limit() and mem_cgroup_resize_memsw_limit() have
> > identical logics. Refactor code so we don't need to keep two pieces
> > of code that does same thing.
> > 
> > Signed-off-by: Yu Zhao 
> > ---
> >  mm/memcontrol.c | 71 
> > +
> >  1 file changed, 11 insertions(+), 60 deletions(-)
> > 
> > diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> > index 94172089f52f..a4f0daaff704 100644
> > --- a/mm/memcontrol.c
> > +++ b/mm/memcontrol.c
> > @@ -2422,13 +2422,14 @@ static inline int 
> > mem_cgroup_move_swap_account(swp_entry_t entry,
> >  static DEFINE_MUTEX(memcg_limit_mutex);
> >  
> >  static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
> > -  unsigned long limit)
> > +  unsigned long limit, bool memsw)
> >  {
> > unsigned long curusage;
> > unsigned long oldusage;
> > bool enlarge = false;
> > int retry_count;
> > int ret;
> > +   struct page_counter *counter = memsw ? >memsw : >memory;
> >  
> > /*
> >  * For keeping hierarchical_reclaim simple, how long we should retry
> > @@ -2438,58 +2439,7 @@ static int mem_cgroup_resize_limit(struct mem_cgroup 
> > *memcg,
> > retry_count = MEM_CGROUP_RECLAIM_RETRIES *
> >   mem_cgroup_count_children(memcg);
> >  
> > -   oldusage = page_counter_read(>memory);
> > -
> > -   do {
> > -   if (signal_pending(current)) {
> > -   ret = -EINTR;
> > -   break;
> > -   }
> > -
> > -   mutex_lock(_limit_mutex);
> > -   if (limit > memcg->memsw.limit) {
> > -   mutex_unlock(_limit_mutex);
> > -   ret = -EINVAL;
> > -   break;
> > -   }
> > -   if (limit > memcg->memory.limit)
> > -   enlarge = true;
> > -   ret = page_counter_limit(>memory, limit);
> > -   mutex_unlock(_limit_mutex);
> > -
> > -   if (!ret)
> > -   break;
> > -
> > -   try_to_free_mem_cgroup_pages(memcg, 1, GFP_KERNEL, true);
> > -
> > -   curusage = page_counter_read(>memory);
> > -   /* Usage is reduced ? */
> > -   if (curusage >= oldusage)
> > -   retry_count--;
> > -   else
> > -   oldusage = curusage;
> > -   } while (retry_count);
> > -
> > -   if (!ret && enlarge)
> > -   memcg_oom_recover(memcg);
> > -
> > -   return ret;
> > -}
> > -
> > -static int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg,
> > -unsigned long limit)
> > -{
> > -   unsigned long curusage;
> > -   unsigned long oldusage;
> > -   bool enlarge = false;
> > -   int retry_count;
> > -   int ret;
> > -
> > -   /* see mem_cgroup_resize_res_limit */
> > -   retry_count = MEM_CGROUP_RECLAIM_RETRIES *
> > - mem_cgroup_count_children(memcg);
> > -
> > -   oldusage = page_counter_read(>memsw);
> > +   oldusage = page_counter_read(counter);
> >  
> > do {
> > if (signal_pending(current)) {
> > @@ -2498,22 +2448,23 @@ static int mem_cgroup_resize_memsw_limit(struct 
> > mem_cgroup *memcg,
> > }
> >  
> > mutex_lock(_limit_mutex);
> > -   if (limit < memcg->memory.limit) {
> > +   if (memsw ? limit < memcg->memory.limit :
> > +   limit > memcg->memsw.limit) {
> 
> No, just no. Please createa a local variable and use that. Using the
> ternary operator in an 'if' statement is just ugly!

Thanks. It is uncommon but seems no aesthetic difference to me. I'll
replace it with an extra variable and resend the patch.

Re: [PATCH] memcg: refactor mem_cgroup_resize_limit()

2017-06-04 Thread Yu Zhao 
On Fri, Jun 02, 2017 at 10:32:52AM +0300, Nikolay Borisov wrote:
> 
> 
> On  2.06.2017 02:02, Yu Zhao wrote:
> > mem_cgroup_resize_limit() and mem_cgroup_resize_memsw_limit() have
> > identical logics. Refactor code so we don't need to keep two pieces
> > of code that does same thing.
> > 
> > Signed-off-by: Yu Zhao 
> > ---
> >  mm/memcontrol.c | 71 
> > +
> >  1 file changed, 11 insertions(+), 60 deletions(-)
> > 
> > diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> > index 94172089f52f..a4f0daaff704 100644
> > --- a/mm/memcontrol.c
> > +++ b/mm/memcontrol.c
> > @@ -2422,13 +2422,14 @@ static inline int 
> > mem_cgroup_move_swap_account(swp_entry_t entry,
> >  static DEFINE_MUTEX(memcg_limit_mutex);
> >  
> >  static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
> > -  unsigned long limit)
> > +  unsigned long limit, bool memsw)
> >  {
> > unsigned long curusage;
> > unsigned long oldusage;
> > bool enlarge = false;
> > int retry_count;
> > int ret;
> > +   struct page_counter *counter = memsw ? >memsw : >memory;
> >  
> > /*
> >  * For keeping hierarchical_reclaim simple, how long we should retry
> > @@ -2438,58 +2439,7 @@ static int mem_cgroup_resize_limit(struct mem_cgroup 
> > *memcg,
> > retry_count = MEM_CGROUP_RECLAIM_RETRIES *
> >   mem_cgroup_count_children(memcg);
> >  
> > -   oldusage = page_counter_read(>memory);
> > -
> > -   do {
> > -   if (signal_pending(current)) {
> > -   ret = -EINTR;
> > -   break;
> > -   }
> > -
> > -   mutex_lock(_limit_mutex);
> > -   if (limit > memcg->memsw.limit) {
> > -   mutex_unlock(_limit_mutex);
> > -   ret = -EINVAL;
> > -   break;
> > -   }
> > -   if (limit > memcg->memory.limit)
> > -   enlarge = true;
> > -   ret = page_counter_limit(>memory, limit);
> > -   mutex_unlock(_limit_mutex);
> > -
> > -   if (!ret)
> > -   break;
> > -
> > -   try_to_free_mem_cgroup_pages(memcg, 1, GFP_KERNEL, true);
> > -
> > -   curusage = page_counter_read(>memory);
> > -   /* Usage is reduced ? */
> > -   if (curusage >= oldusage)
> > -   retry_count--;
> > -   else
> > -   oldusage = curusage;
> > -   } while (retry_count);
> > -
> > -   if (!ret && enlarge)
> > -   memcg_oom_recover(memcg);
> > -
> > -   return ret;
> > -}
> > -
> > -static int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg,
> > -unsigned long limit)
> > -{
> > -   unsigned long curusage;
> > -   unsigned long oldusage;
> > -   bool enlarge = false;
> > -   int retry_count;
> > -   int ret;
> > -
> > -   /* see mem_cgroup_resize_res_limit */
> > -   retry_count = MEM_CGROUP_RECLAIM_RETRIES *
> > - mem_cgroup_count_children(memcg);
> > -
> > -   oldusage = page_counter_read(>memsw);
> > +   oldusage = page_counter_read(counter);
> >  
> > do {
> > if (signal_pending(current)) {
> > @@ -2498,22 +2448,23 @@ static int mem_cgroup_resize_memsw_limit(struct 
> > mem_cgroup *memcg,
> > }
> >  
> > mutex_lock(_limit_mutex);
> > -   if (limit < memcg->memory.limit) {
> > +   if (memsw ? limit < memcg->memory.limit :
> > +   limit > memcg->memsw.limit) {
> 
> No, just no. Please createa a local variable and use that. Using the
> ternary operator in an 'if' statement is just ugly!

Thanks. It is uncommon but seems no aesthetic difference to me. I'll
replace it with an extra variable and resend the patch.

Re: [PATCH] memcg: refactor mem_cgroup_resize_limit()

2017-06-03 Thread Vladimir Davydov 
On Thu, Jun 01, 2017 at 04:02:12PM -0700, Yu Zhao wrote:
> mem_cgroup_resize_limit() and mem_cgroup_resize_memsw_limit() have
> identical logics. Refactor code so we don't need to keep two pieces
> of code that does same thing.
> 
> Signed-off-by: Yu Zhao 
> ---
>  mm/memcontrol.c | 71 
> +
>  1 file changed, 11 insertions(+), 60 deletions(-)

Makes sense to me.

Acked-by: Vladimir Davydov

Re: [PATCH] memcg: refactor mem_cgroup_resize_limit()

2017-06-03 Thread Vladimir Davydov 
On Thu, Jun 01, 2017 at 04:02:12PM -0700, Yu Zhao wrote:
> mem_cgroup_resize_limit() and mem_cgroup_resize_memsw_limit() have
> identical logics. Refactor code so we don't need to keep two pieces
> of code that does same thing.
> 
> Signed-off-by: Yu Zhao 
> ---
>  mm/memcontrol.c | 71 
> +
>  1 file changed, 11 insertions(+), 60 deletions(-)

Makes sense to me.

Acked-by: Vladimir Davydov

Re: [PATCH] memcg: refactor mem_cgroup_resize_limit()

2017-06-02 Thread Nikolay Borisov 


On  2.06.2017 02:02, Yu Zhao wrote:
> mem_cgroup_resize_limit() and mem_cgroup_resize_memsw_limit() have
> identical logics. Refactor code so we don't need to keep two pieces
> of code that does same thing.
> 
> Signed-off-by: Yu Zhao 
> ---
>  mm/memcontrol.c | 71 
> +
>  1 file changed, 11 insertions(+), 60 deletions(-)
> 
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 94172089f52f..a4f0daaff704 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -2422,13 +2422,14 @@ static inline int 
> mem_cgroup_move_swap_account(swp_entry_t entry,
>  static DEFINE_MUTEX(memcg_limit_mutex);
>  
>  static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
> -unsigned long limit)
> +unsigned long limit, bool memsw)
>  {
>   unsigned long curusage;
>   unsigned long oldusage;
>   bool enlarge = false;
>   int retry_count;
>   int ret;
> + struct page_counter *counter = memsw ? >memsw : >memory;
>  
>   /*
>* For keeping hierarchical_reclaim simple, how long we should retry
> @@ -2438,58 +2439,7 @@ static int mem_cgroup_resize_limit(struct mem_cgroup 
> *memcg,
>   retry_count = MEM_CGROUP_RECLAIM_RETRIES *
> mem_cgroup_count_children(memcg);
>  
> - oldusage = page_counter_read(>memory);
> -
> - do {
> - if (signal_pending(current)) {
> - ret = -EINTR;
> - break;
> - }
> -
> - mutex_lock(_limit_mutex);
> - if (limit > memcg->memsw.limit) {
> - mutex_unlock(_limit_mutex);
> - ret = -EINVAL;
> - break;
> - }
> - if (limit > memcg->memory.limit)
> - enlarge = true;
> - ret = page_counter_limit(>memory, limit);
> - mutex_unlock(_limit_mutex);
> -
> - if (!ret)
> - break;
> -
> - try_to_free_mem_cgroup_pages(memcg, 1, GFP_KERNEL, true);
> -
> - curusage = page_counter_read(>memory);
> - /* Usage is reduced ? */
> - if (curusage >= oldusage)
> - retry_count--;
> - else
> - oldusage = curusage;
> - } while (retry_count);
> -
> - if (!ret && enlarge)
> - memcg_oom_recover(memcg);
> -
> - return ret;
> -}
> -
> -static int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg,
> -  unsigned long limit)
> -{
> - unsigned long curusage;
> - unsigned long oldusage;
> - bool enlarge = false;
> - int retry_count;
> - int ret;
> -
> - /* see mem_cgroup_resize_res_limit */
> - retry_count = MEM_CGROUP_RECLAIM_RETRIES *
> -   mem_cgroup_count_children(memcg);
> -
> - oldusage = page_counter_read(>memsw);
> + oldusage = page_counter_read(counter);
>  
>   do {
>   if (signal_pending(current)) {
> @@ -2498,22 +2448,23 @@ static int mem_cgroup_resize_memsw_limit(struct 
> mem_cgroup *memcg,
>   }
>  
>   mutex_lock(_limit_mutex);
> - if (limit < memcg->memory.limit) {
> + if (memsw ? limit < memcg->memory.limit :
> + limit > memcg->memsw.limit) {

No, just no. Please createa a local variable and use that. Using the
ternary operator in an 'if' statement is just ugly!

>   mutex_unlock(_limit_mutex);
>   ret = -EINVAL;
>   break;
>   }
> - if (limit > memcg->memsw.limit)
> + if (limit > counter->limit)
>   enlarge = true;
> - ret = page_counter_limit(>memsw, limit);
> + ret = page_counter_limit(counter, limit);
>   mutex_unlock(_limit_mutex);
>  
>   if (!ret)
>   break;
>  
> - try_to_free_mem_cgroup_pages(memcg, 1, GFP_KERNEL, false);
> + try_to_free_mem_cgroup_pages(memcg, 1, GFP_KERNEL, !memsw);
>  
> - curusage = page_counter_read(>memsw);
> + curusage = page_counter_read(counter);
>   /* Usage is reduced ? */
>   if (curusage >= oldusage)
>   retry_count--;
> @@ -2975,10 +2926,10 @@ static ssize_t mem_cgroup_write(struct 
> kernfs_open_file *of,
>   }
>   switch (MEMFILE_TYPE(of_cft(of)->private)) {
>   case _MEM:
> - ret = mem_cgroup_resize_limit(memcg, nr_pages);
> + ret = mem_cgroup_resize_limit(memcg, nr_pages, false);
>   break;
>   case _MEMSWAP:
> - ret = mem_cgroup_resize_memsw_limit(memcg, nr_pages);
> + ret = mem_cgroup_resize_limit(memcg,

Re: [PATCH] memcg: refactor mem_cgroup_resize_limit()

2017-06-02 Thread Nikolay Borisov 


On  2.06.2017 02:02, Yu Zhao wrote:
> mem_cgroup_resize_limit() and mem_cgroup_resize_memsw_limit() have
> identical logics. Refactor code so we don't need to keep two pieces
> of code that does same thing.
> 
> Signed-off-by: Yu Zhao 
> ---
>  mm/memcontrol.c | 71 
> +
>  1 file changed, 11 insertions(+), 60 deletions(-)
> 
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 94172089f52f..a4f0daaff704 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -2422,13 +2422,14 @@ static inline int 
> mem_cgroup_move_swap_account(swp_entry_t entry,
>  static DEFINE_MUTEX(memcg_limit_mutex);
>  
>  static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
> -unsigned long limit)
> +unsigned long limit, bool memsw)
>  {
>   unsigned long curusage;
>   unsigned long oldusage;
>   bool enlarge = false;
>   int retry_count;
>   int ret;
> + struct page_counter *counter = memsw ? >memsw : >memory;
>  
>   /*
>* For keeping hierarchical_reclaim simple, how long we should retry
> @@ -2438,58 +2439,7 @@ static int mem_cgroup_resize_limit(struct mem_cgroup 
> *memcg,
>   retry_count = MEM_CGROUP_RECLAIM_RETRIES *
> mem_cgroup_count_children(memcg);
>  
> - oldusage = page_counter_read(>memory);
> -
> - do {
> - if (signal_pending(current)) {
> - ret = -EINTR;
> - break;
> - }
> -
> - mutex_lock(_limit_mutex);
> - if (limit > memcg->memsw.limit) {
> - mutex_unlock(_limit_mutex);
> - ret = -EINVAL;
> - break;
> - }
> - if (limit > memcg->memory.limit)
> - enlarge = true;
> - ret = page_counter_limit(>memory, limit);
> - mutex_unlock(_limit_mutex);
> -
> - if (!ret)
> - break;
> -
> - try_to_free_mem_cgroup_pages(memcg, 1, GFP_KERNEL, true);
> -
> - curusage = page_counter_read(>memory);
> - /* Usage is reduced ? */
> - if (curusage >= oldusage)
> - retry_count--;
> - else
> - oldusage = curusage;
> - } while (retry_count);
> -
> - if (!ret && enlarge)
> - memcg_oom_recover(memcg);
> -
> - return ret;
> -}
> -
> -static int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg,
> -  unsigned long limit)
> -{
> - unsigned long curusage;
> - unsigned long oldusage;
> - bool enlarge = false;
> - int retry_count;
> - int ret;
> -
> - /* see mem_cgroup_resize_res_limit */
> - retry_count = MEM_CGROUP_RECLAIM_RETRIES *
> -   mem_cgroup_count_children(memcg);
> -
> - oldusage = page_counter_read(>memsw);
> + oldusage = page_counter_read(counter);
>  
>   do {
>   if (signal_pending(current)) {
> @@ -2498,22 +2448,23 @@ static int mem_cgroup_resize_memsw_limit(struct 
> mem_cgroup *memcg,
>   }
>  
>   mutex_lock(_limit_mutex);
> - if (limit < memcg->memory.limit) {
> + if (memsw ? limit < memcg->memory.limit :
> + limit > memcg->memsw.limit) {

No, just no. Please createa a local variable and use that. Using the
ternary operator in an 'if' statement is just ugly!

>   mutex_unlock(_limit_mutex);
>   ret = -EINVAL;
>   break;
>   }
> - if (limit > memcg->memsw.limit)
> + if (limit > counter->limit)
>   enlarge = true;
> - ret = page_counter_limit(>memsw, limit);
> + ret = page_counter_limit(counter, limit);
>   mutex_unlock(_limit_mutex);
>  
>   if (!ret)
>   break;
>  
> - try_to_free_mem_cgroup_pages(memcg, 1, GFP_KERNEL, false);
> + try_to_free_mem_cgroup_pages(memcg, 1, GFP_KERNEL, !memsw);
>  
> - curusage = page_counter_read(>memsw);
> + curusage = page_counter_read(counter);
>   /* Usage is reduced ? */
>   if (curusage >= oldusage)
>   retry_count--;
> @@ -2975,10 +2926,10 @@ static ssize_t mem_cgroup_write(struct 
> kernfs_open_file *of,
>   }
>   switch (MEMFILE_TYPE(of_cft(of)->private)) {
>   case _MEM:
> - ret = mem_cgroup_resize_limit(memcg, nr_pages);
> + ret = mem_cgroup_resize_limit(memcg, nr_pages, false);
>   break;
>   case _MEMSWAP:
> - ret = mem_cgroup_resize_memsw_limit(memcg, nr_pages);
> + ret = mem_cgroup_resize_limit(memcg, nr_pages, true);
>

[PATCH] memcg: refactor mem_cgroup_resize_limit()

2017-06-01 Thread Yu Zhao 
mem_cgroup_resize_limit() and mem_cgroup_resize_memsw_limit() have
identical logics. Refactor code so we don't need to keep two pieces
of code that does same thing.

Signed-off-by: Yu Zhao 
---
 mm/memcontrol.c | 71 +
 1 file changed, 11 insertions(+), 60 deletions(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 94172089f52f..a4f0daaff704 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2422,13 +2422,14 @@ static inline int 
mem_cgroup_move_swap_account(swp_entry_t entry,
 static DEFINE_MUTEX(memcg_limit_mutex);
 
 static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
-  unsigned long limit)
+  unsigned long limit, bool memsw)
 {
unsigned long curusage;
unsigned long oldusage;
bool enlarge = false;
int retry_count;
int ret;
+   struct page_counter *counter = memsw ? >memsw : >memory;
 
/*
 * For keeping hierarchical_reclaim simple, how long we should retry
@@ -2438,58 +2439,7 @@ static int mem_cgroup_resize_limit(struct mem_cgroup 
*memcg,
retry_count = MEM_CGROUP_RECLAIM_RETRIES *
  mem_cgroup_count_children(memcg);
 
-   oldusage = page_counter_read(>memory);
-
-   do {
-   if (signal_pending(current)) {
-   ret = -EINTR;
-   break;
-   }
-
-   mutex_lock(_limit_mutex);
-   if (limit > memcg->memsw.limit) {
-   mutex_unlock(_limit_mutex);
-   ret = -EINVAL;
-   break;
-   }
-   if (limit > memcg->memory.limit)
-   enlarge = true;
-   ret = page_counter_limit(>memory, limit);
-   mutex_unlock(_limit_mutex);
-
-   if (!ret)
-   break;
-
-   try_to_free_mem_cgroup_pages(memcg, 1, GFP_KERNEL, true);
-
-   curusage = page_counter_read(>memory);
-   /* Usage is reduced ? */
-   if (curusage >= oldusage)
-   retry_count--;
-   else
-   oldusage = curusage;
-   } while (retry_count);
-
-   if (!ret && enlarge)
-   memcg_oom_recover(memcg);
-
-   return ret;
-}
-
-static int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg,
-unsigned long limit)
-{
-   unsigned long curusage;
-   unsigned long oldusage;
-   bool enlarge = false;
-   int retry_count;
-   int ret;
-
-   /* see mem_cgroup_resize_res_limit */
-   retry_count = MEM_CGROUP_RECLAIM_RETRIES *
- mem_cgroup_count_children(memcg);
-
-   oldusage = page_counter_read(>memsw);
+   oldusage = page_counter_read(counter);
 
do {
if (signal_pending(current)) {
@@ -2498,22 +2448,23 @@ static int mem_cgroup_resize_memsw_limit(struct 
mem_cgroup *memcg,
}
 
mutex_lock(_limit_mutex);
-   if (limit < memcg->memory.limit) {
+   if (memsw ? limit < memcg->memory.limit :
+   limit > memcg->memsw.limit) {
mutex_unlock(_limit_mutex);
ret = -EINVAL;
break;
}
-   if (limit > memcg->memsw.limit)
+   if (limit > counter->limit)
enlarge = true;
-   ret = page_counter_limit(>memsw, limit);
+   ret = page_counter_limit(counter, limit);
mutex_unlock(_limit_mutex);
 
if (!ret)
break;
 
-   try_to_free_mem_cgroup_pages(memcg, 1, GFP_KERNEL, false);
+   try_to_free_mem_cgroup_pages(memcg, 1, GFP_KERNEL, !memsw);
 
-   curusage = page_counter_read(>memsw);
+   curusage = page_counter_read(counter);
/* Usage is reduced ? */
if (curusage >= oldusage)
retry_count--;
@@ -2975,10 +2926,10 @@ static ssize_t mem_cgroup_write(struct kernfs_open_file 
*of,
}
switch (MEMFILE_TYPE(of_cft(of)->private)) {
case _MEM:
-   ret = mem_cgroup_resize_limit(memcg, nr_pages);
+   ret = mem_cgroup_resize_limit(memcg, nr_pages, false);
break;
case _MEMSWAP:
-   ret = mem_cgroup_resize_memsw_limit(memcg, nr_pages);
+   ret = mem_cgroup_resize_limit(memcg, nr_pages, true);
break;
case _KMEM:
ret = memcg_update_kmem_limit(memcg, nr_pages);
-- 
2.13.0.506.g27d5fe0cd-goog

[PATCH] memcg: refactor mem_cgroup_resize_limit()

2017-06-01 Thread Yu Zhao 
mem_cgroup_resize_limit() and mem_cgroup_resize_memsw_limit() have
identical logics. Refactor code so we don't need to keep two pieces
of code that does same thing.

Signed-off-by: Yu Zhao 
---
 mm/memcontrol.c | 71 +
 1 file changed, 11 insertions(+), 60 deletions(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 94172089f52f..a4f0daaff704 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2422,13 +2422,14 @@ static inline int 
mem_cgroup_move_swap_account(swp_entry_t entry,
 static DEFINE_MUTEX(memcg_limit_mutex);
 
 static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
-  unsigned long limit)
+  unsigned long limit, bool memsw)
 {
unsigned long curusage;
unsigned long oldusage;
bool enlarge = false;
int retry_count;
int ret;
+   struct page_counter *counter = memsw ? >memsw : >memory;
 
/*
 * For keeping hierarchical_reclaim simple, how long we should retry
@@ -2438,58 +2439,7 @@ static int mem_cgroup_resize_limit(struct mem_cgroup 
*memcg,
retry_count = MEM_CGROUP_RECLAIM_RETRIES *
  mem_cgroup_count_children(memcg);
 
-   oldusage = page_counter_read(>memory);
-
-   do {
-   if (signal_pending(current)) {
-   ret = -EINTR;
-   break;
-   }
-
-   mutex_lock(_limit_mutex);
-   if (limit > memcg->memsw.limit) {
-   mutex_unlock(_limit_mutex);
-   ret = -EINVAL;
-   break;
-   }
-   if (limit > memcg->memory.limit)
-   enlarge = true;
-   ret = page_counter_limit(>memory, limit);
-   mutex_unlock(_limit_mutex);
-
-   if (!ret)
-   break;
-
-   try_to_free_mem_cgroup_pages(memcg, 1, GFP_KERNEL, true);
-
-   curusage = page_counter_read(>memory);
-   /* Usage is reduced ? */
-   if (curusage >= oldusage)
-   retry_count--;
-   else
-   oldusage = curusage;
-   } while (retry_count);
-
-   if (!ret && enlarge)
-   memcg_oom_recover(memcg);
-
-   return ret;
-}
-
-static int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg,
-unsigned long limit)
-{
-   unsigned long curusage;
-   unsigned long oldusage;
-   bool enlarge = false;
-   int retry_count;
-   int ret;
-
-   /* see mem_cgroup_resize_res_limit */
-   retry_count = MEM_CGROUP_RECLAIM_RETRIES *
- mem_cgroup_count_children(memcg);
-
-   oldusage = page_counter_read(>memsw);
+   oldusage = page_counter_read(counter);
 
do {
if (signal_pending(current)) {
@@ -2498,22 +2448,23 @@ static int mem_cgroup_resize_memsw_limit(struct 
mem_cgroup *memcg,
}
 
mutex_lock(_limit_mutex);
-   if (limit < memcg->memory.limit) {
+   if (memsw ? limit < memcg->memory.limit :
+   limit > memcg->memsw.limit) {
mutex_unlock(_limit_mutex);
ret = -EINVAL;
break;
}
-   if (limit > memcg->memsw.limit)
+   if (limit > counter->limit)
enlarge = true;
-   ret = page_counter_limit(>memsw, limit);
+   ret = page_counter_limit(counter, limit);
mutex_unlock(_limit_mutex);
 
if (!ret)
break;
 
-   try_to_free_mem_cgroup_pages(memcg, 1, GFP_KERNEL, false);
+   try_to_free_mem_cgroup_pages(memcg, 1, GFP_KERNEL, !memsw);
 
-   curusage = page_counter_read(>memsw);
+   curusage = page_counter_read(counter);
/* Usage is reduced ? */
if (curusage >= oldusage)
retry_count--;
@@ -2975,10 +2926,10 @@ static ssize_t mem_cgroup_write(struct kernfs_open_file 
*of,
}
switch (MEMFILE_TYPE(of_cft(of)->private)) {
case _MEM:
-   ret = mem_cgroup_resize_limit(memcg, nr_pages);
+   ret = mem_cgroup_resize_limit(memcg, nr_pages, false);
break;
case _MEMSWAP:
-   ret = mem_cgroup_resize_memsw_limit(memcg, nr_pages);
+   ret = mem_cgroup_resize_limit(memcg, nr_pages, true);
break;
case _KMEM:
ret = memcg_update_kmem_limit(memcg, nr_pages);
-- 
2.13.0.506.g27d5fe0cd-goog