diff options
author | Rik van Riel <riel@redhat.com> | 2009-12-14 20:59:48 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 11:53:21 -0500 |
commit | b39415b2731d7dec5e612d2d12595da82399eedf (patch) | |
tree | a8c59b1bc820d643d2e969f866a54147d7015c2e | |
parent | 8aa043d74559556a661cb2eb6e64497eec86ec77 (diff) |
vmscan: do not evict inactive pages when skipping an active list scan
In AIM7 runs, recent kernels start swapping out anonymous pages well
before they should. This is due to shrink_list falling through to
shrink_inactive_list if !inactive_anon_is_low(zone, sc), when all we
really wanted to do is pre-age some anonymous pages to give them extra
time to be referenced while on the inactive list.
The obvious fix is to make sure that shrink_list does not fall through to
scanning/reclaiming inactive pages when we called it to scan one of the
active lists.
This change should be safe because the loop in shrink_zone ensures that we
will still shrink the anon and file inactive lists whenever we should.
[kosaki.motohiro@jp.fujitsu.com: inactive_file_is_low() should be inactive_anon_is_low()]
Reported-by: Larry Woodman <lwoodman@redhat.com>
Signed-off-by: Rik van Riel <riel@redhat.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Tomasz Chmielewski <mangoo@wpkg.org>
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | mm/vmscan.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 2ef59d5b16a6..04658189b9a5 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -1463,20 +1463,26 @@ static int inactive_file_is_low(struct zone *zone, struct scan_control *sc) | |||
1463 | return low; | 1463 | return low; |
1464 | } | 1464 | } |
1465 | 1465 | ||
1466 | static int inactive_list_is_low(struct zone *zone, struct scan_control *sc, | ||
1467 | int file) | ||
1468 | { | ||
1469 | if (file) | ||
1470 | return inactive_file_is_low(zone, sc); | ||
1471 | else | ||
1472 | return inactive_anon_is_low(zone, sc); | ||
1473 | } | ||
1474 | |||
1466 | static unsigned long shrink_list(enum lru_list lru, unsigned long nr_to_scan, | 1475 | static unsigned long shrink_list(enum lru_list lru, unsigned long nr_to_scan, |
1467 | struct zone *zone, struct scan_control *sc, int priority) | 1476 | struct zone *zone, struct scan_control *sc, int priority) |
1468 | { | 1477 | { |
1469 | int file = is_file_lru(lru); | 1478 | int file = is_file_lru(lru); |
1470 | 1479 | ||
1471 | if (lru == LRU_ACTIVE_FILE && inactive_file_is_low(zone, sc)) { | 1480 | if (is_active_lru(lru)) { |
1472 | shrink_active_list(nr_to_scan, zone, sc, priority, file); | 1481 | if (inactive_list_is_low(zone, sc, file)) |
1482 | shrink_active_list(nr_to_scan, zone, sc, priority, file); | ||
1473 | return 0; | 1483 | return 0; |
1474 | } | 1484 | } |
1475 | 1485 | ||
1476 | if (lru == LRU_ACTIVE_ANON && inactive_anon_is_low(zone, sc)) { | ||
1477 | shrink_active_list(nr_to_scan, zone, sc, priority, file); | ||
1478 | return 0; | ||
1479 | } | ||
1480 | return shrink_inactive_list(nr_to_scan, zone, sc, priority, file); | 1486 | return shrink_inactive_list(nr_to_scan, zone, sc, priority, file); |
1481 | } | 1487 | } |
1482 | 1488 | ||