lkml.org 
[lkml]   [2010]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 3/7] memcg: nid and zid can be calculated from zone
    On Fri, Jul 16, 2010 at 07:15:05PM +0900, KOSAKI Motohiro wrote:
    >
    > mem_cgroup_soft_limit_reclaim() has zone, nid and zid argument. but nid
    > and zid can be calculated from zone. So remove it.
    >
    > Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    > ---
    > include/linux/memcontrol.h | 6 +++---
    > include/linux/mmzone.h | 5 +++++
    > mm/memcontrol.c | 5 ++---
    > mm/vmscan.c | 7 ++-----
    > 4 files changed, 12 insertions(+), 11 deletions(-)
    >
    > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
    > index 9411d32..9dec218 100644
    > --- a/include/linux/memcontrol.h
    > +++ b/include/linux/memcontrol.h
    > @@ -128,8 +128,8 @@ static inline bool mem_cgroup_disabled(void)
    >
    > void mem_cgroup_update_file_mapped(struct page *page, int val);
    > unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,
    > - gfp_t gfp_mask, int nid,
    > - int zid);
    > + gfp_t gfp_mask);
    > +
    > #else /* CONFIG_CGROUP_MEM_RES_CTLR */
    > struct mem_cgroup;
    >
    > @@ -304,7 +304,7 @@ static inline void mem_cgroup_update_file_mapped(struct page *page,
    >
    > static inline
    > unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,
    > - gfp_t gfp_mask, int nid, int zid)
    > + gfp_t gfp_mask)
    > {
    > return 0;
    > }
    > diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
    > index 9ed9c45..34ac27a 100644
    > --- a/include/linux/mmzone.h
    > +++ b/include/linux/mmzone.h
    > @@ -684,6 +684,11 @@ unsigned long __init node_memmap_size_bytes(int, unsigned long, unsigned long);
    > */
    > #define zone_idx(zone) ((zone) - (zone)->zone_pgdat->node_zones)
    >
    > +static inline int zone_nid(struct zone *zone)
    > +{
    > + return zone->zone_pgdat->node_id;
    > +}
    > +

    hmm, adding a helper and not converting the existing users of
    zone->zone_pgdat may be a little confusing particularly as both types of
    usage would exist in the same file e.g. in mem_cgroup_zone_nr_pages.

    > static inline int populated_zone(struct zone *zone)
    > {
    > return (!!zone->present_pages);
    > diff --git a/mm/memcontrol.c b/mm/memcontrol.c
    > index 01f38ff..81bc9bf 100644
    > --- a/mm/memcontrol.c
    > +++ b/mm/memcontrol.c
    > @@ -2833,8 +2833,7 @@ static int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg,
    > }
    >
    > unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,
    > - gfp_t gfp_mask, int nid,
    > - int zid)
    > + gfp_t gfp_mask)
    > {
    > unsigned long nr_reclaimed = 0;
    > struct mem_cgroup_per_zone *mz, *next_mz = NULL;
    > @@ -2846,7 +2845,7 @@ unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order,
    > if (order > 0)
    > return 0;
    >
    > - mctz = soft_limit_tree_node_zone(nid, zid);
    > + mctz = soft_limit_tree_node_zone(zone_nid(zone), zone_idx(zone));
    > /*
    > * This loop can run a while, specially if mem_cgroup's continuously
    > * keep exceeding their soft limit and putting the system under
    > diff --git a/mm/vmscan.c b/mm/vmscan.c
    > index be860a0..89b4287 100644
    > --- a/mm/vmscan.c
    > +++ b/mm/vmscan.c
    > @@ -2121,7 +2121,6 @@ loop_again:
    > for (i = 0; i <= end_zone; i++) {
    > struct zone *zone = pgdat->node_zones + i;
    > int nr_slab;
    > - int nid, zid;
    >
    > if (!populated_zone(zone))
    > continue;
    > @@ -2133,14 +2132,12 @@ loop_again:
    > sc.nr_scanned = 0;
    > note_zone_scanning_priority(zone, priority);
    >
    > - nid = pgdat->node_id;
    > - zid = zone_idx(zone);
    > /*
    > * Call soft limit reclaim before calling shrink_zone.
    > * For now we ignore the return value
    > */
    > - mem_cgroup_soft_limit_reclaim(zone, order, sc.gfp_mask,
    > - nid, zid);
    > + mem_cgroup_soft_limit_reclaim(zone, order, sc.gfp_mask);
    > +

    Other than the usual comment of it belonging in its own series

    Acked-by: Mel Gorman <mel@csn.ul.ie>

    > /*
    > * We put equal pressure on every zone, unless one
    > * zone has way too many pages free already.
    > --
    > 1.6.5.2
    >
    >
    >

    --
    Mel Gorman
    Part-time Phd Student Linux Technology Center
    University of Limerick IBM Dublin Software Lab


    \
     
     \ /
      Last update: 2010-07-16 12:59    [W:0.032 / U:2.600 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site