Commit b2a0ac88 authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds
Browse files

Split the free lists for movable and unmovable allocations



This patch adds the core of the fragmentation reduction strategy.  It works by
grouping pages together based on their ability to migrate or be reclaimed.
Basically, it works by breaking the list in zone->free_area list into
MIGRATE_TYPES number of lists.
Signed-off-by: default avatarMel Gorman <mel@csn.ul.ie>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 835c134e
...@@ -33,8 +33,16 @@ ...@@ -33,8 +33,16 @@
*/ */
#define PAGE_ALLOC_COSTLY_ORDER 3 #define PAGE_ALLOC_COSTLY_ORDER 3
#define MIGRATE_UNMOVABLE 0
#define MIGRATE_MOVABLE 1
#define MIGRATE_TYPES 2
#define for_each_migratetype_order(order, type) \
for (order = 0; order < MAX_ORDER; order++) \
for (type = 0; type < MIGRATE_TYPES; type++)
struct free_area { struct free_area {
struct list_head free_list; struct list_head free_list[MIGRATE_TYPES];
unsigned long nr_free; unsigned long nr_free;
}; };
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
/* Bit indices that affect a whole block of pages */ /* Bit indices that affect a whole block of pages */
enum pageblock_bits { enum pageblock_bits {
PB_range(PB_migrate, 1), /* 1 bit required for migrate types */
NR_PAGEBLOCK_BITS NR_PAGEBLOCK_BITS
}; };
......
...@@ -158,6 +158,22 @@ int nr_node_ids __read_mostly = MAX_NUMNODES; ...@@ -158,6 +158,22 @@ int nr_node_ids __read_mostly = MAX_NUMNODES;
EXPORT_SYMBOL(nr_node_ids); EXPORT_SYMBOL(nr_node_ids);
#endif #endif
static inline int get_pageblock_migratetype(struct page *page)
{
return get_pageblock_flags_group(page, PB_migrate, PB_migrate_end);
}
static void set_pageblock_migratetype(struct page *page, int migratetype)
{
set_pageblock_flags_group(page, (unsigned long)migratetype,
PB_migrate, PB_migrate_end);
}
static inline int gfpflags_to_migratetype(gfp_t gfp_flags)
{
return ((gfp_flags & __GFP_MOVABLE) != 0);
}
#ifdef CONFIG_DEBUG_VM #ifdef CONFIG_DEBUG_VM
static int page_outside_zone_boundaries(struct zone *zone, struct page *page) static int page_outside_zone_boundaries(struct zone *zone, struct page *page)
{ {
...@@ -412,6 +428,7 @@ static inline void __free_one_page(struct page *page, ...@@ -412,6 +428,7 @@ static inline void __free_one_page(struct page *page,
{ {
unsigned long page_idx; unsigned long page_idx;
int order_size = 1 << order; int order_size = 1 << order;
int migratetype = get_pageblock_migratetype(page);
if (unlikely(PageCompound(page))) if (unlikely(PageCompound(page)))
destroy_compound_page(page, order); destroy_compound_page(page, order);
...@@ -424,7 +441,6 @@ static inline void __free_one_page(struct page *page, ...@@ -424,7 +441,6 @@ static inline void __free_one_page(struct page *page,
__mod_zone_page_state(zone, NR_FREE_PAGES, order_size); __mod_zone_page_state(zone, NR_FREE_PAGES, order_size);
while (order < MAX_ORDER-1) { while (order < MAX_ORDER-1) {
unsigned long combined_idx; unsigned long combined_idx;
struct free_area *area;
struct page *buddy; struct page *buddy;
buddy = __page_find_buddy(page, page_idx, order); buddy = __page_find_buddy(page, page_idx, order);
...@@ -432,8 +448,7 @@ static inline void __free_one_page(struct page *page, ...@@ -432,8 +448,7 @@ static inline void __free_one_page(struct page *page,
break; /* Move the buddy up one level. */ break; /* Move the buddy up one level. */
list_del(&buddy->lru); list_del(&buddy->lru);
area = zone->free_area + order; zone->free_area[order].nr_free--;
area->nr_free--;
rmv_page_order(buddy); rmv_page_order(buddy);
combined_idx = __find_combined_index(page_idx, order); combined_idx = __find_combined_index(page_idx, order);
page = page + (combined_idx - page_idx); page = page + (combined_idx - page_idx);
...@@ -441,7 +456,8 @@ static inline void __free_one_page(struct page *page, ...@@ -441,7 +456,8 @@ static inline void __free_one_page(struct page *page,
order++; order++;
} }
set_page_order(page, order); set_page_order(page, order);
list_add(&page->lru, &zone->free_area[order].free_list); list_add(&page->lru,
&zone->free_area[order].free_list[migratetype]);
zone->free_area[order].nr_free++; zone->free_area[order].nr_free++;
} }
...@@ -575,7 +591,8 @@ void fastcall __init __free_pages_bootmem(struct page *page, unsigned int order) ...@@ -575,7 +591,8 @@ void fastcall __init __free_pages_bootmem(struct page *page, unsigned int order)
* -- wli * -- wli
*/ */
static inline void expand(struct zone *zone, struct page *page, static inline void expand(struct zone *zone, struct page *page,
int low, int high, struct free_area *area) int low, int high, struct free_area *area,
int migratetype)
{ {
unsigned long size = 1 << high; unsigned long size = 1 << high;
...@@ -584,7 +601,7 @@ static inline void expand(struct zone *zone, struct page *page, ...@@ -584,7 +601,7 @@ static inline void expand(struct zone *zone, struct page *page,
high--; high--;
size >>= 1; size >>= 1;
VM_BUG_ON(bad_range(zone, &page[size])); VM_BUG_ON(bad_range(zone, &page[size]));
list_add(&page[size].lru, &area->free_list); list_add(&page[size].lru, &area->free_list[migratetype]);
area->nr_free++; area->nr_free++;
set_page_order(&page[size], high); set_page_order(&page[size], high);
} }
...@@ -636,31 +653,95 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags) ...@@ -636,31 +653,95 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
return 0; return 0;
} }
/*
* This array describes the order lists are fallen back to when
* the free lists for the desirable migrate type are depleted
*/
static int fallbacks[MIGRATE_TYPES][MIGRATE_TYPES-1] = {
[MIGRATE_UNMOVABLE] = { MIGRATE_MOVABLE },
[MIGRATE_MOVABLE] = { MIGRATE_UNMOVABLE },
};
/* Remove an element from the buddy allocator from the fallback list */
static struct page *__rmqueue_fallback(struct zone *zone, int order,
int start_migratetype)
{
struct free_area * area;
int current_order;
struct page *page;
int migratetype, i;
/* Find the largest possible block of pages in the other list */
for (current_order = MAX_ORDER-1; current_order >= order;
--current_order) {
for (i = 0; i < MIGRATE_TYPES - 1; i++) {
migratetype = fallbacks[start_migratetype][i];
area = &(zone->free_area[current_order]);
if (list_empty(&area->free_list[migratetype]))
continue;
page = list_entry(area->free_list[migratetype].next,
struct page, lru);
area->nr_free--;
/*
* If breaking a large block of pages, place the buddies
* on the preferred allocation list
*/
if (unlikely(current_order >= MAX_ORDER / 2))
migratetype = start_migratetype;
/* Remove the page from the freelists */
list_del(&page->lru);
rmv_page_order(page);
__mod_zone_page_state(zone, NR_FREE_PAGES,
-(1UL << order));
if (current_order == MAX_ORDER - 1)
set_pageblock_migratetype(page,
start_migratetype);
expand(zone, page, order, current_order, area, migratetype);
return page;
}
}
return NULL;
}
/* /*
* Do the hard work of removing an element from the buddy allocator. * Do the hard work of removing an element from the buddy allocator.
* Call me with the zone->lock already held. * Call me with the zone->lock already held.
*/ */
static struct page *__rmqueue(struct zone *zone, unsigned int order) static struct page *__rmqueue(struct zone *zone, unsigned int order,
int migratetype)
{ {
struct free_area * area; struct free_area * area;
unsigned int current_order; unsigned int current_order;
struct page *page; struct page *page;
/* Find a page of the appropriate size in the preferred list */
for (current_order = order; current_order < MAX_ORDER; ++current_order) { for (current_order = order; current_order < MAX_ORDER; ++current_order) {
area = zone->free_area + current_order; area = &(zone->free_area[current_order]);
if (list_empty(&area->free_list)) if (list_empty(&area->free_list[migratetype]))
continue; continue;
page = list_entry(area->free_list.next, struct page, lru); page = list_entry(area->free_list[migratetype].next,
struct page, lru);
list_del(&page->lru); list_del(&page->lru);
rmv_page_order(page); rmv_page_order(page);
area->nr_free--; area->nr_free--;
__mod_zone_page_state(zone, NR_FREE_PAGES, - (1UL << order)); __mod_zone_page_state(zone, NR_FREE_PAGES, - (1UL << order));
expand(zone, page, order, current_order, area); expand(zone, page, order, current_order, area, migratetype);
return page; goto got_page;
} }
return NULL; page = __rmqueue_fallback(zone, order, migratetype);
got_page:
return page;
} }
/* /*
...@@ -669,13 +750,14 @@ static struct page *__rmqueue(struct zone *zone, unsigned int order) ...@@ -669,13 +750,14 @@ static struct page *__rmqueue(struct zone *zone, unsigned int order)
* Returns the number of new pages which were placed at *list. * Returns the number of new pages which were placed at *list.
*/ */
static int rmqueue_bulk(struct zone *zone, unsigned int order, static int rmqueue_bulk(struct zone *zone, unsigned int order,
unsigned long count, struct list_head *list) unsigned long count, struct list_head *list,
int migratetype)
{ {
int i; int i;
spin_lock(&zone->lock); spin_lock(&zone->lock);
for (i = 0; i < count; ++i) { for (i = 0; i < count; ++i) {
struct page *page = __rmqueue(zone, order); struct page *page = __rmqueue(zone, order, migratetype);
if (unlikely(page == NULL)) if (unlikely(page == NULL))
break; break;
list_add_tail(&page->lru, list); list_add_tail(&page->lru, list);
...@@ -740,7 +822,7 @@ void mark_free_pages(struct zone *zone) ...@@ -740,7 +822,7 @@ void mark_free_pages(struct zone *zone)
{ {
unsigned long pfn, max_zone_pfn; unsigned long pfn, max_zone_pfn;
unsigned long flags; unsigned long flags;
int order; int order, t;
struct list_head *curr; struct list_head *curr;
if (!zone->spanned_pages) if (!zone->spanned_pages)
...@@ -757,15 +839,15 @@ void mark_free_pages(struct zone *zone) ...@@ -757,15 +839,15 @@ void mark_free_pages(struct zone *zone)
swsusp_unset_page_free(page); swsusp_unset_page_free(page);
} }
for (order = MAX_ORDER - 1; order >= 0; --order) for_each_migratetype_order(order, t) {
list_for_each(curr, &zone->free_area[order].free_list) { list_for_each(curr, &zone->free_area[order].free_list[t]) {
unsigned long i; unsigned long i;
pfn = page_to_pfn(list_entry(curr, struct page, lru)); pfn = page_to_pfn(list_entry(curr, struct page, lru));
for (i = 0; i < (1UL << order); i++) for (i = 0; i < (1UL << order); i++)
swsusp_set_page_free(pfn_to_page(pfn + i)); swsusp_set_page_free(pfn_to_page(pfn + i));
} }
}
spin_unlock_irqrestore(&zone->lock, flags); spin_unlock_irqrestore(&zone->lock, flags);
} }
...@@ -854,6 +936,7 @@ static struct page *buffered_rmqueue(struct zonelist *zonelist, ...@@ -854,6 +936,7 @@ static struct page *buffered_rmqueue(struct zonelist *zonelist,
struct page *page; struct page *page;
int cold = !!(gfp_flags & __GFP_COLD); int cold = !!(gfp_flags & __GFP_COLD);
int cpu; int cpu;
int migratetype = gfpflags_to_migratetype(gfp_flags);
again: again:
cpu = get_cpu(); cpu = get_cpu();
...@@ -864,7 +947,7 @@ again: ...@@ -864,7 +947,7 @@ again:
local_irq_save(flags); local_irq_save(flags);
if (!pcp->count) { if (!pcp->count) {
pcp->count = rmqueue_bulk(zone, 0, pcp->count = rmqueue_bulk(zone, 0,
pcp->batch, &pcp->list); pcp->batch, &pcp->list, migratetype);
if (unlikely(!pcp->count)) if (unlikely(!pcp->count))
goto failed; goto failed;
} }
...@@ -873,7 +956,7 @@ again: ...@@ -873,7 +956,7 @@ again:
pcp->count--; pcp->count--;
} else { } else {
spin_lock_irqsave(&zone->lock, flags); spin_lock_irqsave(&zone->lock, flags);
page = __rmqueue(zone, order); page = __rmqueue(zone, order, migratetype);
spin_unlock(&zone->lock); spin_unlock(&zone->lock);
if (!page) if (!page)
goto failed; goto failed;
...@@ -2233,6 +2316,16 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, ...@@ -2233,6 +2316,16 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
init_page_count(page); init_page_count(page);
reset_page_mapcount(page); reset_page_mapcount(page);
SetPageReserved(page); SetPageReserved(page);
/*
* Mark the block movable so that blocks are reserved for
* movable at startup. This will force kernel allocations
* to reserve their blocks rather than leaking throughout
* the address space during boot when many long-lived
* kernel allocations are made
*/
set_pageblock_migratetype(page, MIGRATE_MOVABLE);
INIT_LIST_HEAD(&page->lru); INIT_LIST_HEAD(&page->lru);
#ifdef WANT_PAGE_VIRTUAL #ifdef WANT_PAGE_VIRTUAL
/* The shift won't overflow because ZONE_NORMAL is below 4G. */ /* The shift won't overflow because ZONE_NORMAL is below 4G. */
...@@ -2245,9 +2338,9 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, ...@@ -2245,9 +2338,9 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
static void __meminit zone_init_free_lists(struct pglist_data *pgdat, static void __meminit zone_init_free_lists(struct pglist_data *pgdat,
struct zone *zone, unsigned long size) struct zone *zone, unsigned long size)
{ {
int order; int order, t;
for (order = 0; order < MAX_ORDER ; order++) { for_each_migratetype_order(order, t) {
INIT_LIST_HEAD(&zone->free_area[order].free_list); INIT_LIST_HEAD(&zone->free_area[order].free_list[t]);
zone->free_area[order].nr_free = 0; zone->free_area[order].nr_free = 0;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment