From: Sean Christopherson Date: Fri, 28 Jan 2022 00:51:52 +0000 (+0000) Subject: KVM: VMX: Call vmx_get_cpl() directly in handle_dr() X-Git-Tag: v6.6.17~7805^2~200 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ef2d488c652150df3c580a53f9e5d6f307e9b7e4;p=platform%2Fkernel%2Flinux-rpi.git KVM: VMX: Call vmx_get_cpl() directly in handle_dr() Use vmx_get_cpl() instead of bouncing through kvm_x86_ops.get_cpl() when performing a CPL check on MOV DR accesses. This avoids a RETPOLINE (when enabled), and more importantly removes a vendor reference to kvm_x86_ops and helps pave the way for unexporting kvm_x86_ops. Signed-off-by: Sean Christopherson Message-Id: <20220128005208.4008533-7-seanjc@google.com> Signed-off-by: Paolo Bonzini --- diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 2ce98ed..ac8a955 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -5184,7 +5184,7 @@ static int handle_dr(struct kvm_vcpu *vcpu) if (!kvm_require_dr(vcpu, dr)) return 1; - if (kvm_x86_ops.get_cpl(vcpu) > 0) + if (vmx_get_cpl(vcpu) > 0) goto out; dr7 = vmcs_readl(GUEST_DR7);