[patch] KVM: fix exception entry / build bug, on 64-bit

[Ingo Molnar]

hi Avi,

* Avi Kivity <avi@xxxxxxxxxxxx> wrote:

>       KVM: Handle virtualization instruction #UD faults during reboot

-tip testing found a build failure on 64-bit x86, caused by this commit. 
Find the fix below.

Thanks,

	Ingo

-------------------->
commit 33a37eb411d193851c334060780ab834ba534292
Author: Ingo Molnar <mingo@xxxxxxx>
Date:   Mon Jul 21 10:57:15 2008 +0200

    KVM: fix exception entry / build bug, on 64-bit
    
    -tip testing found this build bug:
    
     arch/x86/kvm/built-in.o:(.text.fixup+0x1): relocation truncated to fit: R_X86_64_32 against `.text'
     arch/x86/kvm/built-in.o:(.text.fixup+0xb): relocation truncated to fit: R_X86_64_32 against `.text'
     arch/x86/kvm/built-in.o:(.text.fixup+0x15): relocation truncated to fit: R_X86_64_32 against `.text'
     arch/x86/kvm/built-in.o:(.text.fixup+0x1f): relocation truncated to fit: R_X86_64_32 against `.text'
     arch/x86/kvm/built-in.o:(.text.fixup+0x29): relocation truncated to fit: R_X86_64_32 against `.text'
    
    Introduced by commit 4ecac3fd. The problem is that 'push' will default
    to 32-bit, which is not wide enough as a fixup address. (and which would
    crash on any real fixup event even if it was wide enough)
    
    Introduce KVM_EX_PUSH to get the proper address push width on 64-bit too.
    
    Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
 include/asm-x86/kvm_host.h |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h
index f995783..fdde0be 100644
--- a/include/asm-x86/kvm_host.h
+++ b/include/asm-x86/kvm_host.h
@@ -703,9 +703,11 @@ enum {
 						vcpu, 0, 0, 0, 0, 0, 0)
 
 #ifdef CONFIG_64BIT
-#define KVM_EX_ENTRY ".quad"
+# define KVM_EX_ENTRY ".quad"
+# define KVM_EX_PUSH "pushq"
 #else
-#define KVM_EX_ENTRY ".long"
+# define KVM_EX_ENTRY ".long"
+# define KVM_EX_PUSH "pushl"
 #endif
 
 /*
@@ -719,7 +721,7 @@ asmlinkage void kvm_handle_fault_on_reboot(void);
 	"666: " insn "\n\t" \
 	".pushsection .text.fixup, \"ax\" \n" \
 	"667: \n\t" \
-	"push $666b \n\t" \
+	KVM_EX_PUSH " $666b \n\t" \
 	"jmp kvm_handle_fault_on_reboot \n\t" \
 	".popsection \n\t" \
 	".pushsection __ex_table, \"a\" \n\t" \
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/