lkml.org 
[lkml]   [2012]   [Feb]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 7/7] mm/memcg: use vm_swappiness from target memory cgroup
    From
    Date
    Use vm_swappiness from memory cgroup which is triggered this memory reclaim.
    This is more reasonable and allows to kill one argument.

    Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
    ---
    mm/vmscan.c | 9 ++++-----
    1 files changed, 4 insertions(+), 5 deletions(-)

    diff --git a/mm/vmscan.c b/mm/vmscan.c
    index ab447df..fd96eb8 100644
    --- a/mm/vmscan.c
    +++ b/mm/vmscan.c
    @@ -1873,12 +1873,11 @@ static unsigned long shrink_list(enum lru_list lru, unsigned long nr_to_scan,
    return shrink_inactive_list(nr_to_scan, mz, sc, priority, lru);
    }

    -static int vmscan_swappiness(struct mem_cgroup_zone *mz,
    - struct scan_control *sc)
    +static int vmscan_swappiness(struct scan_control *sc)
    {
    if (global_reclaim(sc))
    return vm_swappiness;
    - return mem_cgroup_swappiness(mz->mem_cgroup);
    + return mem_cgroup_swappiness(sc->target_mem_cgroup);
    }

    /*
    @@ -1947,8 +1946,8 @@ static void get_scan_count(struct mem_cgroup_zone *mz, struct scan_control *sc,
    * With swappiness at 100, anonymous and file have the same priority.
    * This scanning priority is essentially the inverse of IO cost.
    */
    - anon_prio = vmscan_swappiness(mz, sc);
    - file_prio = 200 - vmscan_swappiness(mz, sc);
    + anon_prio = vmscan_swappiness(sc);
    + file_prio = 200 - vmscan_swappiness(sc);

    /*
    * OK, so we have swap space and a fair amount of page cache


    \
     
     \ /
      Last update: 2012-02-29 10:19    [W:0.035 / U:58.860 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site