diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/page_alloc.c | 2 | ||||
-rw-r--r-- | mm/vmscan.c | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 770f011e1c12..84d9da1e8f4c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -3809,7 +3809,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat, | |||
3809 | zone_pcp_init(zone); | 3809 | zone_pcp_init(zone); |
3810 | for_each_lru(l) { | 3810 | for_each_lru(l) { |
3811 | INIT_LIST_HEAD(&zone->lru[l].list); | 3811 | INIT_LIST_HEAD(&zone->lru[l].list); |
3812 | zone->lru[l].nr_saved_scan = 0; | 3812 | zone->reclaim_stat.nr_saved_scan[l] = 0; |
3813 | } | 3813 | } |
3814 | zone->reclaim_stat.recent_rotated[0] = 0; | 3814 | zone->reclaim_stat.recent_rotated[0] = 0; |
3815 | zone->reclaim_stat.recent_rotated[1] = 0; | 3815 | zone->reclaim_stat.recent_rotated[1] = 0; |
diff --git a/mm/vmscan.c b/mm/vmscan.c index 5432c230c4cb..0e7f5e4a22d7 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -1586,6 +1586,7 @@ static void shrink_zone(int priority, struct zone *zone, | |||
1586 | enum lru_list l; | 1586 | enum lru_list l; |
1587 | unsigned long nr_reclaimed = sc->nr_reclaimed; | 1587 | unsigned long nr_reclaimed = sc->nr_reclaimed; |
1588 | unsigned long swap_cluster_max = sc->swap_cluster_max; | 1588 | unsigned long swap_cluster_max = sc->swap_cluster_max; |
1589 | struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(zone, sc); | ||
1589 | int noswap = 0; | 1590 | int noswap = 0; |
1590 | 1591 | ||
1591 | /* If we have no swap space, do not bother scanning anon pages. */ | 1592 | /* If we have no swap space, do not bother scanning anon pages. */ |
@@ -1605,12 +1606,9 @@ static void shrink_zone(int priority, struct zone *zone, | |||
1605 | scan >>= priority; | 1606 | scan >>= priority; |
1606 | scan = (scan * percent[file]) / 100; | 1607 | scan = (scan * percent[file]) / 100; |
1607 | } | 1608 | } |
1608 | if (scanning_global_lru(sc)) | 1609 | nr[l] = nr_scan_try_batch(scan, |
1609 | nr[l] = nr_scan_try_batch(scan, | 1610 | &reclaim_stat->nr_saved_scan[l], |
1610 | &zone->lru[l].nr_saved_scan, | 1611 | swap_cluster_max); |
1611 | swap_cluster_max); | ||
1612 | else | ||
1613 | nr[l] = scan; | ||
1614 | } | 1612 | } |
1615 | 1613 | ||
1616 | while (nr[LRU_INACTIVE_ANON] || nr[LRU_ACTIVE_FILE] || | 1614 | while (nr[LRU_INACTIVE_ANON] || nr[LRU_ACTIVE_FILE] || |
@@ -2220,6 +2218,7 @@ static void shrink_all_zones(unsigned long nr_pages, int prio, | |||
2220 | { | 2218 | { |
2221 | struct zone *zone; | 2219 | struct zone *zone; |
2222 | unsigned long nr_reclaimed = 0; | 2220 | unsigned long nr_reclaimed = 0; |
2221 | struct zone_reclaim_stat *reclaim_stat; | ||
2223 | 2222 | ||
2224 | for_each_populated_zone(zone) { | 2223 | for_each_populated_zone(zone) { |
2225 | enum lru_list l; | 2224 | enum lru_list l; |
@@ -2236,11 +2235,14 @@ static void shrink_all_zones(unsigned long nr_pages, int prio, | |||
2236 | l == LRU_ACTIVE_FILE)) | 2235 | l == LRU_ACTIVE_FILE)) |
2237 | continue; | 2236 | continue; |
2238 | 2237 | ||
2239 | zone->lru[l].nr_saved_scan += (lru_pages >> prio) + 1; | 2238 | reclaim_stat = get_reclaim_stat(zone, sc); |
2240 | if (zone->lru[l].nr_saved_scan >= nr_pages || pass > 3) { | 2239 | reclaim_stat->nr_saved_scan[l] += |
2240 | (lru_pages >> prio) + 1; | ||
2241 | if (reclaim_stat->nr_saved_scan[l] | ||
2242 | >= nr_pages || pass > 3) { | ||
2241 | unsigned long nr_to_scan; | 2243 | unsigned long nr_to_scan; |
2242 | 2244 | ||
2243 | zone->lru[l].nr_saved_scan = 0; | 2245 | reclaim_stat->nr_saved_scan[l] = 0; |
2244 | nr_to_scan = min(nr_pages, lru_pages); | 2246 | nr_to_scan = min(nr_pages, lru_pages); |
2245 | nr_reclaimed += shrink_list(l, nr_to_scan, zone, | 2247 | nr_reclaimed += shrink_list(l, nr_to_scan, zone, |
2246 | sc, prio); | 2248 | sc, prio); |