KVM: VMX: Cap VMX preemption timer to work around Intel errata
PATCH 1/1 KVM: VMX: Cap VMX preemption timer to work around Intel errata
Due to a widespread Intel erratum (e.g. EMR158), programming the VMX-preemption timer with certain large values may cause the timer to expire earlier than expected. The recommended workaround is to cap the VMX-preemption timer value to strictly less than 2^25 * CPUID.15H:EBX[31:0] / CPUID.15H:EAX[31:0].
Calculate preemption_timer_limit during hardware setup based on CPUID 15H when available, and return -ERANGE in vmx_set_hv_timer() if the shifted delta_tsc reaches or exceeds preemption_timer_limit.
--- arch/x86/kvm/vmx/vmx.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-)
arch/x86/kvm/vmx/vmx.c +26 -3
@@ -151,6 +151,7 @@ module_param(dump_invalid_vmcs, bool, 0644);/* Guest_tsc -> host_tsc conversion requires 64-bit division. */ static int __read_mostly cpu_preemption_timer_multi;static bool __read_mostly enable_preemption_timer =1 ; +static u64 __read_mostly preemption_timer_limit =1ULL <<32 ;#ifdef CONFIG_X86_64 module_param_named (preemption_timer, enable_preemption_timer, bool,S_IRUGO );#endif
@@ -8338,12 +8339,12 @@ int vmx_set_hv_timer(struct kvm_vcpu *vcpu, u64 guest_deadline_tsc,return -ERANGE ;/* -* If the delta tsc can't fit in the 32 bit after the multi shift, -* we can't use the preemption timer. +* If the delta tsc exceeds the preemption timer limit after the +* multi shift, we can't use the preemption timer. * It's possible that it fits on later vmentries, but checking * on every vmentry is costly so we just use an hrtimer. */ -if (delta_tsc >> (cpu_preemption_timer_multi +32 )) +if ((delta_tsc >> cpu_preemption_timer_multi) >= preemption_timer_limit)return -ERANGE ; vmx->hv_deadline_tsc = tscl + delta_tsc;
@@ -8585,6 +8586,26 @@ static void __init vmx_setup_me_spte_mask(void)kvm_mmu_set_me_spte_mask (0 , me_mask); } +/* +* Workaround for a widespread Intel erratum (e.g. EMR158) where the +* VMX-preemption timer may expire earlier than expected when programmed +* with large values. The workaround is to cap the timer value to strictly +* less than 2^25 * CPUID.15H:EBX / CPUID.15H:EAX. +*/ +static __init u64 calc_preemption_timer_limit (void ) +{ +u32 eax, ebx, ecx, edx; + +if (cpuid_eax (0 ) <0x15 ) +return 1ULL <<32 ; + +cpuid (0x15 , &eax, &ebx, &ecx, &edx); +if (!eax || !ebx) +return 1ULL <<32 ; + +return min_t (u64,1ULL <<32 , ((u64 )ebx <<25 ) / eax); +} +__init int vmx_hardware_setup (void ) {unsigned long host_bndcfgs;
@@ -8726,6 +8747,8 @@ __init int vmx_hardware_setup(void) cpu_preemption_timer_multi =vmx_misc_preemption_timer_rate (vmcs_config.misc); + preemption_timer_limit =calc_preemption_timer_limit (); +if (tsc_khz) use_timer_freq = (u64 )tsc_khz *1000 ; use_timer_freq >>= cpu_preemption_timer_multi;
Signature · 1 line
2.55.0.229.g6434b31f56-goog
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [High] The patch introduces a 64-bit division using the `/` operator which will cause a link-time error…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] The patch introduces a 64-bit division using the / operator which will cause a link-time error (undefined reference to __udivdi3) on 32-bit x86 builds. --
--- Patch [1]: [PATCH] KVM: VMX: Cap VMX preemption timer to work around Intel errata --- commit 366ce3421414ba11b41c6d60e48e81bd155756a9
Author: Jim Mattson <[email protected]>
KVM: VMX: Cap VMX preemption timer to work around Intel errata
Due to a widespread Intel erratum (e.g. EMR158), programming the VMX-preemption timer with certain large values may cause the timer to expire earlier than expected. This patch calculates a limit based on CPUID 15H and returns -ERANGE in vmx_set_hv_timer() if the shifted delta_tsc reaches or exceeds this preemption timer limit.
Quoted 4 lines
arch/x86/kvm/vmx/vmx.c +0
-0
[ ... ]
Quoted 12 lines
arch/x86/kvm/vmx/vmx.c +8
-0@@ -8489,6 +8490,26 @@ static void __init vmx_setup_me_spte_mask(void)kvm_mmu_set_me_spte_mask (0 , me_mask); } +/* +* Workaround for a widespread Intel erratum (e.g. EMR158) where the +* VMX-preemption timer may expire earlier than expected when programmed +* with large values. The workaround is to cap the timer value to strictly +* less than 2^25 * CPUID.15H:EBX / CPUID.15H:EAX. +*/ +static __init u64 calc_preemption_timer_limit (void ) +{
arch/x86/kvm/vmx/vmx.c static void __init vmx_setup_me_spte_mask(void) · line 8510
Quoted 10 lines
arch/x86/kvm/vmx/vmx.c +10
-0+u32 eax, ebx, ecx, edx; + +if (cpuid_eax (0 ) <0x15 ) +return 1ULL <<32 ; + +cpuid (0x15 , &eax, &ebx, &ecx, &edx); +if (!eax || !ebx) +return 1ULL <<32 ; + +return min_t (u64,1ULL <<32 , ((u64 )ebx <<25 ) / eax);
^^^^^
[Severity: High]
Will this 64-bit division using the / operator cause a link-time error on 32-bit x86 builds?
Since the Linux kernel does not export the __udivdi3 compiler intrinsic on 32-bit x86, compiling with CONFIG_KVM_INTEL enabled on a 32-bit configuration might result in an undefined reference error during the build.
Should this use div_u64() from include/linux/math64.h to perform the 64-bit by 32-bit division instead?
Quoted 2 lines
arch/x86/kvm/vmx/vmx.c +2
-0+} +
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1