]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: x86: Do not use kvm_rip_read() unconditionally for KVM_PROFILING
authorAdrian Hunter <adrian.hunter@intel.com>
Tue, 15 Apr 2025 10:48:21 +0000 (13:48 +0300)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 24 Apr 2025 13:52:32 +0000 (09:52 -0400)
Not all VMs allow access to RIP.  Check guest_state_protected before
calling kvm_rip_read().

This avoids, for example, hitting WARN_ON_ONCE in vt_cache_reg() for
TDX VMs.

Fixes: 81bf912b2c15 ("KVM: TDX: Implement TDX vcpu enter/exit path")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Message-ID: <20250415104821.247234-3-adrian.hunter@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/x86.c

index a6829a370e6a979b64ff2236691a0c90bdf5309b..df5b99ea1f18126d988108cfcefcb6f57c6e57f1 100644 (file)
@@ -11098,7 +11098,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
        /*
         * Profile KVM exit RIPs:
         */
-       if (unlikely(prof_on == KVM_PROFILING)) {
+       if (unlikely(prof_on == KVM_PROFILING &&
+                    !vcpu->arch.guest_state_protected)) {
                unsigned long rip = kvm_rip_read(vcpu);
                profile_hit(KVM_PROFILING, (void *)rip);
        }