From mboxrd@z Thu Jan 1 00:00:00 1970 Date: Wed, 6 Dec 2006 17:00:35 +0000 Subject: [PATCH 3/4] lumpy ensure we respect zone boundaries Message-ID: <9f8124c15f20c487101e5b2fd30ac13f@pinky> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline From: Andy Whitcroft Sender: owner-linux-mm@kvack.org Return-Path: To: Andrew Morton , linux-mm@kvack.org Cc: Peter Zijlstra , Mel Gorman , Andy Whitcroft , linux-kernel@vger.kernel.org List-ID: When scanning an aligned order N area ensure we only pull out pages in the same zone as our tag page, else we will manipulate those pages' LRU under the wrong zone lru_lock. Bad. Signed-off-by: Andy Whitcroft Acked-by: Peter Zijlstra --- diff --git a/mm/vmscan.c b/mm/vmscan.c index 0effa3e..85f626b 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -660,6 +660,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan, struct page *page, *tmp; unsigned long scan, pfn, end_pfn, page_pfn; int active; + int zone_id; for (scan = 0; scan < nr_to_scan && !list_empty(src); scan++) { page = lru_to_page(src); @@ -691,6 +692,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan, * surrounding the tag page. Only take those pages of * the same active state as that tag page. */ + zone_id = page_zone_id(page); page_pfn = __page_to_pfn(page); pfn = page_pfn & ~((1 << order) - 1); end_pfn = pfn + (1 << order); @@ -700,8 +702,10 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan, if (unlikely(!pfn_valid(pfn))) break; - scan++; tmp = __pfn_to_page(pfn); + if (unlikely(page_zone_id(tmp) != zone_id)) + continue; + scan++; switch (__isolate_lru_page(tmp, active)) { case 0: list_move(&tmp->lru, dst); -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org