Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c82f134 authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Greg Kroah-Hartman
Browse files

KVM: x86: optimize more exit handlers in vmx.c 



[ Upstream commit f399e60c45f6b6e6ad6dfcedff1dd6386e086b0b ]

Eliminate wasteful call/ret non RETPOLINE case and unnecessary fentry
dynamic tracing hooking points.

Signed-off-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Stable-dep-of: 31de69f4eea7 ("KVM: nVMX: Properly expose ENABLE_USR_WAIT_PAUSE control to L1")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6e3f6d95

arch/x86/kvm/vmx/vmx.c

+5 −25
Original line number Diff line number Diff line
@@ -4802,7 +4802,7 @@ static int handle_exception_nmi(struct kvm_vcpu *vcpu) 
	return 0;

}



static int handle_external_interrupt(struct kvm_vcpu *vcpu)

static __always_inline int handle_external_interrupt(struct kvm_vcpu *vcpu)

{

	++vcpu->stat.irq_exits;

	return 1;
@@ -5074,21 +5074,6 @@ static void vmx_set_dr7(struct kvm_vcpu *vcpu, unsigned long val) 
	vmcs_writel(GUEST_DR7, val);

}



static int handle_cpuid(struct kvm_vcpu *vcpu)

{

	return kvm_emulate_cpuid(vcpu);

}



static int handle_rdmsr(struct kvm_vcpu *vcpu)

{

	return kvm_emulate_rdmsr(vcpu);

}



static int handle_wrmsr(struct kvm_vcpu *vcpu)

{

	return kvm_emulate_wrmsr(vcpu);

}



static int handle_tpr_below_threshold(struct kvm_vcpu *vcpu)

{

	kvm_apic_update_ppr(vcpu);
@@ -5105,11 +5090,6 @@ static int handle_interrupt_window(struct kvm_vcpu *vcpu) 
	return 1;

}



static int handle_halt(struct kvm_vcpu *vcpu)

{

	return kvm_emulate_halt(vcpu);

}



static int handle_vmcall(struct kvm_vcpu *vcpu)

{

	return kvm_emulate_hypercall(vcpu);
@@ -5657,11 +5637,11 @@ static int (*kvm_vmx_exit_handlers[])(struct kvm_vcpu *vcpu) = { 
	[EXIT_REASON_IO_INSTRUCTION]          = handle_io,

	[EXIT_REASON_CR_ACCESS]               = handle_cr,

	[EXIT_REASON_DR_ACCESS]               = handle_dr,

	[EXIT_REASON_CPUID]                   = handle_cpuid,

	[EXIT_REASON_MSR_READ]                = handle_rdmsr,

	[EXIT_REASON_MSR_WRITE]               = handle_wrmsr,

	[EXIT_REASON_CPUID]                   = kvm_emulate_cpuid,

	[EXIT_REASON_MSR_READ]                = kvm_emulate_rdmsr,

	[EXIT_REASON_MSR_WRITE]               = kvm_emulate_wrmsr,

	[EXIT_REASON_PENDING_INTERRUPT]       = handle_interrupt_window,

	[EXIT_REASON_HLT]                     = handle_halt,

	[EXIT_REASON_HLT]                     = kvm_emulate_halt,

	[EXIT_REASON_INVD]		      = handle_invd,

	[EXIT_REASON_INVLPG]		      = handle_invlpg,

	[EXIT_REASON_RDPMC]                   = handle_rdpmc,