lkml.org 
[lkml]   [2011]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[175/272] memcg: fix account leak at failure of memsw acconting
    2.6.37-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>

    commit 01c88e2d6b7330c0cc5867fe2297e7d826e1337d upstream.

    Commit 4b53433468 ("memcg: clean up try_charge main loop") removes a
    cancel of charge at case: memory charge-> success. mem+swap charge->
    failure.

    This leaks usage of memory. Fix it.

    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Reviewed-by: Johannes Weiner <hannes@cmpxchg.org>
    Acked-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Cc: Balbir Singh <balbir@in.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    mm/memcontrol.c | 1 +
    1 file changed, 1 insertion(+)

    --- a/mm/memcontrol.c
    +++ b/mm/memcontrol.c
    @@ -1842,6 +1842,7 @@ static int __mem_cgroup_do_charge(struct
    if (likely(!ret))
    return CHARGE_OK;

    + res_counter_uncharge(&mem->res, csize);
    mem_over_limit = mem_cgroup_from_res_counter(fail_res, memsw);
    flags |= MEM_CGROUP_RECLAIM_NOSWAP;
    } else



    \
     
     \ /
      Last update: 2011-02-16 01:47    [W:4.204 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site