1 files changed, 38 insertions, 9 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d1cf4f05dcda..bdd5c432c426 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -45,6 +45,7 @@
 #include <linux/fault-inject.h>
 #include <linux/page-isolation.h>
 #include <linux/memcontrol.h>
+#include <linux/debugobjects.h>
 
 #include <asm/tlbflush.h>
 #include <asm/div64.h>
@@ -532,8 +533,11 @@ static void __free_pages_ok(struct page *page, unsigned int order)
         if (reserved)
                 return;
 
-        if (!PageHighMem(page))
+        if (!PageHighMem(page)) {
                 debug_check_no_locks_freed(page_address(page),PAGE_SIZE<<order);
+                debug_check_no_obj_freed(page_address(page),
+                                           PAGE_SIZE << order);
+        }
         arch_free_page(page, order);
         kernel_map_pages(page, 1 << order, 0);
 
@@ -995,8 +999,10 @@ static void free_hot_cold_page(struct page *page, int cold)
         if (free_pages_check(page))
                 return;
 
-        if (!PageHighMem(page))
+        if (!PageHighMem(page)) {
                 debug_check_no_locks_freed(page_address(page), PAGE_SIZE);
+                debug_check_no_obj_freed(page_address(page), PAGE_SIZE);
+        }
         arch_free_page(page, 0);
         kernel_map_pages(page, 1, 0);
 
@@ -1461,7 +1467,8 @@ __alloc_pages_internal(gfp_t gfp_mask, unsigned int order,
         struct task_struct *p = current;
         int do_retry;
         int alloc_flags;
-        int did_some_progress;
+        unsigned long did_some_progress;
+        unsigned long pages_reclaimed = 0;
 
         might_sleep_if(wait);
 
@@ -1611,14 +1618,26 @@ nofail_alloc:
          * Don't let big-order allocations loop unless the caller explicitly
          * requests that.  Wait for some write requests to complete then retry.
          *
-         * In this implementation, __GFP_REPEAT means __GFP_NOFAIL for order
-         * <= 3, but that may not be true in other implementations.
+         * In this implementation, order <= PAGE_ALLOC_COSTLY_ORDER
+         * means __GFP_NOFAIL, but that may not be true in other
+         * implementations.
+         *
+         * For order > PAGE_ALLOC_COSTLY_ORDER, if __GFP_REPEAT is
+         * specified, then we retry until we no longer reclaim any pages
+         * (above), or we've reclaimed an order of pages at least as
+         * large as the allocation's order. In both cases, if the
+         * allocation still fails, we stop retrying.
          */
+        pages_reclaimed += did_some_progress;
         do_retry = 0;
         if (!(gfp_mask & __GFP_NORETRY)) {
-                if ((order <= PAGE_ALLOC_COSTLY_ORDER) ||
-                                                (gfp_mask & __GFP_REPEAT))
+                if (order <= PAGE_ALLOC_COSTLY_ORDER) {
                         do_retry = 1;
+                } else {
+                        if (gfp_mask & __GFP_REPEAT &&
+                                pages_reclaimed < (1 << order))
+                                        do_retry = 1;
+                }
                 if (gfp_mask & __GFP_NOFAIL)
                         do_retry = 1;
         }
@@ -2524,7 +2543,9 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
         struct page *page;
         unsigned long end_pfn = start_pfn + size;
         unsigned long pfn;
+        struct zone *z;
 
+        z = &NODE_DATA(nid)->node_zones[zone];
         for (pfn = start_pfn; pfn < end_pfn; pfn++) {
                 /*
                  * There can be holes in boot-time mem_map[]s
@@ -2542,7 +2563,6 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
                 init_page_count(page);
                 reset_page_mapcount(page);
                 SetPageReserved(page);
-
                 /*
                  * Mark the block movable so that blocks are reserved for
                  * movable at startup. This will force kernel allocations
@@ -2551,8 +2571,15 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
                  * kernel allocations are made. Later some blocks near
                  * the start are marked MIGRATE_RESERVE by
                  * setup_zone_migrate_reserve()
+                 *
+                 * bitmap is created for zone's valid pfn range. but memmap
+                 * can be created for invalid pages (for alignment)
+                 * check here not to call set_pageblock_migratetype() against
+                 * pfn out of zone.
                  */
-                if ((pfn & (pageblock_nr_pages-1)))
+                if ((z->zone_start_pfn <= pfn)
+                    && (pfn < z->zone_start_pfn + z->spanned_pages)
+                    && !(pfn & (pageblock_nr_pages - 1)))
                         set_pageblock_migratetype(page, MIGRATE_MOVABLE);
 
                 INIT_LIST_HEAD(&page->lru);
@@ -4464,6 +4491,8 @@ void set_pageblock_flags_group(struct page *page, unsigned long flags,
         pfn = page_to_pfn(page);
         bitmap = get_pageblock_bitmap(zone, pfn);
         bitidx = pfn_to_bitidx(zone, pfn);
+        VM_BUG_ON(pfn < zone->zone_start_pfn);
+        VM_BUG_ON(pfn >= zone->zone_start_pfn + zone->spanned_pages);
 
         for (; start_bitidx <= end_bitidx; start_bitidx++, value <<= 1)
                 if (flags & value)