lkml.org 
[lkml]   [2011]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    SubjectRe: [RFC][PATCH v3 3/10] memcg: a test whether zone is reclaimable or not
    From
    On Wed, May 25, 2011 at 10:19 PM, KAMEZAWA Hiroyuki
    <kamezawa.hiroyu@jp.fujitsu.com> wrote:
    > From: Ying Han <yinghan@google.com>
    >
    > The number of reclaimable pages per zone is an useful information for
    > controling memory reclaim schedule. This patch exports it.
    >
    > Changelog v2->v3:
    >  - added comments.
    >
    > Signed-off-by: Ying Han <yinghan@google.com>
    > Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    > ---
    >  include/linux/memcontrol.h |    2 ++
    >  mm/memcontrol.c            |   24 ++++++++++++++++++++++++
    >  2 files changed, 26 insertions(+)
    >
    > Index: memcg_async/mm/memcontrol.c
    > ===================================================================
    > --- memcg_async.orig/mm/memcontrol.c
    > +++ memcg_async/mm/memcontrol.c
    > @@ -1240,6 +1240,30 @@ static unsigned long mem_cgroup_nr_lru_p
    >  }
    >  #endif /* CONFIG_NUMA */
    >
    > +/**
    > + * mem_cgroup_zone_reclaimable_pages
    > + * @memcg: the memcg
    > + * @nid  : node index to be checked.
    > + * @zid  : zone index to be checked.
    > + *
    > + * This function returns the number reclaimable pages on a zone for given memcg.
    > + * Reclaimable page includes file caches and anonymous pages if swap is
    > + * avaliable and never includes unevictable pages.
    > + */
    > +unsigned long mem_cgroup_zone_reclaimable_pages(struct mem_cgroup *memcg,
    > +                                               int nid, int zid)
    > +{
    > +       unsigned long nr;
    > +       struct mem_cgroup_per_zone *mz = mem_cgroup_zoneinfo(memcg, nid, zid);
    > +
    > +       nr = MEM_CGROUP_ZSTAT(mz, NR_ACTIVE_FILE) +
    > +               MEM_CGROUP_ZSTAT(mz, NR_ACTIVE_FILE);
    > +       if (nr_swap_pages > 0)
    > +               nr += MEM_CGROUP_ZSTAT(mz, NR_ACTIVE_ANON) +
    > +                       MEM_CGROUP_ZSTAT(mz, NR_INACTIVE_ANON);
    > +       return nr;
    > +}
    > +
    >  struct zone_reclaim_stat *mem_cgroup_get_reclaim_stat(struct mem_cgroup *memcg,
    >                                                      struct zone *zone)
    >  {
    > Index: memcg_async/include/linux/memcontrol.h
    > ===================================================================
    > --- memcg_async.orig/include/linux/memcontrol.h
    > +++ memcg_async/include/linux/memcontrol.h
    > @@ -109,6 +109,8 @@ extern void mem_cgroup_end_migration(str
    >  */
    >  int mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg);
    >  int mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg);
    > +unsigned long
    > +mem_cgroup_zone_reclaimable_pages(struct mem_cgroup *memcg, int nid, int zid);
    >  int mem_cgroup_select_victim_node(struct mem_cgroup *memcg);
    >  unsigned long mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg,
    >                                                struct zone *zone,
    >
    >

    Again, please apply the patch:

    diff --git a/mm/memcontrol.c b/mm/memcontrol.c
    index 6a52699..0b88d71 100644
    --- a/mm/memcontrol.c
    +++ b/mm/memcontrol.c
    @@ -1217,7 +1217,7 @@ unsigned long
    mem_cgroup_zone_reclaimable_pages(struct mem_cgroup *memcg,
    struct mem_cgroup_per_zone *mz = mem_cgroup_zoneinfo(memcg, nid, zid);

    nr = MEM_CGROUP_ZSTAT(mz, NR_ACTIVE_FILE) +
    - MEM_CGROUP_ZSTAT(mz, NR_ACTIVE_FILE);
    + MEM_CGROUP_ZSTAT(mz, NR_INACTIVE_FILE);
    if (nr_swap_pages > 0)
    nr += MEM_CGROUP_ZSTAT(mz, NR_ACTIVE_ANON) +
    MEM_CGROUP_ZSTAT(mz, NR_INACTIVE_ANON);

    Also, you need to move this to up since patch 1/10 needs this.

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

    \
     
     \ /
      Last update: 2011-05-27 09:23    [W:0.027 / U:32.348 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site