lkml.org 
[lkml]   [2012]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC][PATCH 5/6] memcg: remove PCG_FILE_MAPPED
    From 6edf53b19769c52a6d65e0c8ba0c3000eadbddda Mon Sep 17 00:00:00 2001
    From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Date: Thu, 2 Feb 2012 15:02:18 +0900
    Subject: [PATCH 5/6] memcg: remove PCG_FILE_MAPPED

    with new lock scheme for updating memcg's page stat, we don't need
    a flag PCG_FILE_MAPPED which was duplicated information of page_mapped().

    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    ---
    include/linux/page_cgroup.h | 6 ------
    mm/memcontrol.c | 6 +-----
    2 files changed, 1 insertions(+), 11 deletions(-)

    diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h
    index 7a3af74..a88cdba 100644
    --- a/include/linux/page_cgroup.h
    +++ b/include/linux/page_cgroup.h
    @@ -6,8 +6,6 @@ enum {
    PCG_LOCK, /* Lock for pc->mem_cgroup and following bits. */
    PCG_USED, /* this object is in use. */
    PCG_MIGRATION, /* under page migration */
    - /* flags for mem_cgroup and file and I/O status */
    - PCG_FILE_MAPPED, /* page is accounted as "mapped" */
    __NR_PCG_FLAGS,
    };

    @@ -66,10 +64,6 @@ TESTPCGFLAG(Used, USED)
    CLEARPCGFLAG(Used, USED)
    SETPCGFLAG(Used, USED)

    -SETPCGFLAG(FileMapped, FILE_MAPPED)
    -CLEARPCGFLAG(FileMapped, FILE_MAPPED)
    -TESTPCGFLAG(FileMapped, FILE_MAPPED)
    -
    SETPCGFLAG(Migration, MIGRATION)
    CLEARPCGFLAG(Migration, MIGRATION)
    TESTPCGFLAG(Migration, MIGRATION)
    diff --git a/mm/memcontrol.c b/mm/memcontrol.c
    index 6ac33ef..eedabee 100644
    --- a/mm/memcontrol.c
    +++ b/mm/memcontrol.c
    @@ -1927,10 +1927,6 @@ void mem_cgroup_update_page_stat(struct page *page,

    switch (idx) {
    case MEMCG_NR_FILE_MAPPED:
    - if (val > 0)
    - SetPageCgroupFileMapped(pc);
    - else if (!page_mapped(page))
    - ClearPageCgroupFileMapped(pc);
    idx = MEM_CGROUP_STAT_FILE_MAPPED;
    break;
    default:
    @@ -2551,7 +2547,7 @@ static int mem_cgroup_move_account(struct page *page,

    move_lock_page_cgroup(pc, &flags);

    - if (PageCgroupFileMapped(pc)) {
    + if (page_mapped(page)) {
    /* Update mapped_file data for mem_cgroup */
    preempt_disable();
    __this_cpu_dec(from->stat->count[MEM_CGROUP_STAT_FILE_MAPPED]);
    --
    1.7.4.1



    \
     
     \ /
      Last update: 2012-02-06 11:15    [W:0.022 / U:62.664 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site