Commit 70d0fe5d authored by Xin Li's avatar Xin Li Committed by Borislav Petkov (AMD)
Browse files

KVM: VMX: Call fred_entry_from_kvm() for IRQ/NMI handling 



When FRED is enabled, call fred_entry_from_kvm() to handle IRQ/NMI in
IRQ/NMI induced VM exits.

Signed-off-by: default avatarXin Li <xin3.li@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Tested-by: default avatarShan Kang <shan.kang@intel.com>
Acked-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Link: https://lore.kernel.org/r/20231205105030.8698-33-xin3.li@intel.com
parent 2e670358

arch/x86/kvm/vmx/vmx.c

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

#include <asm/fpu/api.h>

#include <asm/fpu/xstate.h>

#include <asm/fred.h>

#include <asm/idtentry.h>

#include <asm/io.h>

#include <asm/irq_remapping.h>
@@ -6960,14 +6961,16 @@ static void handle_external_interrupt_irqoff(struct kvm_vcpu *vcpu) 
{

	u32 intr_info = vmx_get_intr_info(vcpu);

	unsigned int vector = intr_info & INTR_INFO_VECTOR_MASK;

	gate_desc *desc = (gate_desc *)host_idt_base + vector;



	if (KVM_BUG(!is_external_intr(intr_info), vcpu->kvm,

	    "unexpected VM-Exit interrupt info: 0x%x", intr_info))

		return;



	kvm_before_interrupt(vcpu, KVM_HANDLING_IRQ);

	vmx_do_interrupt_irqoff(gate_offset(desc));

	if (cpu_feature_enabled(X86_FEATURE_FRED))

		fred_entry_from_kvm(EVENT_TYPE_EXTINT, vector);

	else

		vmx_do_interrupt_irqoff(gate_offset((gate_desc *)host_idt_base + vector));

	kvm_after_interrupt(vcpu);



	vcpu->arch.at_instruction_boundary = true;
@@ -7260,6 +7263,9 @@ static noinstr void vmx_vcpu_enter_exit(struct kvm_vcpu *vcpu, 
	if ((u16)vmx->exit_reason.basic == EXIT_REASON_EXCEPTION_NMI &&

	    is_nmi(vmx_get_intr_info(vcpu))) {

		kvm_before_interrupt(vcpu, KVM_HANDLING_NMI);

		if (cpu_feature_enabled(X86_FEATURE_FRED))

			fred_entry_from_kvm(EVENT_TYPE_NMI, NMI_VECTOR);

		else

			vmx_do_nmi_irqoff();

		kvm_after_interrupt(vcpu);

	}