Commit 946fbbc1 authored Feb 22, 2018 by Paolo Bonzini Committed by Ingo Molnar Feb 23, 2018

KVM/VMX: Optimize vmx_vcpu_run() and svm_vcpu_run() by marking the RDMSR path as unlikely()



vmx_vcpu_run() and svm_vcpu_run() are large functions, and giving
branch hints to the compiler can actually make a substantial cycle
difference by keeping the fast path contiguous in memory.

With this optimization, the retpoline-guest/retpoline-host case is
about 50 cycles faster.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Jim Mattson <jmattson@google.com>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: KarimAllah Ahmed <karahmed@amazon.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: kvm@vger.kernel.org
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/20180222154318.20361-3-pbonzini@redhat.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent ecb586bd

arch/x86/kvm/svm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -5465,7 +5465,7 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
		* If the L02 MSR bitmap does not intercept the MSR, then we need to
		* save it.
		*/
		if (!msr_write_intercepted(vcpu, MSR_IA32_SPEC_CTRL))
		if (unlikely(!msr_write_intercepted(vcpu, MSR_IA32_SPEC_CTRL)))
		svm->spec_ctrl = native_read_msr(MSR_IA32_SPEC_CTRL);

		if (svm->spec_ctrl)

arch/x86/kvm/vmx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -9588,7 +9588,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
		* If the L02 MSR bitmap does not intercept the MSR, then we need to
		* save it.
		*/
		if (!msr_write_intercepted(vcpu, MSR_IA32_SPEC_CTRL))
		if (unlikely(!msr_write_intercepted(vcpu, MSR_IA32_SPEC_CTRL)))
		vmx->spec_ctrl = native_read_msr(MSR_IA32_SPEC_CTRL);

		if (vmx->spec_ctrl)