aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2008-06-12 07:56:40 -0400
committerIngo Molnar <mingo@elte.hu>2008-06-19 07:31:42 -0400
commit59ea746337c69f6a5f1bc4d5e8544b3cbf12f801 (patch)
tree118c9c69eb8a2f6a22c62967ec36288153c87303 /arch/x86/mm
parent952f4a0a9b27e6dbd5d32e330b3f609ebfa0b061 (diff)
MM: virtual address debug
Add some (configurable) expensive sanity checking to catch wrong address translations on x86. - create linux/mmdebug.h file to be able include this file in asm headers to not get unsolvable loops in header files - __phys_addr on x86_32 became a function in ioremap.c since PAGE_OFFSET, is_vmalloc_addr and VMALLOC_* non-constasts are undefined if declared in page_32.h - add __phys_addr_const for initializing doublefault_tss.__cr3 Tested on 386, 386pae, x86_64 and x86_64 numa=fake=2. Contains Andi's enable numa virtual address debug patch. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Andi Kleen <andi@firstfloor.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm')
-rw-r--r--arch/x86/mm/ioremap.c31
1 files changed, 24 insertions, 7 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 2b2bb3f9b683..a78ffef62a2b 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -23,18 +23,26 @@
23 23
24#ifdef CONFIG_X86_64 24#ifdef CONFIG_X86_64
25 25
26unsigned long __phys_addr(unsigned long x) 26static inline int phys_addr_valid(unsigned long addr)
27{ 27{
28 if (x >= __START_KERNEL_map) 28 return addr < (1UL << boot_cpu_data.x86_phys_bits);
29 return x - __START_KERNEL_map + phys_base;
30 return x - PAGE_OFFSET;
31} 29}
32EXPORT_SYMBOL(__phys_addr);
33 30
34static inline int phys_addr_valid(unsigned long addr) 31unsigned long __phys_addr(unsigned long x)
35{ 32{
36 return addr < (1UL << boot_cpu_data.x86_phys_bits); 33 if (x >= __START_KERNEL_map) {
34 x -= __START_KERNEL_map;
35 VIRTUAL_BUG_ON(x >= KERNEL_IMAGE_SIZE);
36 x += phys_base;
37 } else {
38 VIRTUAL_BUG_ON(x < PAGE_OFFSET);
39 x -= PAGE_OFFSET;
40 VIRTUAL_BUG_ON(system_state == SYSTEM_BOOTING ? x > MAXMEM :
41 !phys_addr_valid(x));
42 }
43 return x;
37} 44}
45EXPORT_SYMBOL(__phys_addr);
38 46
39#else 47#else
40 48
@@ -43,6 +51,15 @@ static inline int phys_addr_valid(unsigned long addr)
43 return 1; 51 return 1;
44} 52}
45 53
54unsigned long __phys_addr(unsigned long x)
55{
56 /* VMALLOC_* aren't constants; not available at the boot time */
57 VIRTUAL_BUG_ON(x < PAGE_OFFSET || (system_state != SYSTEM_BOOTING &&
58 is_vmalloc_addr((void *)x)));
59 return x - PAGE_OFFSET;
60}
61EXPORT_SYMBOL(__phys_addr);
62
46#endif 63#endif
47 64
48int page_is_ram(unsigned long pagenr) 65int page_is_ram(unsigned long pagenr)