From: Michal Hocko <[email protected]> zone_reclaimable_pages considers all anonymous pages on LRUs reclaimable if there is at least one entry on the swap storage left. This can be really misleading when the swap is short on space and skew reclaim decisions based on zone_reclaimable_pages. Fix this by clamping the number to the minimum of the available swap space and anon LRU pages.
Signed-off-by: Michal Hocko <[email protected]> --- mm/vmscan.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 946d348f5040..646001a1f279 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -195,15 +195,20 @@ static bool sane_reclaim(struct scan_control *sc) static unsigned long zone_reclaimable_pages(struct zone *zone) { unsigned long nr; + long nr_swap = get_nr_swap_pages(); nr = zone_page_state(zone, NR_ACTIVE_FILE) + zone_page_state(zone, NR_INACTIVE_FILE) + zone_page_state(zone, NR_ISOLATED_FILE); - if (get_nr_swap_pages() > 0) - nr += zone_page_state(zone, NR_ACTIVE_ANON) + - zone_page_state(zone, NR_INACTIVE_ANON) + - zone_page_state(zone, NR_ISOLATED_ANON); + if (nr_swap > 0) { + unsigned long anon; + + anon = zone_page_state(zone, NR_ACTIVE_ANON) + + zone_page_state(zone, NR_INACTIVE_ANON) + + zone_page_state(zone, NR_ISOLATED_ANON); + nr += min_t(unsigned long, nr_swap, anon); + } return nr; } -- 2.6.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
