]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: x86: Add infrastructure for secure TSC
authorIsaku Yamahata <isaku.yamahata@intel.com>
Sat, 12 Oct 2024 07:55:56 +0000 (00:55 -0700)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 14 Mar 2025 17:55:44 +0000 (13:55 -0400)
Add guest_tsc_protected member to struct kvm_arch_vcpu and prohibit
changing TSC offset/multiplier when guest_tsc_protected is true.

X86 confidential computing technology defines protected guest TSC so that
the VMM can't change the TSC offset/multiplier once vCPU is initialized.
SEV-SNP defines Secure TSC as optional, whereas TDX mandates it.

KVM has common logic on x86 that tries to guess or adjust TSC
offset/multiplier for better guest TSC and TSC interrupt latency
at KVM vCPU creation (kvm_arch_vcpu_postcreate()), vCPU migration
over pCPU (kvm_arch_vcpu_load()), vCPU TSC device attributes
(kvm_arch_tsc_set_attr()) and guest/host writing to TSC or TSC adjust MSR
(kvm_set_msr_common()).

The current x86 KVM implementation conflicts with protected TSC because the
VMM can't change the TSC offset/multiplier.
Because KVM emulates the TSC timer or the TSC deadline timer with the TSC
offset/multiplier, the TSC timer interrupts is injected to the guest at the
wrong time if the KVM TSC offset is different from what the TDX module
determined.

Originally this issue was found by cyclic test of rt-test [1] as the
latency in TDX case is worse than VMX value + TDX SEAMCALL overhead.  It
turned out that the KVM TSC offset is different from what the TDX module
determines.

Disable or ignore the KVM logic to change/adjust the TSC offset/multiplier
somehow, thus keeping the KVM TSC offset/multiplier the same as the
value of the TDX module.  Writes to MSR_IA32_TSC are also blocked as
they amount to a change in the TSC offset.

[1] https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git

Reported-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Message-ID: <3a7444aec08042fe205666864b6858910e86aa98.1728719037.git.isaku.yamahata@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/include/asm/kvm_host.h
arch/x86/kvm/x86.c

index 32ae3aa50c7e386894885c5af3e9ed0a4d0bb7fd..ee55d1f753e8e9b14d934c6c2f0f0409515f9282 100644 (file)
@@ -1053,6 +1053,7 @@ struct kvm_vcpu_arch {
 
        /* Protected Guests */
        bool guest_state_protected;
+       bool guest_tsc_protected;
 
        /*
         * Set when PDPTS were loaded directly by the userspace without
index 2da75bbf7f943b8fbe9e2fdff8f2639fe2d46ddb..053547fc6f892f87e1d5ccc1f038aaa5aba8d74a 100644 (file)
@@ -2569,6 +2569,9 @@ EXPORT_SYMBOL_GPL(kvm_calc_nested_tsc_multiplier);
 
 static void kvm_vcpu_write_tsc_offset(struct kvm_vcpu *vcpu, u64 l1_offset)
 {
+       if (vcpu->arch.guest_tsc_protected)
+               return;
+
        trace_kvm_write_tsc_offset(vcpu->vcpu_id,
                                   vcpu->arch.l1_tsc_offset,
                                   l1_offset);
@@ -2632,6 +2635,9 @@ static void __kvm_synchronize_tsc(struct kvm_vcpu *vcpu, u64 offset, u64 tsc,
 
        lockdep_assert_held(&kvm->arch.tsc_write_lock);
 
+       if (vcpu->arch.guest_tsc_protected)
+               return;
+
        if (user_set_tsc)
                vcpu->kvm->arch.user_set_tsc = true;
 
@@ -3907,7 +3913,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
        case MSR_IA32_TSC:
                if (msr_info->host_initiated) {
                        kvm_synchronize_tsc(vcpu, &data);
-               } else {
+               } else if (!vcpu->arch.guest_tsc_protected) {
                        u64 adj = kvm_compute_l1_tsc_offset(vcpu, data) - vcpu->arch.l1_tsc_offset;
                        adjust_tsc_offset_guest(vcpu, adj);
                        vcpu->arch.ia32_tsc_adjust_msr += adj;
@@ -4987,7 +4993,8 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
                        u64 offset = kvm_compute_l1_tsc_offset(vcpu,
                                                vcpu->arch.last_guest_tsc);
                        kvm_vcpu_write_tsc_offset(vcpu, offset);
-                       vcpu->arch.tsc_catchup = 1;
+                       if (!vcpu->arch.guest_tsc_protected)
+                               vcpu->arch.tsc_catchup = 1;
                }
 
                if (kvm_lapic_hv_timer_in_use(vcpu))