Commit 8f56b14e authored by Xin Li's avatar Xin Li Committed by Sean Christopherson
Browse files

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: default avatarXin Li <xin3.li@intel.com>
[sean: split to separate patch, write changelog]
Reviewed-by: default avatarKai Huang <kai.huang@intel.com>
Reviewed-by: default avatarXiaoyao Li <xiaoyao.li@intel.com>
Link: https://lore.kernel.org/r/20240605231918.2915961-10-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent dc1e67f7

arch/x86/include/asm/vmx.h

+1 −2
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ static inline u64 vmx_basic_encode_vmcs_info(u32 revision, u16 size, u8 memtype) 
	return revision | ((u64)size << 32) | ((u64)memtype << 50);

}



#define VMX_MISC_PREEMPTION_TIMER_RATE_MASK	GENMASK_ULL(4, 0)

#define VMX_MISC_SAVE_EFER_LMA			BIT_ULL(5)

#define VMX_MISC_ACTIVITY_HLT			BIT_ULL(6)

#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) 


static inline int vmx_misc_preemption_timer_rate(u64 vmx_misc)

{

	return vmx_misc & VMX_MISC_PREEMPTION_TIMER_RATE_MASK;

	return vmx_misc & GENMASK_ULL(4, 0);

}



static inline int vmx_misc_cr3_count(u64 vmx_misc)

arch/x86/kvm/vmx/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -8517,7 +8517,7 @@ __init int vmx_hardware_setup(void) 
		u64 use_timer_freq = 5000ULL * 1000 * 1000;



		cpu_preemption_timer_multi =

			vmcs_config.misc & VMX_MISC_PREEMPTION_TIMER_RATE_MASK;

			vmx_misc_preemption_timer_rate(vmcs_config.misc);



		if (tsc_khz)

			use_timer_freq = (u64)tsc_khz * 1000;