Merge commit 'v2.6.29-rc1' into tracing/urgent

1 files changed, 72 insertions, 71 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d8ac01474563..5675b3073854 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -69,7 +69,7 @@ EXPORT_SYMBOL(node_states);
 
 unsigned long totalram_pages __read_mostly;
 unsigned long totalreserve_pages __read_mostly;
-long nr_swap_pages;
+unsigned long highest_memmap_pfn __read_mostly;
 int percpu_pagelist_fraction;
 
 #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
@@ -223,19 +223,41 @@ static inline int bad_range(struct zone *zone, struct page *page)
 
 static void bad_page(struct page *page)
 {
-        printk(KERN_EMERG "Bad page state in process '%s'\n" KERN_EMERG
-                "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n",
-                current->comm, page, (int)(2*sizeof(unsigned long)),
-                (unsigned long)page->flags, page->mapping,
-                page_mapcount(page), page_count(page));
+        static unsigned long resume;
+        static unsigned long nr_shown;
+        static unsigned long nr_unshown;
+
+        /*
+         * Allow a burst of 60 reports, then keep quiet for that minute;
+         * or allow a steady drip of one report per second.
+         */
+        if (nr_shown == 60) {
+                if (time_before(jiffies, resume)) {
+                        nr_unshown++;
+                        goto out;
+                }
+                if (nr_unshown) {
+                        printk(KERN_ALERT
+                              "BUG: Bad page state: %lu messages suppressed\n",
+                                nr_unshown);
+                        nr_unshown = 0;
+                }
+                nr_shown = 0;
+        }
+        if (nr_shown++ == 0)
+                resume = jiffies + 60 * HZ;
+
+        printk(KERN_ALERT "BUG: Bad page state in process %s  pfn:%05lx\n",
+                current->comm, page_to_pfn(page));
+        printk(KERN_ALERT
+                "page:%p flags:%p count:%d mapcount:%d mapping:%p index:%lx\n",
+                page, (void *)page->flags, page_count(page),
+                page_mapcount(page), page->mapping, page->index);
 
-        printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n"
-                KERN_EMERG "Backtrace:\n");
         dump_stack();
-        page->flags &= ~PAGE_FLAGS_CLEAR_WHEN_BAD;
-        set_page_count(page, 0);
-        reset_page_mapcount(page);
-        page->mapping = NULL;
+out:
+        /* Leave bad fields for debug, except PageBuddy could make trouble */
+        __ClearPageBuddy(page);
         add_taint(TAINT_BAD_PAGE);
 }
 
@@ -292,25 +314,31 @@ void prep_compound_gigantic_page(struct page *page, unsigned long order)
 }
 #endif
 
-static void destroy_compound_page(struct page *page, unsigned long order)
+static int destroy_compound_page(struct page *page, unsigned long order)
 {
         int i;
         int nr_pages = 1 << order;
+        int bad = 0;
 
-        if (unlikely(compound_order(page) != order))
+        if (unlikely(compound_order(page) != order) ||
+            unlikely(!PageHead(page))) {
                 bad_page(page);
+                bad++;
+        }
 
-        if (unlikely(!PageHead(page)))
-                        bad_page(page);
         __ClearPageHead(page);
+
         for (i = 1; i < nr_pages; i++) {
                 struct page *p = page + i;
 
-                if (unlikely(!PageTail(p) |
-                                (p->first_page != page)))
+                if (unlikely(!PageTail(p) | (p->first_page != page))) {
                         bad_page(page);
+                        bad++;
+                }
                 __ClearPageTail(p);
         }
+
+        return bad;
 }
 
 static inline void prep_zero_page(struct page *page, int order, gfp_t gfp_flags)
@@ -430,7 +458,8 @@ static inline void __free_one_page(struct page *page,
         int migratetype = get_pageblock_migratetype(page);
 
         if (unlikely(PageCompound(page)))
-                destroy_compound_page(page, order);
+                if (unlikely(destroy_compound_page(page, order)))
+                        return;
 
         page_idx = page_to_pfn(page) & ((1 << MAX_ORDER) - 1);
 
@@ -467,18 +496,13 @@ static inline int free_pages_check(struct page *page)
         if (unlikely(page_mapcount(page) |
                 (page->mapping != NULL)  |
                 (page_count(page) != 0)  |
-                (page->flags & PAGE_FLAGS_CHECK_AT_FREE)))
+                (page->flags & PAGE_FLAGS_CHECK_AT_FREE))) {
                 bad_page(page);
-        if (PageDirty(page))
-                __ClearPageDirty(page);
-        if (PageSwapBacked(page))
-                __ClearPageSwapBacked(page);
-        /*
-         * For now, we report if PG_reserved was found set, but do not
-         * clear it, and do not free the page.  But we shall soon need
-         * to do more, for when the ZERO_PAGE count wraps negative.
-         */
-        return PageReserved(page);
+                return 1;
+        }
+        if (page->flags & PAGE_FLAGS_CHECK_AT_PREP)
+                page->flags &= ~PAGE_FLAGS_CHECK_AT_PREP;
+        return 0;
 }
 
 /*
@@ -523,11 +547,11 @@ static void __free_pages_ok(struct page *page, unsigned int order)
 {
         unsigned long flags;
         int i;
-        int reserved = 0;
+        int bad = 0;
 
         for (i = 0 ; i < (1 << order) ; ++i)
-                reserved += free_pages_check(page + i);
-        if (reserved)
+                bad += free_pages_check(page + i);
+        if (bad)
                 return;
 
         if (!PageHighMem(page)) {
@@ -612,23 +636,11 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
         if (unlikely(page_mapcount(page) |
                 (page->mapping != NULL)  |
                 (page_count(page) != 0)  |
-                (page->flags & PAGE_FLAGS_CHECK_AT_PREP)))
+                (page->flags & PAGE_FLAGS_CHECK_AT_PREP))) {
                 bad_page(page);
-
-        /*
-         * For now, we report if PG_reserved was found set, but do not
-         * clear it, and do not allocate the page: as a safety net.
-         */
-        if (PageReserved(page))
                 return 1;
+        }
 
-        page->flags &= ~(1 << PG_uptodate | 1 << PG_error | 1 << PG_reclaim |
-                        1 << PG_referenced | 1 << PG_arch_1 |
-                        1 << PG_owner_priv_1 | 1 << PG_mappedtodisk
-#ifdef CONFIG_UNEVICTABLE_LRU
-                        | 1 << PG_mlocked
-#endif
-                        );
         set_page_private(page, 0);
         set_page_refcounted(page);
 
@@ -2609,6 +2621,9 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
         unsigned long pfn;
         struct zone *z;
 
+        if (highest_memmap_pfn < end_pfn - 1)
+                highest_memmap_pfn = end_pfn - 1;
+
         z = &NODE_DATA(nid)->node_zones[zone];
         for (pfn = start_pfn; pfn < end_pfn; pfn++) {
                 /*
@@ -3381,10 +3396,8 @@ static void __init setup_usemap(struct pglist_data *pgdat,
 {
         unsigned long usemapsize = usemap_size(zonesize);
         zone->pageblock_flags = NULL;
-        if (usemapsize) {
+        if (usemapsize)
                 zone->pageblock_flags = alloc_bootmem_node(pgdat, usemapsize);
-                memset(zone->pageblock_flags, 0, usemapsize);
-        }
 }
 #else
 static void inline setup_usemap(struct pglist_data *pgdat,
@@ -3469,9 +3482,10 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat,
                         PAGE_ALIGN(size * sizeof(struct page)) >> PAGE_SHIFT;
                 if (realsize >= memmap_pages) {
                         realsize -= memmap_pages;
-                        printk(KERN_DEBUG
-                                "  %s zone: %lu pages used for memmap\n",
-                                zone_names[j], memmap_pages);
+                        if (memmap_pages)
+                                printk(KERN_DEBUG
+                                       "  %s zone: %lu pages used for memmap\n",
+                                       zone_names[j], memmap_pages);
                 } else
                         printk(KERN_WARNING
                                 "  %s zone: %lu pages exceeds realsize %lu\n",
@@ -3509,10 +3523,10 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat,
                         INIT_LIST_HEAD(&zone->lru[l].list);
                         zone->lru[l].nr_scan = 0;
                 }
-                zone->recent_rotated[0] = 0;
-                zone->recent_rotated[1] = 0;
-                zone->recent_scanned[0] = 0;
-                zone->recent_scanned[1] = 0;
+                zone->reclaim_stat.recent_rotated[0] = 0;
+                zone->reclaim_stat.recent_rotated[1] = 0;
+                zone->reclaim_stat.recent_scanned[0] = 0;
+                zone->reclaim_stat.recent_scanned[1] = 0;
                 zap_zone_vm_stats(zone);
                 zone->flags = 0;
                 if (!size)
@@ -4316,7 +4330,7 @@ void setup_per_zone_pages_min(void)
  *    1TB     101        10GB
  *   10TB     320        32GB
  */
-void setup_per_zone_inactive_ratio(void)
+static void setup_per_zone_inactive_ratio(void)
 {
         struct zone *zone;
 
@@ -4573,19 +4587,6 @@ void *__init alloc_large_system_hash(const char *tablename,
         return table;
 }
 
-#ifdef CONFIG_OUT_OF_LINE_PFN_TO_PAGE
-struct page *pfn_to_page(unsigned long pfn)
-{
-        return __pfn_to_page(pfn);
-}
-unsigned long page_to_pfn(struct page *page)
-{
-        return __page_to_pfn(page);
-}
-EXPORT_SYMBOL(pfn_to_page);
-EXPORT_SYMBOL(page_to_pfn);
-#endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */
-
 /* Return a pointer to the bitmap storing bits affecting a block of pages */
 static inline unsigned long *get_pageblock_bitmap(struct zone *zone,
                                                         unsigned long pfn)