Commit ad9c539b authored by Like Xu's avatar Like Xu Committed by Zheng Zengkai
Browse files

KVM: x86/pmu: Introduce the ctrl_mask value for fixed counter 

stable inclusion
from stable-v5.10.137
commit 46ec3d8e909429f18b3f859de356e6e182637cbc
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I60PLB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=46ec3d8e909429f18b3f859de356e6e182637cbc



--------------------------------

[ Upstream commit 2c985527 ]

The mask value of fixed counter control register should be dynamic
adjusted with the number of fixed counters. This patch introduces a
variable that includes the reserved bits of fixed counter control
registers. This is a generic code refactoring.

Co-developed-by: default avatarLuwei Kang <luwei.kang@intel.com>
Signed-off-by: default avatarLuwei Kang <luwei.kang@intel.com>
Signed-off-by: default avatarLike Xu <like.xu@linux.intel.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Message-Id: <20220411101946.20262-6-likexu@tencent.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: default avatarWei Li <liwei391@huawei.com>
parent 81305c9c

arch/x86/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -451,6 +451,7 @@ struct kvm_pmu { 
	unsigned nr_arch_fixed_counters;

	unsigned available_event_types;

	u64 fixed_ctr_ctrl;

	u64 fixed_ctr_ctrl_mask;

	u64 global_ctrl;

	u64 global_status;

	u64 global_ovf_ctrl;

arch/x86/kvm/vmx/pmu_intel.c

+5 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
	case MSR_CORE_PERF_FIXED_CTR_CTRL:

		if (pmu->fixed_ctr_ctrl == data)

			return 0;

		if (!(data & 0xfffffffffffff444ull)) {

		if (!(data & pmu->fixed_ctr_ctrl_mask)) {

			reprogram_fixed_counters(pmu, data);

			return 0;

		}
@@ -467,6 +467,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) 
	struct kvm_cpuid_entry2 *entry;

	union cpuid10_eax eax;

	union cpuid10_edx edx;

	int i;



	pmu->nr_arch_gp_counters = 0;

	pmu->nr_arch_fixed_counters = 0;
@@ -475,6 +476,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) 
	pmu->version = 0;

	pmu->reserved_bits = 0xffffffff00200000ull;

	pmu->raw_event_mask = X86_RAW_EVENT_MASK;

	pmu->fixed_ctr_ctrl_mask = ~0ull;



	entry = kvm_find_cpuid_entry(vcpu, 0xa, 0);

	if (!entry)
@@ -508,6 +510,8 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) 
			((u64)1 << edx.split.bit_width_fixed) - 1;

	}



	for (i = 0; i < pmu->nr_arch_fixed_counters; i++)

		pmu->fixed_ctr_ctrl_mask &= ~(0xbull << (i * 4));

	pmu->global_ctrl = ((1ull << pmu->nr_arch_gp_counters) - 1) |

		(((1ull << pmu->nr_arch_fixed_counters) - 1) << INTEL_PMC_IDX_FIXED);

	pmu->global_ctrl_mask = ~pmu->global_ctrl;