lkml.org 
[lkml]   [2010]   [Jun]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] vmscan: recalculate lru_pages on each priority
    Date
    shrink_zones() need relatively long time. and lru_pages can be
    changed dramatically while shrink_zones().
    then, lru_pages need recalculate on each priority.

    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    ---
    mm/vmscan.c | 21 ++++++++-------------
    1 files changed, 8 insertions(+), 13 deletions(-)

    diff --git a/mm/vmscan.c b/mm/vmscan.c
    index 0c961f1..0ebfe12 100644
    --- a/mm/vmscan.c
    +++ b/mm/vmscan.c
    @@ -1785,7 +1785,6 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
    bool all_unreclaimable;
    unsigned long total_scanned = 0;
    struct reclaim_state *reclaim_state = current->reclaim_state;
    - unsigned long lru_pages = 0;
    struct zoneref *z;
    struct zone *zone;
    enum zone_type high_zoneidx = gfp_zone(sc->gfp_mask);
    @@ -1796,18 +1795,6 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,

    if (scanning_global_lru(sc))
    count_vm_event(ALLOCSTALL);
    - /*
    - * mem_cgroup will not do shrink_slab.
    - */
    - if (scanning_global_lru(sc)) {
    - for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) {
    -
    - if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
    - continue;
    -
    - lru_pages += zone_reclaimable_pages(zone);
    - }
    - }

    for (priority = DEF_PRIORITY; priority >= 0; priority--) {
    sc->nr_scanned = 0;
    @@ -1819,6 +1806,14 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
    * over limit cgroups
    */
    if (scanning_global_lru(sc)) {
    + unsigned long lru_pages = 0;
    + for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) {
    + if (!cpuset_zone_allowed_hardwall(zone, GFP_KERNEL))
    + continue;
    +
    + lru_pages += zone_reclaimable_pages(zone);
    + }
    +
    shrink_slab(sc->nr_scanned, sc->gfp_mask, lru_pages);
    if (reclaim_state) {
    sc->nr_reclaimed += reclaim_state->reclaimed_slab;
    --
    1.6.5.2




    \
     
     \ /
      Last update: 2010-06-25 11:15    [W:0.025 / U:1.524 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site