leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
-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@elte.hu>
This commit is contained in:
Ingo Molnar 2008-07-21 10:57:15 +02:00
parent e27772b48d
commit 33a37eb411
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/asm-x86/kvm_host.h
View File

@ -703,9 +703,11 @@ enum {
vcpu, 0, 0, 0, 0, 0, 0) vcpu, 0, 0, 0, 0, 0, 0)
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
#define KVM_EX_ENTRY ".quad" # define KVM_EX_ENTRY ".quad"
# define KVM_EX_PUSH "pushq"
#else #else
#define KVM_EX_ENTRY ".long" # define KVM_EX_ENTRY ".long"
# define KVM_EX_PUSH "pushl"
#endif #endif
/* /*
@ -719,7 +721,7 @@ asmlinkage void kvm_handle_fault_on_reboot(void);
"666: " insn "\n\t" \ "666: " insn "\n\t" \
".pushsection .text.fixup, \"ax\" \n" \ ".pushsection .text.fixup, \"ax\" \n" \
"667: \n\t" \ "667: \n\t" \
"push $666b \n\t" \ KVM_EX_PUSH " $666b \n\t" \
"jmp kvm_handle_fault_on_reboot \n\t" \ "jmp kvm_handle_fault_on_reboot \n\t" \
".popsection \n\t" \ ".popsection \n\t" \
".pushsection __ex_table, \"a\" \n\t" \ ".pushsection __ex_table, \"a\" \n\t" \