diff mbox series

[18/23] KVM: SVM: Don't manually emulate RDPMC if nrips=0

Message ID	20210302193343.313318-19-pbonzini@redhat.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@kernel.org> From: Paolo Bonzini <pbonzini@redhat.com> To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: seanjc@google.com Subject: [PATCH 18/23] KVM: SVM: Don't manually emulate RDPMC if nrips=0 Date: Tue, 2 Mar 2021 14:33:38 -0500 Message-Id: <20210302193343.313318-19-pbonzini@redhat.com> In-Reply-To: <20210302193343.313318-1-pbonzini@redhat.com> References: <20210302193343.313318-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	SVM queue for 5.13 \| expand [00/23] SVM queue for 5.13 [01/23] KVM: SVM: Use a separate vmcb for the nested L2 guest [02/23] KVM: nSVM: Track the physical cpu of the vmcb vmrun through the vmcb [03/23] KVM: nSVM: Track the ASID generation of the vmcb vmrun through the vmcb [04/23] KVM: nSVM: rename functions and variables according to vmcbXY nomenclature [05/23] KVM: nSVM: do not copy vmcb01->control blindly to vmcb02->control [06/23] KVM: nSVM: do not mark all VMCB01 fields dirty on nested vmexit [07/23] KVM: nSVM: do not mark all VMCB02 fields dirty on nested vmexit [08/23] KVM: nSVM: only copy L1 non-VMLOAD/VMSAVE data in svm_set_nested_state() [09/23] KVM: nSVM: Add missing checks for reserved bits to svm_set_nested_state() [10/23] KVM: x86: Move nVMX's consistency check macro to common code [11/23] KVM: nSVM: Trace VM-Enter consistency check failures [12/23] KVM: SVM: merge update_cr0_intercept into svm_set_cr0 [13/23] KVM: SVM: Pass struct kvm_vcpu to exit handlers (and many, many other places) [14/23] KVM: nSVM: Add VMLOAD/VMSAVE helper to deduplicate code [15/23] KVM: x86: Move XSETBV emulation to common code [16/23] KVM: x86: Move trivial instruction-based exit handlers to common code [17/23] KVM: x86: Move RDPMC emulation to common code [18/23] KVM: SVM: Don't manually emulate RDPMC if nrips=0 [19/23] KVM: SVM: Skip intercepted PAUSE instructions after emulation [20/23] KVM: SVM: move VMLOAD/VMSAVE to C code [21/23] KVM: nSVM: always use vmcb01 to for vmsave/vmload of guest state [22/23] x86/cpufeatures: Add the Virtual SPEC_CTRL feature [23/23] KVM: SVM: Add support for Virtual SPEC_CTRL

Commit Message

Paolo Bonzini March 2, 2021, 7:33 p.m. UTC

From: Sean Christopherson <seanjc@google.com>

Remove bizarre code that causes KVM to run RDPMC through the emulator
when nrips is disabled.  Accelerated emulation of RDPMC doesn't rely on
any additional data from the VMCB, and SVM has generic handling for
updating RIP to skip instructions when nrips is disabled.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20210205005750.3841462-9-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 arch/x86/kvm/svm/svm.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff mbox series

Patch

diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 8cb31603bce5..3725a4636930 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -2424,14 +2424,6 @@  static int rsm_interception(struct kvm_vcpu *vcpu)
 	return kvm_emulate_instruction_from_buffer(vcpu, rsm_ins_bytes, 2);
 }
 
-static int rdpmc_interception(struct kvm_vcpu *vcpu)
-{
-	if (!nrips)
-		return emulate_on_interception(vcpu);
-
-	return kvm_emulate_rdpmc(vcpu);
-}
-
 static bool check_selective_cr0_intercepted(struct kvm_vcpu *vcpu,
 					    unsigned long val)
 {
@@ -3058,7 +3050,7 @@  static int (*const svm_exit_handlers[])(struct kvm_vcpu *vcpu) = {
 	[SVM_EXIT_SMI]				= kvm_emulate_as_nop,
 	[SVM_EXIT_INIT]				= kvm_emulate_as_nop,
 	[SVM_EXIT_VINTR]			= interrupt_window_interception,
-	[SVM_EXIT_RDPMC]			= rdpmc_interception,
+	[SVM_EXIT_RDPMC]			= kvm_emulate_rdpmc,
 	[SVM_EXIT_CPUID]			= kvm_emulate_cpuid,
 	[SVM_EXIT_IRET]                         = iret_interception,
 	[SVM_EXIT_INVD]                         = kvm_emulate_invd,