KVM: x86: Add helper to retrieve cached value of user return MSR
PATCH 1/2 KVM: x86: Add helper to retrieve cached value of user return MSR
In the user return MSR support, the cached value is always the hardware value of the specific MSR. Therefore, add a helper to retrieve the cached value, which can replace the need for RDMSR, for example, to allow SEV-ES guests to restore the correct host hardware value without using RDMSR.
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/x86.c | 8 ++++++++ 2 files changed, 9 insertions(+)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -2376,6 +2376,7 @@ int kvm_add_user_return_msr(u32 msr);int kvm_find_user_return_msr (u32 msr);int kvm_set_user_return_msr (unsigned index,u64 val,u64 mask);void kvm_user_return_msr_update_cache (unsigned int index,u64 val); +u64 kvm_get_user_return_msr_cache (unsigned int index);static inline bool kvm_is_supported_user_return_msr (u32 msr) {
arch/x86/kvm/x86.c +8 -0
@@ -675,6 +675,14 @@ void kvm_user_return_msr_update_cache(unsigned int slot, u64 value) }EXPORT_SYMBOL_GPL (kvm_user_return_msr_update_cache); +u64 kvm_get_user_return_msr_cache (unsigned int slot) +{ +struct kvm_user_return_msrs *msrs =this_cpu_ptr (user_return_msrs); + +return msrs->values[slot].curr; +} +EXPORT_SYMBOL_GPL (kvm_get_user_return_msr_cache); +static void drop_user_return_notifiers (void ) {struct kvm_user_return_msrs *msrs =this_cpu_ptr (user_return_msrs);
base-commit: 603c090664d350b7fdaffbe8e6a6e43829938458
Signature · 1 line
2.31.1
PATCH 2/2 KVM: SVM: Use cached value as restore value of TSC_AUX for SEV-ES guest
The commit 916e3e5f26ab ("KVM: SVM: Do not use user return MSR support for virtualized TSC_AUX") assumes that TSC_AUX is not changed by Linux post-boot, so it always restores the initial host value on #VMEXIT. However, this is not true in KVM, as it can be modified by user return MSR support for normal guests. If an SEV-ES guest always restores the initial host value on #VMEXIT, this may result in the cached value in user return MSR being different from the hardware value if the previous vCPU was a non-SEV-ES guest that had called kvm_set_user_return_msr(). Consequently, this may pose a problem when switching back to that vCPU, as kvm_set_user_return_msr() would not update the hardware value because the cached value matches the target value. Unlike the TDX case, the SEV-ES guest has the ability to set the restore value in the host save area, and the cached value in the user return MSR is always the current hardware value. Therefore, the cached value could be used directly without RDMSR in svm_prepare_switch_to_guest(), making this change minimal.
--- arch/x86/kvm/svm/svm.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-)
arch/x86/kvm/svm/svm.c +14 -19
@@ -577,18 +577,6 @@ static int svm_enable_virtualization_cpu(void)amd_pmu_enable_virt (); -/* -* If TSC_AUX virtualization is supported, TSC_AUX becomes a swap type -* "B" field (see sev_es_prepare_switch_to_guest()) for SEV-ES guests. -* Since Linux does not change the value of TSC_AUX once set, prime the -* TSC_AUX field now to avoid a RDMSR on every vCPU run. -*/ -if (boot_cpu_has (X86_FEATURE_V_TSC_AUX )) { -u32 __maybe_unused msr_hi; - -rdmsr (MSR_TSC_AUX ,sev_es_host_save_area (sd)->tsc_aux, msr_hi); - } -return 0 ; }
@@ -1408,12 +1396,19 @@ static void svm_prepare_switch_to_guest(struct kvm_vcpu *vcpu)/* * TSC_AUX is always virtualized for SEV-ES guests when the feature is * available. The user return MSR support is not required in this case -* because TSC_AUX is restored on #VMEXIT from the host save area -* (which has been initialized in svm_enable_virtualization_cpu()). +* because TSC_AUX is restored on #VMEXIT from the host save area. +* However, user return MSR could change the value of TSC_AUX in the +* kernel. Therefore, to maintain the logic of user return MSR, set the +* restore value to the cached value of user return MSR, which should +* always reflect the current hardware value. */ -if (likely (tsc_aux_uret_slot >=0 ) && - (!boot_cpu_has (X86_FEATURE_V_TSC_AUX ) || !sev_es_guest (vcpu->kvm))) -kvm_set_user_return_msr (tsc_aux_uret_slot, svm->tsc_aux,-1ull ); +if (likely (tsc_aux_uret_slot >=0 )) { +if (!boot_cpu_has (X86_FEATURE_V_TSC_AUX ) || !sev_es_guest (vcpu->kvm)) +kvm_set_user_return_msr (tsc_aux_uret_slot, svm->tsc_aux,-1ull ); +else +sev_es_host_save_area (sd)->tsc_aux = + (u32 )kvm_get_user_return_msr_cache (tsc_aux_uret_slot); + }if (cpu_feature_enabled (X86_FEATURE_SRSO_BP_SPEC_REDUCE ) && !sd->bp_spec_reduce_set) {
@@ -3004,8 +2999,8 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr)* TSC_AUX is always virtualized for SEV-ES guests when the * feature is available. The user return MSR support is not * required in this case because TSC_AUX is restored on #VMEXIT -* from the host save area (which has been initialized in -* svm_enable_virtualization_cpu()). +* from the host save area (which has been set in +* svm_prepare_switch_to_guest()). */ if (boot_cpu_has (X86_FEATURE_V_TSC_AUX ) &&sev_es_guest (vcpu->kvm))break ;
Signature · 1 line
2.31.1
Re: [PATCH 2/2] KVM: SVM: Use cached value as restore value of TSC_AUX for SEV-ES guest
Quoted 8 lines · Hou Wenlong
The commit
916e3e5f26ab("KVM: SVM: Do not use user return MSR support for virtualizedTSC_AUX") assumes thatTSC_AUXis not changed by Linux post-boot, so it always restores the initial host value on #VMEXIT. However, this is not true in KVM, as it can be modified by user return MSR support for normal guests. If an SEV-ES guest always restores the initial host value on #VMEXIT, this may result in the cached value in user return MSR being different from the hardware value if the previous vCPU was a non-SEV-ES guest that had calledkvm_set_user_return_msr().
Quoted 8 lines
Consequently, this may pose a problem when switching back to that vCPU, as
kvm_set_user_return_msr()would not update the hardware value because the cached value matches the target value. Unlike the TDX case, the SEV-ES guest has the ability to set the restore value in the host save area, and the cached value in the user return MSR is always the current hardware value. Therefore, the cached value could be used directly without RDMSR insvm_prepare_switch_to_guest(), making this change minimal.
I'm not sure I follow. If Linux never changes the value of TSC_AUX once it has set it, then how can it ever be different? Have you seen this issue?
Thanks,
Tom
Quoted 67 lines
Fixes 916e3e5f26ab ("KVM: SVM: Do not use user return MSR support for virtualized TSC_AUX")Suggested-by Lai Jiangshan <[email protected]>Signed-off-by Hou Wenlong <[email protected]>--- arch/x86/kvm/svm/svm.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-)arch/x86/kvm/svm/svm.c +14
-19@@ -577,18 +577,6 @@ static int svm_enable_virtualization_cpu(void)amd_pmu_enable_virt (); -/* -* If TSC_AUX virtualization is supported, TSC_AUX becomes a swap type -* "B" field (see sev_es_prepare_switch_to_guest()) for SEV-ES guests. -* Since Linux does not change the value of TSC_AUX once set, prime the -* TSC_AUX field now to avoid a RDMSR on every vCPU run. -*/ -if (boot_cpu_has (X86_FEATURE_V_TSC_AUX )) { -u32 __maybe_unused msr_hi; - -rdmsr (MSR_TSC_AUX ,sev_es_host_save_area (sd)->tsc_aux, msr_hi); - } -return 0 ; }@@ -1408,12 +1396,19 @@ static void svm_prepare_switch_to_guest(struct kvm_vcpu *vcpu)/* * TSC_AUX is always virtualized for SEV-ES guests when the feature is * available. The user return MSR support is not required in this case -* because TSC_AUX is restored on #VMEXIT from the host save area -* (which has been initialized in svm_enable_virtualization_cpu()). +* because TSC_AUX is restored on #VMEXIT from the host save area. +* However, user return MSR could change the value of TSC_AUX in the +* kernel. Therefore, to maintain the logic of user return MSR, set the +* restore value to the cached value of user return MSR, which should +* always reflect the current hardware value. */ -if (likely (tsc_aux_uret_slot >=0 ) && - (!boot_cpu_has (X86_FEATURE_V_TSC_AUX ) || !sev_es_guest (vcpu->kvm))) -kvm_set_user_return_msr (tsc_aux_uret_slot, svm->tsc_aux,-1ull ); +if (likely (tsc_aux_uret_slot >=0 )) { +if (!boot_cpu_has (X86_FEATURE_V_TSC_AUX ) || !sev_es_guest (vcpu->kvm)) +kvm_set_user_return_msr (tsc_aux_uret_slot, svm->tsc_aux,-1ull ); +else +sev_es_host_save_area (sd)->tsc_aux = + (u32 )kvm_get_user_return_msr_cache (tsc_aux_uret_slot); + }if (cpu_feature_enabled (X86_FEATURE_SRSO_BP_SPEC_REDUCE ) && !sd->bp_spec_reduce_set) {@@ -3004,8 +2999,8 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr)* TSC_AUX is always virtualized for SEV-ES guests when the * feature is available. The user return MSR support is not * required in this case because TSC_AUX is restored on #VMEXIT -* from the host save area (which has been initialized in -* svm_enable_virtualization_cpu()). +* from the host save area (which has been set in +* svm_prepare_switch_to_guest()). */ if (boot_cpu_has (X86_FEATURE_V_TSC_AUX ) &&sev_es_guest (vcpu->kvm))break ;
Re: [PATCH 2/2] KVM: SVM: Use cached value as restore value of TSC_AUX for SEV-ES guest
Quoted 18 lines · Tom Lendacky
Quoted 8 lines · Hou Wenlong
The commit
916e3e5f26ab("KVM: SVM: Do not use user return MSR support for virtualizedTSC_AUX") assumes thatTSC_AUXis not changed by Linux post-boot, so it always restores the initial host value on #VMEXIT. However, this is not true in KVM, as it can be modified by user return MSR support for normal guests. If an SEV-ES guest always restores the initial host value on #VMEXIT, this may result in the cached value in user return MSR being different from the hardware value if the previous vCPU was a non-SEV-ES guest that had calledkvm_set_user_return_msr().Quoted 8 lines
Consequently, this may pose a problem when switching back to that vCPU, as
kvm_set_user_return_msr()would not update the hardware value because the cached value matches the target value. Unlike the TDX case, the SEV-ES guest has the ability to set the restore value in the host save area, and the cached value in the user return MSR is always the current hardware value. Therefore, the cached value could be used directly without RDMSR insvm_prepare_switch_to_guest(), making this change minimal.
Quoted 6 lines
I'm not sure I follow. If Linux never changes the value of
TSC_AUXonce it has set it, then how can it ever be different? Have you seen this issue?Thanks,
Tom
Hi, Tom.
IIUD, the normal guest still uses the user return MSR to load the guest TSC_AUX value into the hardware when TSC_AUX virtualization is supported. However, the user return MSR only restores the host value when returning to userspace, rather than when the vCPU is scheduled out. This may lead to an issue during vCPU switching on a single pCPU, which appears as follows:
normal vCPU -> SEV-ES vCPU -> normal vCPU
When the normal vCPU switches to the SEV-ES vCPU, the hardware TSC_AUX value remains as the guest value set in kvm_set_user_return_msr() by the normal vCPU. After the #VMEXIT from the SEV-ES vCPU, the hardware value becomes the host value. However, the cached TSC_AUX value in the user return MSR remains the guest value of previous normal vCPU. Therefore, when switching back to that normal vCPU, kvm_set_user_return_msr() does not perform a WRMSR to load the guest value into the hardware, because the cached value matches the target value. As a result, during the execution of the normal vCPU, the normal vCPU would get an incorrect TSC_AUX value for RDTSCP/RDPID.
I didn't find the available description of TSC_AUX virtualization in APM; all my analysis is based on the current KVM code. Am I missing something?
Thanks.
Quoted 67 lines
Quoted 67 lines
Fixes 916e3e5f26ab ("KVM: SVM: Do not use user return MSR support for virtualized TSC_AUX")Suggested-by Lai Jiangshan <[email protected]>Signed-off-by Hou Wenlong <[email protected]>--- arch/x86/kvm/svm/svm.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-)arch/x86/kvm/svm/svm.c +14
-19@@ -577,18 +577,6 @@ static int svm_enable_virtualization_cpu(void)amd_pmu_enable_virt (); -/* -* If TSC_AUX virtualization is supported, TSC_AUX becomes a swap type -* "B" field (see sev_es_prepare_switch_to_guest()) for SEV-ES guests. -* Since Linux does not change the value of TSC_AUX once set, prime the -* TSC_AUX field now to avoid a RDMSR on every vCPU run. -*/ -if (boot_cpu_has (X86_FEATURE_V_TSC_AUX )) { -u32 __maybe_unused msr_hi; - -rdmsr (MSR_TSC_AUX ,sev_es_host_save_area (sd)->tsc_aux, msr_hi); - } -return 0 ; }@@ -1408,12 +1396,19 @@ static void svm_prepare_switch_to_guest(struct kvm_vcpu *vcpu)/* * TSC_AUX is always virtualized for SEV-ES guests when the feature is * available. The user return MSR support is not required in this case -* because TSC_AUX is restored on #VMEXIT from the host save area -* (which has been initialized in svm_enable_virtualization_cpu()). +* because TSC_AUX is restored on #VMEXIT from the host save area. +* However, user return MSR could change the value of TSC_AUX in the +* kernel. Therefore, to maintain the logic of user return MSR, set the +* restore value to the cached value of user return MSR, which should +* always reflect the current hardware value. */ -if (likely (tsc_aux_uret_slot >=0 ) && - (!boot_cpu_has (X86_FEATURE_V_TSC_AUX ) || !sev_es_guest (vcpu->kvm))) -kvm_set_user_return_msr (tsc_aux_uret_slot, svm->tsc_aux,-1ull ); +if (likely (tsc_aux_uret_slot >=0 )) { +if (!boot_cpu_has (X86_FEATURE_V_TSC_AUX ) || !sev_es_guest (vcpu->kvm)) +kvm_set_user_return_msr (tsc_aux_uret_slot, svm->tsc_aux,-1ull ); +else +sev_es_host_save_area (sd)->tsc_aux = + (u32 )kvm_get_user_return_msr_cache (tsc_aux_uret_slot); + }if (cpu_feature_enabled (X86_FEATURE_SRSO_BP_SPEC_REDUCE ) && !sd->bp_spec_reduce_set) {@@ -3004,8 +2999,8 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr)* TSC_AUX is always virtualized for SEV-ES guests when the * feature is available. The user return MSR support is not * required in this case because TSC_AUX is restored on #VMEXIT -* from the host save area (which has been initialized in -* svm_enable_virtualization_cpu()). +* from the host save area (which has been set in +* svm_prepare_switch_to_guest()). */ if (boot_cpu_has (X86_FEATURE_V_TSC_AUX ) &&sev_es_guest (vcpu->kvm))break ;
Sean Christopherson
maintainerRe: [PATCH 2/2] KVM: SVM: Use cached value as restore value of TSC_AUX for SEV-ES guest
Quoted 47 lines · Hou Wenlong
Quoted 18 lines · Tom Lendacky
Quoted 8 lines · Hou Wenlong
The commit
916e3e5f26ab("KVM: SVM: Do not use user return MSR support for virtualizedTSC_AUX") assumes thatTSC_AUXis not changed by Linux post-boot, so it always restores the initial host value on #VMEXIT. However, this is not true in KVM, as it can be modified by user return MSR support for normal guests. If an SEV-ES guest always restores the initial host value on #VMEXIT, this may result in the cached value in user return MSR being different from the hardware value if the previous vCPU was a non-SEV-ES guest that had calledkvm_set_user_return_msr().Quoted 8 lines
Consequently, this may pose a problem when switching back to that vCPU, as
kvm_set_user_return_msr()would not update the hardware value because the cached value matches the target value. Unlike the TDX case, the SEV-ES guest has the ability to set the restore value in the host save area, and the cached value in the user return MSR is always the current hardware value. Therefore, the cached value could be used directly without RDMSR insvm_prepare_switch_to_guest(), making this change minimal.Quoted 6 lines
I'm not sure I follow. If Linux never changes the value of
TSC_AUXonce it has set it, then how can it ever be different? Have you seen this issue?Thanks,
TomHi, Tom.
IIUD, the normal guest still uses the user return MSR to load the guest
TSC_AUXvalue into the hardware whenTSC_AUXvirtualization is supported. However, the user return MSR only restores the host value when returning to userspace, rather than when the vCPU is scheduled out. This may lead to an issue during vCPU switching on a single pCPU, which appears as follows:normal vCPU -> SEV-ES vCPU -> normal vCPUWhen the normal vCPU switches to the SEV-ES vCPU, the hardware
TSC_AUXvalue remains as the guest value set inkvm_set_user_return_msr()by the normal vCPU. After the #VMEXIT from the SEV-ES vCPU, the hardware value becomes the host value. However, the cachedTSC_AUXvalue in the user return MSR remains the guest value of previous normal vCPU. Therefore, when switching back to that normal vCPU,kvm_set_user_return_msr()does not perform a WRMSR to load the guest value into the hardware, because the cached value matches the target value. As a result, during the execution of the normal vCPU, the normal vCPU would get an incorrectTSC_AUXvalue for RDTSCP/RDPID.
Quoted 2 lines
I didn't find the available description of
TSC_AUXvirtualization in APM; all my analysis is based on the current KVM code.
I'm guessing TSC_AUX virtualization works like SEV-ES, where hardware context switches the MSR on VMRUN/#VMEXIT.
Quoted 1 line
Am I missing something?
Nope, I don't think so. I also found the changelog a bit confusing though. I would say omit the details about Linux not changing the value, and instead focus on the need to re-load the current hardware value. That should be intuitive for all readers, and is correct regradless of what/whose value is currently in hardware.
I also think we should handle setting hostsa->tsc_aux in sev_es_prepare_switch_to_guest(). That obviously requires duplicating some of logic related to SEV-ES and TSC_AUX, but I think I prefer that to splitting the handling of the host save area.
How's this look? (compile tested only)
--
Subject: [PATCH] KVM: SVM: Re-load current, not host, TSC_AUX on #VMEXIT from
SEV-ES guest
Prior to running an SEV-ES guest, set TSC_AUX in the host save area to the current value in hardware, as tracked by the user return infrastructure, instead of always loading the host's desired value for the CPU. If the pCPU is also running a non-SEV-ES vCPU, loading the hosts value on #VMEXIT could clobber the other vCPU's value, e.g. if the SEV-ES vCPU preempted the non-SEV-ES vCPU.
Note, unlike TDX, which blindly _zeroes_ TSC_AUX on exit, SEV-ES CPUs can load an arbitrary value. Stuff the current value in the host save area instead of refreshing the user return cache so that KVM doesn't need to track whether or not the vCPU actually enterred the guest and thus loaded TSC_AUX from the host save area.
--- arch/x86/kvm/svm/sev.c | 14 +++++++++++++- arch/x86/kvm/svm/svm.c | 26 +++++++------------------- arch/x86/kvm/svm/svm.h | 4 +++- 3 files changed, 23 insertions(+), 21 deletions(-)
arch/x86/kvm/svm/sev.c +13 -1
@@ -4664,7 +4664,9 @@ int sev_vcpu_create(struct kvm_vcpu *vcpu)return 0 ; } -void sev_es_prepare_switch_to_guest (struct vcpu_svm *svm,struct sev_es_save_area *hostsa) +void sev_es_prepare_switch_to_guest (struct vcpu_svm *svm, +struct sev_es_save_area *hostsa, +int tsc_aux_uret_slot) {struct kvm *kvm = svm->vcpu.kvm;
@@ -4712,6 +4714,16 @@ void sev_es_prepare_switch_to_guest(struct vcpu_svm *svm, struct sev_es_save_are hostsa->dr2_addr_mask =amd_get_dr_addr_mask (2 ); hostsa->dr3_addr_mask =amd_get_dr_addr_mask (3 ); } + +/* +* TSC_AUX is always virtualized for SEV-ES guests when the feature is +* available, i.e. TSC_AUX is loaded on #VMEXIT from the host save area. +* Set the save area to the current hardware value, i.e. the current +* user return value, so that the correct value is restored on #VMEXIT. +*/ +if (cpu_feature_enabled (X86_FEATURE_V_TSC_AUX ) && + !WARN_ON_ONCE (tsc_aux_uret_slot <0 )) + hostsa->tsc_aux =kvm_get_user_return_msr (tsc_aux_uret_slot); }void sev_vcpu_deliver_sipi_vector (struct kvm_vcpu *vcpu,u8 vector)
arch/x86/kvm/svm/svm.c +7 -19
@@ -577,18 +577,6 @@ static int svm_enable_virtualization_cpu(void)amd_pmu_enable_virt (); -/* -* If TSC_AUX virtualization is supported, TSC_AUX becomes a swap type -* "B" field (see sev_es_prepare_switch_to_guest()) for SEV-ES guests. -* Since Linux does not change the value of TSC_AUX once set, prime the -* TSC_AUX field now to avoid a RDMSR on every vCPU run. -*/ -if (boot_cpu_has (X86_FEATURE_V_TSC_AUX )) { -u32 __maybe_unused msr_hi; - -rdmsr (MSR_TSC_AUX ,sev_es_host_save_area (sd)->tsc_aux, msr_hi); - } -return 0 ; }
@@ -1400,16 +1388,17 @@ static void svm_prepare_switch_to_guest(struct kvm_vcpu *vcpu)*/ vmsave (sd->save_area_pa);if (sev_es_guest (vcpu->kvm)) -sev_es_prepare_switch_to_guest (svm,sev_es_host_save_area (sd)); +sev_es_prepare_switch_to_guest (svm,sev_es_host_save_area (sd), + tsc_aux_uret_slot);if (tsc_scaling)__svm_write_tsc_multiplier (vcpu->arch.tsc_scaling_ratio);/* -* TSC_AUX is always virtualized for SEV-ES guests when the feature is -* available. The user return MSR support is not required in this case -* because TSC_AUX is restored on #VMEXIT from the host save area -* (which has been initialized in svm_enable_virtualization_cpu()). +* TSC_AUX is always virtualized (context switched by hardware) for +* SEV-ES guests when the feature is available. For non-SEV-ES guests, +* context switch TSC_AUX via the user_return MSR infrastructure (not +* all CPUs support TSC_AUX virtualization). */ if (likely (tsc_aux_uret_slot >=0 ) && (!boot_cpu_has (X86_FEATURE_V_TSC_AUX ) || !sev_es_guest (vcpu->kvm)))
@@ -3004,8 +2993,7 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr)* TSC_AUX is always virtualized for SEV-ES guests when the * feature is available. The user return MSR support is not * required in this case because TSC_AUX is restored on #VMEXIT -* from the host save area (which has been initialized in -* svm_enable_virtualization_cpu()). +* from the host save area. */ if (boot_cpu_has (X86_FEATURE_V_TSC_AUX ) &&sev_es_guest (vcpu->kvm))break ;
arch/x86/kvm/svm/svm.h +3 -1
@@ -831,7 +831,9 @@ void sev_vcpu_after_set_cpuid(struct vcpu_svm *svm);int sev_es_string_io (struct vcpu_svm *svm,int size,unsigned int port,int in);void sev_es_recalc_msr_intercepts (struct kvm_vcpu *vcpu);void sev_vcpu_deliver_sipi_vector (struct kvm_vcpu *vcpu,u8 vector); -void sev_es_prepare_switch_to_guest (struct vcpu_svm *svm,struct sev_es_save_area *hostsa); +void sev_es_prepare_switch_to_guest (struct vcpu_svm *svm, +struct sev_es_save_area *hostsa, +int tsc_aux_uret_slot);void sev_es_unmap_ghcb (struct vcpu_svm *svm);#ifdef CONFIG_KVM_AMD_SEV
base-commit: 60e396349c19320485a249005256d1fafee60290 --
Sean Christopherson
maintainerRe: [PATCH 2/2] KVM: SVM: Use cached value as restore value of TSC_AUX for SEV-ES guest
Quoted 3 lines · Sean Christopherson
Quoted 1 line · Hou Wenlong
On Thu, Sep 18, 2025 at 01:47:06PM -0500, Tom Lendacky wrote:
How's this look? (compile tested only)
Almost forgot...
If the suggested changes look good, no need to send a v2, I'll apply with my suggested fixups (but definitely feel free to object to any of the suggestions).
Sean Christopherson
maintainerRe: [PATCH 2/2] KVM: SVM: Use cached value as restore value of TSC_AUX for SEV-ES guest
Quoted 9 lines · Sean Christopherson
Quoted 3 lines · Sean Christopherson
Quoted 1 line · Hou Wenlong
On Thu, Sep 18, 2025 at 01:47:06PM -0500, Tom Lendacky wrote:
How's this look? (compile tested only)
Almost forgot...
If the suggested changes look good, no need to send a v2, I'll apply with my suggested fixups (but definitely feel free to object to any of the suggestions).
And talking to myself... On second thought, I'll officially post a v2 so that there's a better paper trail.
Re: [PATCH 2/2] KVM: SVM: Use cached value as restore value of TSC_AUX for SEV-ES guest
In reply to Sean ChristophersonQuoted 61 lines · Sean Christopherson
Quoted 47 lines · Hou Wenlong
Quoted 18 lines · Tom Lendacky
Quoted 8 lines · Hou Wenlong
The commit
916e3e5f26ab("KVM: SVM: Do not use user return MSR support for virtualizedTSC_AUX") assumes thatTSC_AUXis not changed by Linux post-boot, so it always restores the initial host value on #VMEXIT. However, this is not true in KVM, as it can be modified by user return MSR support for normal guests. If an SEV-ES guest always restores the initial host value on #VMEXIT, this may result in the cached value in user return MSR being different from the hardware value if the previous vCPU was a non-SEV-ES guest that had calledkvm_set_user_return_msr().Quoted 8 lines
Consequently, this may pose a problem when switching back to that vCPU, as
kvm_set_user_return_msr()would not update the hardware value because the cached value matches the target value. Unlike the TDX case, the SEV-ES guest has the ability to set the restore value in the host save area, and the cached value in the user return MSR is always the current hardware value. Therefore, the cached value could be used directly without RDMSR insvm_prepare_switch_to_guest(), making this change minimal.Quoted 6 lines
I'm not sure I follow. If Linux never changes the value of
TSC_AUXonce it has set it, then how can it ever be different? Have you seen this issue?Thanks,
TomHi, Tom.
IIUD, the normal guest still uses the user return MSR to load the guest
TSC_AUXvalue into the hardware whenTSC_AUXvirtualization is supported. However, the user return MSR only restores the host value when returning to userspace, rather than when the vCPU is scheduled out. This may lead to an issue during vCPU switching on a single pCPU, which appears as follows:normal vCPU -> SEV-ES vCPU -> normal vCPUWhen the normal vCPU switches to the SEV-ES vCPU, the hardware
TSC_AUXvalue remains as the guest value set inkvm_set_user_return_msr()by the normal vCPU. After the #VMEXIT from the SEV-ES vCPU, the hardware value becomes the host value. However, the cachedTSC_AUXvalue in the user return MSR remains the guest value of previous normal vCPU. Therefore, when switching back to that normal vCPU,kvm_set_user_return_msr()does not perform a WRMSR to load the guest value into the hardware, because the cached value matches the target value. As a result, during the execution of the normal vCPU, the normal vCPU would get an incorrectTSC_AUXvalue for RDTSCP/RDPID.Quoted 2 lines
I didn't find the available description of
TSC_AUXvirtualization in APM; all my analysis is based on the current KVM code.I'm guessing
TSC_AUXvirtualization works like SEV-ES, where hardware context switches the MSR on VMRUN/#VMEXIT.Quoted 1 line
Am I missing something?
Nope, I don't think so. I also found the changelog a bit confusing though. I would say omit the details about Linux not changing the value, and instead focus on the need to re-load the current hardware value. That should be intuitive for all readers, and is correct regradless of what/whose value is currently in hardware.
Quoted 7 lines
I also think we should handle setting
hostsa->tsc_auxinsev_es_prepare_switch_to_guest(). That obviously requires duplicating some of logic related to SEV-ES andTSC_AUX, but I think I prefer that to splitting the handling of the host save area.How's this look? (compile tested only)
I'm fine with it. Thanks for your fixup; I think I need to improve my changlog next time. :)
Thanks!
Quoted 135 lines
--
Subject: [PATCH] KVM: SVM: Re-load current, not host,TSC_AUXon #VMEXIT from
SEV-ES guestPrior to running an SEV-ES guest, set
TSC_AUXin the host save area to the current value in hardware, as tracked by the user return infrastructure, instead of always loading the host's desired value for the CPU. If the pCPU is also running a non-SEV-ES vCPU, loading the hosts value on #VMEXIT could clobber the other vCPU's value, e.g. if the SEV-ES vCPU preempted the non-SEV-ES vCPU.Note, unlike TDX, which blindly _zeroes_
TSC_AUXon exit, SEV-ES CPUs can load an arbitrary value. Stuff the current value in the host save area instead of refreshing the user return cache so that KVM doesn't need to track whether or not the vCPU actually enterred the guest and thus loadedTSC_AUXfrom the host save area.Fixes 916e3e5f26ab ("KVM: SVM: Do not use user return MSR support for virtualized TSC_AUX")Suggested-by Lai Jiangshan <[email protected]>Signed-off-by Hou Wenlong <[email protected]>[sean: handle the SEV-ES case in sev_es_prepare_switch_to_guest()]Signed-off-by Sean Christopherson <[email protected]>--- arch/x86/kvm/svm/sev.c | 14 +++++++++++++- arch/x86/kvm/svm/svm.c | 26 +++++++------------------- arch/x86/kvm/svm/svm.h | 4 +++- 3 files changed, 23 insertions(+), 21 deletions(-)arch/x86/kvm/svm/sev.c +13
-1@@ -4664,7 +4664,9 @@ int sev_vcpu_create(struct kvm_vcpu *vcpu)return 0 ; } -void sev_es_prepare_switch_to_guest (struct vcpu_svm *svm,struct sev_es_save_area *hostsa) +void sev_es_prepare_switch_to_guest (struct vcpu_svm *svm, +struct sev_es_save_area *hostsa, +int tsc_aux_uret_slot) {struct kvm *kvm = svm->vcpu.kvm;@@ -4712,6 +4714,16 @@ void sev_es_prepare_switch_to_guest(struct vcpu_svm *svm, struct sev_es_save_are hostsa->dr2_addr_mask =amd_get_dr_addr_mask (2 ); hostsa->dr3_addr_mask =amd_get_dr_addr_mask (3 ); } + +/* +* TSC_AUX is always virtualized for SEV-ES guests when the feature is +* available, i.e. TSC_AUX is loaded on #VMEXIT from the host save area. +* Set the save area to the current hardware value, i.e. the current +* user return value, so that the correct value is restored on #VMEXIT. +*/ +if (cpu_feature_enabled (X86_FEATURE_V_TSC_AUX ) && + !WARN_ON_ONCE (tsc_aux_uret_slot <0 )) + hostsa->tsc_aux =kvm_get_user_return_msr (tsc_aux_uret_slot); }void sev_vcpu_deliver_sipi_vector (struct kvm_vcpu *vcpu,u8 vector)arch/x86/kvm/svm/svm.c +7
-19@@ -577,18 +577,6 @@ static int svm_enable_virtualization_cpu(void)amd_pmu_enable_virt (); -/* -* If TSC_AUX virtualization is supported, TSC_AUX becomes a swap type -* "B" field (see sev_es_prepare_switch_to_guest()) for SEV-ES guests. -* Since Linux does not change the value of TSC_AUX once set, prime the -* TSC_AUX field now to avoid a RDMSR on every vCPU run. -*/ -if (boot_cpu_has (X86_FEATURE_V_TSC_AUX )) { -u32 __maybe_unused msr_hi; - -rdmsr (MSR_TSC_AUX ,sev_es_host_save_area (sd)->tsc_aux, msr_hi); - } -return 0 ; }@@ -1400,16 +1388,17 @@ static void svm_prepare_switch_to_guest(struct kvm_vcpu *vcpu)*/ vmsave (sd->save_area_pa);if (sev_es_guest (vcpu->kvm)) -sev_es_prepare_switch_to_guest (svm,sev_es_host_save_area (sd)); +sev_es_prepare_switch_to_guest (svm,sev_es_host_save_area (sd), + tsc_aux_uret_slot);if (tsc_scaling)__svm_write_tsc_multiplier (vcpu->arch.tsc_scaling_ratio);/* -* TSC_AUX is always virtualized for SEV-ES guests when the feature is -* available. The user return MSR support is not required in this case -* because TSC_AUX is restored on #VMEXIT from the host save area -* (which has been initialized in svm_enable_virtualization_cpu()). +* TSC_AUX is always virtualized (context switched by hardware) for +* SEV-ES guests when the feature is available. For non-SEV-ES guests, +* context switch TSC_AUX via the user_return MSR infrastructure (not +* all CPUs support TSC_AUX virtualization). */ if (likely (tsc_aux_uret_slot >=0 ) && (!boot_cpu_has (X86_FEATURE_V_TSC_AUX ) || !sev_es_guest (vcpu->kvm)))@@ -3004,8 +2993,7 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr)* TSC_AUX is always virtualized for SEV-ES guests when the * feature is available. The user return MSR support is not * required in this case because TSC_AUX is restored on #VMEXIT -* from the host save area (which has been initialized in -* svm_enable_virtualization_cpu()). +* from the host save area. */ if (boot_cpu_has (X86_FEATURE_V_TSC_AUX ) &&sev_es_guest (vcpu->kvm))break ;arch/x86/kvm/svm/svm.h +3
-1@@ -831,7 +831,9 @@ void sev_vcpu_after_set_cpuid(struct vcpu_svm *svm);int sev_es_string_io (struct vcpu_svm *svm,int size,unsigned int port,int in);void sev_es_recalc_msr_intercepts (struct kvm_vcpu *vcpu);void sev_vcpu_deliver_sipi_vector (struct kvm_vcpu *vcpu,u8 vector); -void sev_es_prepare_switch_to_guest (struct vcpu_svm *svm,struct sev_es_save_area *hostsa); +void sev_es_prepare_switch_to_guest (struct vcpu_svm *svm, +struct sev_es_save_area *hostsa, +int tsc_aux_uret_slot);void sev_es_unmap_ghcb (struct vcpu_svm *svm);#ifdef CONFIG_KVM_AMD_SEV base-commit:
60e396349c19320485a249005256d1fafee60290--
Sean Christopherson
maintainerQuoted 17 lines · Hou Wenlong
In the user return MSR support, the cached value is always the hardware value of the specific MSR. Therefore, add a helper to retrieve the cached value, which can replace the need for RDMSR, for example, to allow SEV-ES guests to restore the correct host hardware value without using RDMSR.
Signed-off-by Hou Wenlong <[email protected]>--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/x86.c | 8 ++++++++ 2 files changed, 9 insertions(+)arch/x86/include/asm/kvm_host.h +0
-0
arch/x86/include/asm/kvm_host.h int kvm_add_user_return_msr(u32 msr); · line 2379
Quoted 4 lines
arch/x86/include/asm/kvm_host.h +1
-0@@ -2376,6 +2376,7 @@ int kvm_add_user_return_msr(u32 msr);int kvm_find_user_return_msr (u32 msr);int kvm_set_user_return_msr (unsigned index,u64 val,u64 mask);void kvm_user_return_msr_update_cache (unsigned int index,u64 val); +u64 kvm_get_user_return_msr_cache (unsigned int index);
s/index/slot (the existing helpers need to be changed). The user_return APIs deliberately use "slot" to try and make it more obvious that they take the slot within the array, not the index of the MSR.
arch/x86/kvm/x86.c void kvm_user_return_msr_update_cache(unsigned int slot, u64 value) · line 678
Quoted 11 lines
arch/x86/include/asm/kvm_host.h +0
-0static inline bool kvm_is_supported_user_return_msr (u32 msr) {arch/x86/kvm/x86.c +1
-0@@ -675,6 +675,14 @@ void kvm_user_return_msr_update_cache(unsigned int slot, u64 value) }EXPORT_SYMBOL_GPL (kvm_user_return_msr_update_cache); +u64 kvm_get_user_return_msr_cache (unsigned int slot)
I vote to drop "cache". I don't love the existing kvm_user_return_msr_update_cache() name (or implementation). I would much rather that code be (I'll post a separate patch) the below, to capture that the "cache" version is performing a subest of the kvm_set_user_return_msr().
void __kvm_set_user_return_msr(unsigned int slot, u64 value)
{
struct kvm_user_return_msrs *msrs = this_cpu_ptr(user_return_msrs);
msrs->values[slot].curr = value;
kvm_user_return_register_notifier(msrs);
}EXPORT_SYMBOL_GPL(__kvm_set_user_return_msr);
int kvm_set_user_return_msr(unsigned slot, u64 value, u64 mask)
{
struct kvm_user_return_msrs *msrs = this_cpu_ptr(user_return_msrs);
int err;
value = (value & mask) | (msrs->values[slot].host & ~mask);
if (value == msrs->values[slot].curr)
return 0;
err = wrmsrq_safe(kvm_uret_msrs_list[slot], value);
if (err)
return 1;
__kvm_set_user_return_msr(slot, value);
return 0;
}EXPORT_SYMBOL_GPL(kvm_set_user_return_msr);
arch/x86/kvm/x86.c void kvm_user_return_msr_update_cache(unsigned int slot, u64 value) · line 682
Quoted 4 lines
arch/x86/kvm/x86.c +4
-0+{ +struct kvm_user_return_msrs *msrs =this_cpu_ptr (user_return_msrs); + +return msrs->values[slot].curr;
This can be a one-liner. How about this?
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/x86.c | 6 ++++++ 2 files changed, 7 insertions(+)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -2376,6 +2376,7 @@ int kvm_add_user_return_msr(u32 msr);int kvm_find_user_return_msr (u32 msr);int kvm_set_user_return_msr (unsigned index,u64 val,u64 mask);void kvm_user_return_msr_update_cache (unsigned int index,u64 val); +u64 kvm_get_user_return_msr (unsigned int slot);static inline bool kvm_is_supported_user_return_msr (u32 msr) {
arch/x86/kvm/x86.c +6 -0
@@ -675,6 +675,12 @@ void kvm_user_return_msr_update_cache(unsigned int slot, u64 value) }EXPORT_SYMBOL_GPL (kvm_user_return_msr_update_cache); +u64 kvm_get_user_return_msr (unsigned int slot) +{ +return this_cpu_ptr (user_return_msrs)->values[slot].curr; +} +EXPORT_SYMBOL_GPL (kvm_get_user_return_msr); +static void drop_user_return_notifiers (void ) {struct kvm_user_return_msrs *msrs =this_cpu_ptr (user_return_msrs);
base-commit: c8fbf7ceb2ae3f64b0c377c8c21f6df577a13eb4