KVM: VMX: Replace MSR_IA32_RTIT_OUTPUT_BASE_MASK with helper function (1cc6cbc3) · Commits · 戴 / test

arch/x86/kvm/vmx/vmx.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -146,9 +146,6 @@ module_param_named(preemption_timer, enable_preemption_timer, bool, S_IRUGO);
		RTIT_STATUS_ERROR \| RTIT_STATUS_STOPPED \| \
		RTIT_STATUS_BYTECNT))

		#define MSR_IA32_RTIT_OUTPUT_BASE_MASK \
		(~((1UL << cpuid_maxphyaddr(vcpu)) - 1) \| 0x7f)

		/*
		* These 2 parameters are used to config the controls for Pause-Loop Exiting:
		* ple_gap: upper bound on the amount of time between two successive
		@@ -1037,6 +1034,12 @@ static inline bool pt_can_write_msr(struct vcpu_vmx *vmx)
		!(vmx->pt_desc.guest.ctl & RTIT_CTL_TRACEEN);
		}

		static inline bool pt_output_base_valid(struct kvm_vcpu *vcpu, u64 base)
		{
		/* The base must be 128-byte aligned and a legal physical address. */
		return !(base & (~((1UL << cpuid_maxphyaddr(vcpu)) - 1) \| 0x7f));
		}

		static inline void pt_load_msr(struct pt_ctx *ctx, u32 addr_range)
		{
		u32 i;
		@@ -2172,7 +2175,7 @@ static int vmx_set_msr(struct kvm_vcpu vcpu, struct msr_data msr_info)
		!intel_pt_validate_cap(vmx->pt_desc.caps,
		PT_CAP_single_range_output))
		return 1;
		if (data & MSR_IA32_RTIT_OUTPUT_BASE_MASK)
		if (!pt_output_base_valid(vcpu, data))
		return 1;
		vmx->pt_desc.guest.output_base = data;
		break;