diff options
| -rw-r--r-- | mm/vmscan.c | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 79e2ead21c5..6dbf2c2082e 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1205,7 +1205,7 @@ putback_inactive_pages(struct lruvec *lruvec, * of reclaimed pages */ static noinline_for_stack unsigned long -shrink_inactive_list(unsigned long nr_to_scan, struct mem_cgroup_zone *mz, +shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec, struct scan_control *sc, enum lru_list lru) { LIST_HEAD(page_list); @@ -1216,9 +1216,8 @@ shrink_inactive_list(unsigned long nr_to_scan, struct mem_cgroup_zone *mz, unsigned long nr_writeback = 0; isolate_mode_t isolate_mode = 0; int file = is_file_lru(lru); - struct zone *zone = mz->zone; - struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(mz); - struct lruvec *lruvec = mem_cgroup_zone_lruvec(zone, mz->mem_cgroup); + struct zone *zone = lruvec_zone(lruvec); + struct zone_reclaim_stat *reclaim_stat = &lruvec->reclaim_stat; while (unlikely(too_many_isolated(zone, file, sc))) { congestion_wait(BLK_RW_ASYNC, HZ/10); @@ -1373,7 +1372,7 @@ static void move_active_pages_to_lru(struct zone *zone, } static void shrink_active_list(unsigned long nr_to_scan, - struct mem_cgroup_zone *mz, + struct lruvec *lruvec, struct scan_control *sc, enum lru_list lru) { @@ -1384,12 +1383,11 @@ static void shrink_active_list(unsigned long nr_to_scan, LIST_HEAD(l_active); LIST_HEAD(l_inactive); struct page *page; - struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(mz); + struct zone_reclaim_stat *reclaim_stat = &lruvec->reclaim_stat; unsigned long nr_rotated = 0; isolate_mode_t isolate_mode = 0; int file = is_file_lru(lru); - struct zone *zone = mz->zone; - struct lruvec *lruvec = mem_cgroup_zone_lruvec(zone, mz->mem_cgroup); + struct zone *zone = lruvec_zone(lruvec); lru_add_drain(); @@ -1555,21 +1553,17 @@ static int inactive_list_is_low(struct lruvec *lruvec, int file) } static unsigned long shrink_list(enum lru_list lru, unsigned long nr_to_scan, - struct mem_cgroup_zone *mz, - struct scan_control *sc) + struct lruvec *lruvec, struct scan_control *sc) { int file = is_file_lru(lru); if (is_active_lru(lru)) { - struct lruvec *lruvec = mem_cgroup_zone_lruvec(mz->zone, - mz->mem_cgroup); - if (inactive_list_is_low(lruvec, file)) - shrink_active_list(nr_to_scan, mz, sc, lru); + shrink_active_list(nr_to_scan, lruvec, sc, lru); return 0; } - return shrink_inactive_list(nr_to_scan, mz, sc, lru); + return shrink_inactive_list(nr_to_scan, lruvec, sc, lru); } static int vmscan_swappiness(struct scan_control *sc) @@ -1812,7 +1806,7 @@ restart: nr[lru] -= nr_to_scan; nr_reclaimed += shrink_list(lru, nr_to_scan, - mz, sc); + lruvec, sc); } } /* @@ -1835,7 +1829,7 @@ restart: * rebalance the anon lru active/inactive ratio. */ if (inactive_anon_is_low(lruvec)) - shrink_active_list(SWAP_CLUSTER_MAX, mz, + shrink_active_list(SWAP_CLUSTER_MAX, lruvec, sc, LRU_ACTIVE_ANON); /* reclaim/compaction might need reclaim to continue */ @@ -2268,13 +2262,9 @@ static void age_active_anon(struct zone *zone, struct scan_control *sc) memcg = mem_cgroup_iter(NULL, NULL, NULL); do { struct lruvec *lruvec = mem_cgroup_zone_lruvec(zone, memcg); - struct mem_cgroup_zone mz = { - .mem_cgroup = memcg, - .zone = zone, - }; if (inactive_anon_is_low(lruvec)) - shrink_active_list(SWAP_CLUSTER_MAX, &mz, + shrink_active_list(SWAP_CLUSTER_MAX, lruvec, sc, LRU_ACTIVE_ANON); memcg = mem_cgroup_iter(NULL, memcg, NULL); |