lkml.org 
[lkml]   [2010]   [Jul]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/7] hugetlb: add hugepage check in mem_cgroup_{register,end}_migration()
    Date
    Currently memory cgroup doesn't charge hugepage,
    so avoid calling these functions in hugepage migration context.

    Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
    Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
    ---
    mm/memcontrol.c | 5 +++++
    1 files changed, 5 insertions(+), 0 deletions(-)

    diff --git v2.6.35-rc3-hwpoison/mm/memcontrol.c v2.6.35-rc3-hwpoison/mm/memcontrol.c
    index c6ece0a..fed32de 100644
    --- v2.6.35-rc3-hwpoison/mm/memcontrol.c
    +++ v2.6.35-rc3-hwpoison/mm/memcontrol.c
    @@ -2504,6 +2504,8 @@ int mem_cgroup_prepare_migration(struct page *page,

    if (mem_cgroup_disabled())
    return 0;
    + if (PageHuge(page))
    + return 0;

    pc = lookup_page_cgroup(page);
    lock_page_cgroup(pc);
    @@ -2591,6 +2593,9 @@ void mem_cgroup_end_migration(struct mem_cgroup *mem,

    if (!mem)
    return;
    + if (PageHuge(oldpage))
    + return;
    +
    /* blocks rmdir() */
    cgroup_exclude_rmdir(&mem->css);
    /* at migration success, oldpage->mapping is NULL. */
    --
    1.7.1


    \
     
     \ /
      Last update: 2010-07-02 07:51    [W:0.021 / U:58.760 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site