[PATCH] x86-64: build-time checking

o X86_64 kernel should run from 2MB aligned address for two reasons.
	- Performance.
	- For relocatable kernels, page tables are updated based on difference
	  between compile time address and load time physical address.
	  This difference should be multiple of 2MB as kernel text and data
	  is mapped using 2MB pages and PMD should be pointing to a 2MB
	  aligned address. Life is simpler if both compile time and load time
	  kernel addresses are 2MB aligned.

o Flag the error at compile time if one is trying to build a kernel which
  does not meet alignment restrictions.

Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/x86_64/boot/compressed/misc.c b/arch/x86_64/boot/compressed/misc.c
index fee54dbf17496f3619dadf1d2e4bd426155673a6..fed1167159c342a3bda42fd560eda1b7537711fb 100644 (file)
--- a/arch/x86_64/boot/compressed/misc.c
+++ b/arch/x86_64/boot/compressed/misc.c
@@ -358,7 +358,7 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long heap,
        insize = input_len;
        inptr  = 0;
 
-       if ((ulg)output & 0x1fffffUL)
+       if ((ulg)output & (__KERNEL_ALIGN - 1))
                error("Destination address not 2M aligned");
        if ((ulg)output >= 0xffffffffffUL)
                error("Destination address too large");

diff --git a/arch/x86_64/kernel/head64.c b/arch/x86_64/kernel/head64.c
index 6c34bdd22e2634df6bdb41cc1db8aba482ddf33f..213d90e047550e9d2d348aa28e855d94730781ca 100644 (file)
--- a/arch/x86_64/kernel/head64.c
+++ b/arch/x86_64/kernel/head64.c
@@ -62,6 +62,13 @@ void __init x86_64_start_kernel(char * real_mode_data)
 {
        int i;
 
+       /*
+        * Make sure kernel is aligned to 2MB address. Catching it at compile
+        * time is better. Change your config file and compile the kernel
+        * for a 2MB aligned address (CONFIG_PHYSICAL_START)
+        */
+       BUILD_BUG_ON(CONFIG_PHYSICAL_START & (__KERNEL_ALIGN - 1));
+
        /* clear bss before set_intr_gate with early_idt_handler */
        clear_bss();
 

diff --git a/include/asm-x86_64/page.h b/include/asm-x86_64/page.h
index 40a24d0df09025b4eb0330ae3f8e514ae44f1392..b17fc16ec2eb70395a2f37d4445018310cabfb02 100644 (file)
--- a/include/asm-x86_64/page.h
+++ b/include/asm-x86_64/page.h
@@ -78,6 +78,7 @@ extern unsigned long phys_base;
 #endif /* !__ASSEMBLY__ */
 
 #define __PHYSICAL_START       CONFIG_PHYSICAL_START
+#define __KERNEL_ALIGN         0x200000
 #define __START_KERNEL         (__START_KERNEL_map + __PHYSICAL_START)
 #define __START_KERNEL_map     0xffffffff80000000
 #define __PAGE_OFFSET           0xffff810000000000