Skip to content

Commit 8f56b14

Browse files
xinli-intelsean-jc
authored andcommitted
KVM: VMX: Open code VMX preemption timer rate mask in its accessor
Use vmx_misc_preemption_timer_rate() to get the rate in hardware_setup(), and open code the rate's bitmask in vmx_misc_preemption_timer_rate() so that the function looks like all the helpers that grab values from VMX_BASIC and VMX_MISC MSR values. No functional change intended. Cc: Shan Kang <shan.kang@intel.com> Cc: Kai Huang <kai.huang@intel.com> Signed-off-by: Xin Li <xin3.li@intel.com> [sean: split to separate patch, write changelog] Reviewed-by: Kai Huang <kai.huang@intel.com> Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com> Link: https://lore.kernel.org/r/20240605231918.2915961-10-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent dc1e67f commit 8f56b14

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

arch/x86/include/asm/vmx.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ static inline u64 vmx_basic_encode_vmcs_info(u32 revision, u16 size, u8 memtype)
153153
return revision | ((u64)size << 32) | ((u64)memtype << 50);
154154
}
155155

156-
#define VMX_MISC_PREEMPTION_TIMER_RATE_MASK GENMASK_ULL(4, 0)
157156
#define VMX_MISC_SAVE_EFER_LMA BIT_ULL(5)
158157
#define VMX_MISC_ACTIVITY_HLT BIT_ULL(6)
159158
#define VMX_MISC_ACTIVITY_SHUTDOWN BIT_ULL(7)
@@ -167,7 +166,7 @@ static inline u64 vmx_basic_encode_vmcs_info(u32 revision, u16 size, u8 memtype)
167166

168167
static inline int vmx_misc_preemption_timer_rate(u64 vmx_misc)
169168
{
170-
return vmx_misc & VMX_MISC_PREEMPTION_TIMER_RATE_MASK;
169+
return vmx_misc & GENMASK_ULL(4, 0);
171170
}
172171

173172
static inline int vmx_misc_cr3_count(u64 vmx_misc)

arch/x86/kvm/vmx/vmx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8517,7 +8517,7 @@ __init int vmx_hardware_setup(void)
85178517
u64 use_timer_freq = 5000ULL * 1000 * 1000;
85188518

85198519
cpu_preemption_timer_multi =
8520-
vmcs_config.misc & VMX_MISC_PREEMPTION_TIMER_RATE_MASK;
8520+
vmx_misc_preemption_timer_rate(vmcs_config.misc);
85218521

85228522
if (tsc_khz)
85238523
use_timer_freq = (u64)tsc_khz * 1000;

0 commit comments

Comments
 (0)