diff options
author | Hugh Dickins <hugh@veritas.com> | 2009-01-06 17:40:09 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 18:59:07 -0500 |
commit | 22b31eec63e5f2e219a3ee15f456897272bc73e8 (patch) | |
tree | 906e4975a0e2cdef15ef071b4890e3b28e36cf39 /mm/page_alloc.c | |
parent | 3dc147414ccad81dc33edb80774b1fed12a38c08 (diff) |
badpage: vm_normal_page use print_bad_pte
print_bad_pte() is so far being called only when zap_pte_range() finds
negative page_mapcount, or there's a fault on a pte_file where it does not
belong. That's weak coverage when we suspect pagetable corruption.
Originally, it was called when vm_normal_page() found an invalid pfn: but
pfn_valid is expensive on some architectures and configurations, so 2.6.24
put that under CONFIG_DEBUG_VM (which doesn't help in the field), then
2.6.26 replaced it by a VM_BUG_ON (likewise).
Reinstate the print_bad_pte() in vm_normal_page(), but use a cheaper test
than pfn_valid(): memmap_init_zone() (used in bootup and hotplug) keep a
__read_mostly note of the highest_memmap_pfn, vm_normal_page() then check
pfn against that. We could call this pfn_plausible() or pfn_sane(), but I
doubt we'll need it elsewhere: of course it's not reliable, but gives much
stronger pagetable validation on many boxes.
Also use print_bad_pte() when the pte_special bit is found outside a
VM_PFNMAP or VM_MIXEDMAP area, instead of VM_BUG_ON.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 3acb216e9a78..755c99a0ac71 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -69,6 +69,7 @@ EXPORT_SYMBOL(node_states); | |||
69 | 69 | ||
70 | unsigned long totalram_pages __read_mostly; | 70 | unsigned long totalram_pages __read_mostly; |
71 | unsigned long totalreserve_pages __read_mostly; | 71 | unsigned long totalreserve_pages __read_mostly; |
72 | unsigned long highest_memmap_pfn __read_mostly; | ||
72 | int percpu_pagelist_fraction; | 73 | int percpu_pagelist_fraction; |
73 | 74 | ||
74 | #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE | 75 | #ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE |
@@ -2597,6 +2598,9 @@ void __meminit memmap_init_zone(unsigned long size, int nid, unsigned long zone, | |||
2597 | unsigned long pfn; | 2598 | unsigned long pfn; |
2598 | struct zone *z; | 2599 | struct zone *z; |
2599 | 2600 | ||
2601 | if (highest_memmap_pfn < end_pfn - 1) | ||
2602 | highest_memmap_pfn = end_pfn - 1; | ||
2603 | |||
2600 | z = &NODE_DATA(nid)->node_zones[zone]; | 2604 | z = &NODE_DATA(nid)->node_zones[zone]; |
2601 | for (pfn = start_pfn; pfn < end_pfn; pfn++) { | 2605 | for (pfn = start_pfn; pfn < end_pfn; pfn++) { |
2602 | /* | 2606 | /* |