Skip to contentSkip to conversation

KVM: x86: Correct use of kvm_rip_read()

PATCH Applied Adrian Hunter 2 participants 4 messages Apr 15, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover KVM: x86: Correct use of kvm_rip_read()

Hi

Here are a couple of tweaks to dodge kvm_rip_read() in tracepoints and KVM_PROFILING when guest_state_protected.

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

Adrian Hunter (2):
KVM: x86: Do not use kvm_rip_read() unconditionally in KVM tracepoints
KVM: x86: Do not use kvm_rip_read() unconditionally for KVM_PROFILING

 arch/x86/kvm/trace.h | 13 ++++++++++---
 arch/x86/kvm/x86.c   |  3 ++-
 2 files changed, 12 insertions(+), 4 deletions(-)

Regards
Adrian

#1 lore raw

PATCH 1/2 KVM: x86: Do not use kvm_rip_read() unconditionally in KVM tracepoints

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")
---
 arch/x86/kvm/trace.h | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
arch/x86/kvm/trace.h +10 -3
index ccda95e53f62..ba736cbb0587 100644
@@ -11,6 +11,13 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM kvm
 
+#ifdef CREATE_TRACE_POINTS
+#define tracing_kvm_rip_read(vcpu) ({					\
+	typeof(vcpu) __vcpu = vcpu;					\
+	__vcpu->arch.guest_state_protected ? 0 : kvm_rip_read(__vcpu);	\
+	})
+#endif
+
 /*
  * Tracepoint for guest mode entry.
  */
@@ -28,7 +35,7 @@ TRACE_EVENT(kvm_entry,
 
 	TP_fast_assign(
 		__entry->vcpu_id        = vcpu->vcpu_id;
-		__entry->rip		= kvm_rip_read(vcpu);
+		__entry->rip		= tracing_kvm_rip_read(vcpu);
 		__entry->immediate_exit	= force_immediate_exit;
 
 		kvm_x86_call(get_entry_info)(vcpu, &__entry->intr_info,
@@ -319,7 +326,7 @@ TRACE_EVENT(name,							     \
 	),								     \
 									     \
 	TP_fast_assign(							     \
-		__entry->guest_rip	= kvm_rip_read(vcpu);		     \
+		__entry->guest_rip	= tracing_kvm_rip_read(vcpu);		     \
 		__entry->isa            = isa;				     \
 		__entry->vcpu_id        = vcpu->vcpu_id;		     \
 		__entry->requests       = READ_ONCE(vcpu->requests);	     \
@@ -423,7 +430,7 @@ TRACE_EVENT(kvm_page_fault,
 
 	TP_fast_assign(
 		__entry->vcpu_id	= vcpu->vcpu_id;
-		__entry->guest_rip	= kvm_rip_read(vcpu);
+		__entry->guest_rip	= tracing_kvm_rip_read(vcpu);
 		__entry->fault_address	= fault_address;
 		__entry->error_code	= error_code;
 	),
Signature · 1 line
2.43.0
#2 lore raw

PATCH 2/2 KVM: x86: Do not use kvm_rip_read() unconditionally for KVM_PROFILING

In reply to Adrian Hunter

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")
---
 arch/x86/kvm/x86.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/x86/kvm/x86.c +2 -1
index 844e81ee1d96..8758f8cba488 100644
@@ -11130,7 +11130,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);
 	}
Signature · 1 line
2.43.0