Commit a16be368 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/entry: Convert various hypervisor vectors to IDTENTRY_SYSVEC 



Convert various hypervisor vectors to IDTENTRY_SYSVEC:

  - Implement the C entry point with DEFINE_IDTENTRY_SYSVEC
  - Emit the ASM stub with DECLARE_IDTENTRY_SYSVEC
  - Remove the ASM idtentries in 64-bit
  - Remove the BUILD_INTERRUPT entries in 32-bit
  - Remove the old prototypes

No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarAndy Lutomirski <luto@kernel.org>
Reviewed-by: default avatarWei Liu <wei.liu@kernel.org>
Link: https://lore.kernel.org/r/20200521202119.647997594@linutronix.de
parent 9c3b1f49

arch/x86/entry/entry_32.S

+0 −14
Original line number Diff line number Diff line
@@ -1345,20 +1345,6 @@ BUILD_INTERRUPT3(xen_hvm_callback_vector, HYPERVISOR_CALLBACK_VECTOR, 
		 xen_evtchn_do_upcall)

#endif





#if IS_ENABLED(CONFIG_HYPERV)



BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,

		 hyperv_vector_handler)



BUILD_INTERRUPT3(hyperv_reenlightenment_vector, HYPERV_REENLIGHTENMENT_VECTOR,

		 hyperv_reenlightenment_intr)



BUILD_INTERRUPT3(hv_stimer0_callback_vector, HYPERV_STIMER0_VECTOR,

		 hv_stimer0_vector_handler)



#endif /* CONFIG_HYPERV */



SYM_CODE_START_LOCAL_NOALIGN(handle_exception)

	/* the function address is in %gs's slot on the stack */

	SAVE_ALL switch_stacks=1 skip_gs=1 unwind_espfix=1

arch/x86/entry/entry_64.S

+0 −17
Original line number Diff line number Diff line
@@ -1116,23 +1116,6 @@ apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \ 
	xen_hvm_callback_vector xen_evtchn_do_upcall

#endif





#if IS_ENABLED(CONFIG_HYPERV)

apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \

	hyperv_callback_vector hyperv_vector_handler



apicinterrupt3 HYPERV_REENLIGHTENMENT_VECTOR \

	hyperv_reenlightenment_vector hyperv_reenlightenment_intr



apicinterrupt3 HYPERV_STIMER0_VECTOR \

	hv_stimer0_callback_vector hv_stimer0_vector_handler

#endif /* CONFIG_HYPERV */



#if IS_ENABLED(CONFIG_ACRN_GUEST)

apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \

	acrn_hv_callback_vector acrn_hv_vector_handler

#endif



/*

 * Save all registers in pt_regs, and switch gs if needed.

 * Use slow, but surefire "are we in kernel?" check.

arch/x86/hyperv/hv_init.c

+3 −6
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <asm/hypervisor.h>

#include <asm/hyperv-tlfs.h>

#include <asm/mshyperv.h>

#include <asm/idtentry.h>

#include <linux/version.h>

#include <linux/vmalloc.h>

#include <linux/mm.h>
@@ -152,15 +153,11 @@ static inline bool hv_reenlightenment_available(void) 
		ms_hyperv.features & HV_X64_ACCESS_REENLIGHTENMENT;

}



__visible void __irq_entry hyperv_reenlightenment_intr(struct pt_regs *regs)

DEFINE_IDTENTRY_SYSVEC(sysvec_hyperv_reenlightenment)

{

	entering_ack_irq();



	ack_APIC_irq();

	inc_irq_stat(irq_hv_reenlightenment_count);



	schedule_delayed_work(&hv_reenlightenment_work, HZ/10);



	exiting_irq();

}



void set_hv_tscchange_cb(void (*cb)(void))

arch/x86/include/asm/acrn.h

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_X86_ACRN_H

#define _ASM_X86_ACRN_H



extern void acrn_hv_callback_vector(void);

#ifdef CONFIG_TRACING

#define trace_acrn_hv_callback_vector acrn_hv_callback_vector

#endif



extern void acrn_hv_vector_handler(struct pt_regs *regs);

#endif /* _ASM_X86_ACRN_H */

arch/x86/include/asm/apic.h

+0 −20
Original line number Diff line number Diff line
@@ -519,26 +519,6 @@ static inline bool apic_id_is_primary_thread(unsigned int id) { return false; } 
static inline void apic_smt_update(void) { }

#endif



extern void irq_enter(void);

extern void irq_exit(void);



static inline void entering_irq(void)

{

	irq_enter();

	kvm_set_cpu_l1tf_flush_l1d();

}



static inline void entering_ack_irq(void)

{

	entering_irq();

	ack_APIC_irq();

}



static inline void exiting_irq(void)

{

	irq_exit();

}



extern void ioapic_zap_locks(void);



#endif /* _ASM_X86_APIC_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE