Re: [mmotm][BUGFIX][PATCH] memcg: fix softlimit css refcnthandling.

[KAMEZAWA Hiroyuki]

On Fri, 4 Sep 2009 16:37:58 +0900
KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> wrote:

> ==
> SoftLimit tree 'find next one' loop uses next_mz to remember
> next one to be visited if reclaimd==0.
> But css'refcnt handling for next_mz is not enough and it makes
> css->refcnt leak.
> 
> Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
> 
maybe this patch can be applied after
memory-controller-soft-limit-reclaim-on-contention-v9-fix.patch

Thanks,
-Kmae



> 
> ---
>  mm/memcontrol.c |   11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
> 
> Index: mmotm-2.6.31-Aug27/mm/memcontrol.c
> ===================================================================
> --- mmotm-2.6.31-Aug27.orig/mm/memcontrol.c
> +++ mmotm-2.6.31-Aug27/mm/memcontrol.c
> @@ -2261,6 +2261,8 @@ unsigned long mem_cgroup_soft_limit_recl
>  		if (!reclaimed) {
>  			do {
>  				/*
> +				 * Loop until we find yet another one.
> +				 *
>  				 * By the time we get the soft_limit lock
>  				 * again, someone might have aded the
>  				 * group back on the RB tree. Iterate to
> @@ -2271,7 +2273,12 @@ unsigned long mem_cgroup_soft_limit_recl
>  				 */
>  				next_mz =
>  				__mem_cgroup_largest_soft_limit_node(mctz);
> -			} while (next_mz == mz);
> +				if (next_mz == mz) {
> +					css_put(&next_mz->mem->css);
> +					next_mz = NULL;
> +				} else /* next_mz == NULL or other memcg */
> +					break;
> +			} while (1);
>  		}
>  		mz->usage_in_excess =
>  			res_counter_soft_limit_excess(&mz->mem->res);
> @@ -2299,6 +2306,8 @@ unsigned long mem_cgroup_soft_limit_recl
>  			loop > MEM_CGROUP_MAX_SOFT_LIMIT_RECLAIM_LOOPS))
>  			break;
>  	} while (!nr_reclaimed);
> +	if (next_mz)
> +		css_put(&next_mz->mem->css);
>  	return nr_reclaimed;
>  }
>  
> 
> --
> To unsubscribe, send a message with 'unsubscribe linux-mm' in
> the body to majordomo@xxxxxxxxxx  For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/