mm: Check if any page in a pageblock is reserved before marking it MIGRATE_RESERVE

This fixes a problem where the first pageblock got marked MIGRATE_RESERVE even
though it only had a few free pages. This in turn caused no contiguous memory
to be reserved and frequent kswapd wakeups that emptied the caches to get more
contiguous memory.
This commit is contained in:
Arve Hjønnevåg
2009-03-18 17:27:31 -07:00
parent c177d04116
commit 675bed294c

View File

@@ -2858,6 +2858,20 @@ static inline unsigned long wait_table_bits(unsigned long size)
#define LONG_ALIGN(x) (((x)+(sizeof(long))-1)&~((sizeof(long))-1))
/*
* Check if a pageblock contains reserved pages
*/
static int pageblock_is_reserved(unsigned long start_pfn)
{
unsigned long end_pfn = start_pfn + pageblock_nr_pages;
unsigned long pfn;
for (pfn = start_pfn; pfn < end_pfn; pfn++)
if (PageReserved(pfn_to_page(pfn)))
return 1;
return 0;
}
/*
* Mark a number of pageblocks as MIGRATE_RESERVE. The number
* of blocks reserved is based on min_wmark_pages(zone). The memory within
@@ -2897,7 +2911,7 @@ static void setup_zone_migrate_reserve(struct zone *zone)
continue;
/* Blocks with reserved pages will never free, skip them. */
if (PageReserved(page))
if (pageblock_is_reserved(pfn))
continue;
block_migratetype = get_pageblock_migratetype(page);