[tip:,x86/entry] x86/hyperv: Use the correct target for alloc_intr_gate()
diff mbox series

Message ID 159066080714.17951.8989624032770050231.tip-bot2@tip-bot2
State In Next
Commit 3346561998e8a30f818cda8ae230e42ced4fda51
Headers show
  • [tip:,x86/entry] x86/hyperv: Use the correct target for alloc_intr_gate()
Related show

Commit Message

tip-bot2 for Peter Zijlstra May 28, 2020, 10:13 a.m. UTC
The following commit has been merged into the x86/entry branch of tip:

Commit-ID:     4bcffde74b6a2ba992a0617bb6b9be054e7f89a2
Gitweb:        https://git.kernel.org/tip/4bcffde74b6a2ba992a0617bb6b9be054e7f89a2
Author:        Wei Liu <wei.liu@kernel.org>
AuthorDate:    Wed, 27 May 2020 12:09:18 
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 28 May 2020 12:01:24 +02:00

x86/hyperv: Use the correct target for alloc_intr_gate()

The idtentry rework causes a boot crash, by erroneously using the C entry
point to allocate the interrupt gate for the HYPERVISOR_CALLBACK_VECTOR.

Use the ASM entry point to cure this.

[ tglx: Changelog as it was too late to fold in ]

Fixes: 824ad0f5f390 ("x86/entry: Convert various hypervisor vectors to IDTENTRY_SYSVEC")
Reported-by: Boqun Feng <boqun.feng@gmail.com> 
Signed-off-by: Wei Liu <wei.liu@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Boqun Feng <boqun.feng@gmail.com> 
Link: https://lkml.kernel.org/r/20200527120918.ly5vuhvxzqesdt6j@liuwe-devbox-debian-v2.j3c5onc20sse1dnehy4noqpfcg.zx.internal.cloudapp.net

 arch/x86/kernel/cpu/mshyperv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index a103e1c..af94f05 100644
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -327,7 +327,7 @@  static void __init ms_hyperv_init_platform(void)
 	x86_platform.apic_post_init = hyperv_init;
 	/* Setup the IDT for hypervisor callback */
-	alloc_intr_gate(HYPERVISOR_CALLBACK_VECTOR, sysvec_hyperv_callback);
+	alloc_intr_gate(HYPERVISOR_CALLBACK_VECTOR, asm_sysvec_hyperv_callback);
 	/* Setup the IDT for reenlightenment notifications */
 	if (ms_hyperv.features & HV_X64_ACCESS_REENLIGHTENMENT) {