Skip to contentSkip to conversation

vPMU code refines

PATCH Applied Dapeng Mi 3 participants 8 messages Apr 30, 2024 – Jun 4, 2024

Subsystems (3)
lore
Share & tools
lore

Dapeng Mi

author
#0 lore raw

cover vPMU code refines

This small patchset refines the ambiguous naming in kvm_pmu structure and use macros instead of magic numbers to manipulate FIXED_CTR_CTRL MSR to increase readability.

No logic change is introduced in this patchset.

Dapeng Mi (2):
KVM: x86/pmu: Change ambiguous _mask suffix to _rsvd in kvm_pmu
KVM: x86/pmu: Manipulate FIXED_CTR_CTRL MSR with macros

 arch/x86/include/asm/kvm_host.h | 10 ++++-----
 arch/x86/kvm/pmu.c              | 26 ++++++++++++------------
 arch/x86/kvm/pmu.h              |  8 +++++---
 arch/x86/kvm/svm/pmu.c          |  4 ++--
 arch/x86/kvm/vmx/pmu_intel.c    | 36 +++++++++++++++++++--------------
 5 files changed, 46 insertions(+), 38 deletions(-)

base-commit: 7b076c6a308ec5bce9fc96e2935443ed228b9148

Signature · 1 line
2.40.1
author
#1 lore raw

PATCH 1/2 KVM: x86/pmu: Change ambiguous _mask suffix to _rsvd in kvm_pmu

Several '_mask' suffixed variables such as, global_ctrl_mask, are defined in kvm_pmu structure. However the _mask suffix is ambiguous and misleading since it's not a real mask with positive logic. On the contrary it represents the reserved bits of corresponding MSRs and these bits should not be accessed.

---
 arch/x86/include/asm/kvm_host.h | 10 +++++-----
 arch/x86/kvm/pmu.c              | 16 ++++++++--------
 arch/x86/kvm/pmu.h              |  2 +-
 arch/x86/kvm/svm/pmu.c          |  4 ++--
 arch/x86/kvm/vmx/pmu_intel.c    | 26 +++++++++++++-------------
 5 files changed, 29 insertions(+), 29 deletions(-)
arch/x86/include/asm/kvm_host.h +5 -5
index 1d13e3cd1dc5..90edb7d30fce 100644
@@ -543,12 +543,12 @@ struct kvm_pmu {
 	unsigned nr_arch_fixed_counters;
 	unsigned available_event_types;
 	u64 fixed_ctr_ctrl;
-	u64 fixed_ctr_ctrl_mask;
+	u64 fixed_ctr_ctrl_rsvd;
 	u64 global_ctrl;
 	u64 global_status;
 	u64 counter_bitmask[2];
-	u64 global_ctrl_mask;
-	u64 global_status_mask;
+	u64 global_ctrl_rsvd;
+	u64 global_status_rsvd;
 	u64 reserved_bits;
 	u64 raw_event_mask;
 	struct kvm_pmc gp_counters[KVM_INTEL_PMC_MAX_GENERIC];
@@ -568,9 +568,9 @@ struct kvm_pmu {
 
 	u64 ds_area;
 	u64 pebs_enable;
-	u64 pebs_enable_mask;
+	u64 pebs_enable_rsvd;
 	u64 pebs_data_cfg;
-	u64 pebs_data_cfg_mask;
+	u64 pebs_data_cfg_rsvd;
 
 	/*
 	 * If a guest counter is cross-mapped to host counter with different
arch/x86/kvm/pmu.c +8 -8
index a593b03c9aed..afbd67ca782c 100644
@@ -681,13 +681,13 @@ int kvm_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 		if (!msr_info->host_initiated)
 			break;
 
-		if (data & pmu->global_status_mask)
+		if (data & pmu->global_status_rsvd)
 			return 1;
 
 		pmu->global_status = data;
 		break;
 	case MSR_AMD64_PERF_CNTR_GLOBAL_CTL:
-		data &= ~pmu->global_ctrl_mask;
+		data &= ~pmu->global_ctrl_rsvd;
 		fallthrough;
 	case MSR_CORE_PERF_GLOBAL_CTRL:
 		if (!kvm_valid_perf_global_ctrl(pmu, data))
@@ -704,7 +704,7 @@ int kvm_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 		 * GLOBAL_OVF_CTRL, a.k.a. GLOBAL STATUS_RESET, clears bits in
 		 * GLOBAL_STATUS, and so the set of reserved bits is the same.
 		 */
-		if (data & pmu->global_status_mask)
+		if (data & pmu->global_status_rsvd)
 			return 1;
 		fallthrough;
 	case MSR_AMD64_PERF_CNTR_GLOBAL_STATUS_CLR:
@@ -768,11 +768,11 @@ void kvm_pmu_refresh(struct kvm_vcpu *vcpu)
 	pmu->counter_bitmask[KVM_PMC_FIXED] = 0;
 	pmu->reserved_bits = 0xffffffff00200000ull;
 	pmu->raw_event_mask = X86_RAW_EVENT_MASK;
-	pmu->global_ctrl_mask = ~0ull;
-	pmu->global_status_mask = ~0ull;
-	pmu->fixed_ctr_ctrl_mask = ~0ull;
-	pmu->pebs_enable_mask = ~0ull;
-	pmu->pebs_data_cfg_mask = ~0ull;
+	pmu->global_ctrl_rsvd = ~0ull;
+	pmu->global_status_rsvd = ~0ull;
+	pmu->fixed_ctr_ctrl_rsvd = ~0ull;
+	pmu->pebs_enable_rsvd = ~0ull;
+	pmu->pebs_data_cfg_rsvd = ~0ull;
 	bitmap_zero(pmu->all_valid_pmc_idx, X86_PMC_IDX_MAX);
 
 	if (!vcpu->kvm->arch.enable_pmu)
arch/x86/kvm/pmu.h +1 -1
index 4d52b0b539ba..2eab8ea610db 100644
@@ -129,7 +129,7 @@ static inline bool pmc_is_fixed(struct kvm_pmc *pmc)
 static inline bool kvm_valid_perf_global_ctrl(struct kvm_pmu *pmu,
 						 u64 data)
 {
-	return !(pmu->global_ctrl_mask & data);
+	return !(pmu->global_ctrl_rsvd & data);
 }
 
 /* returns general purpose PMC with the specified MSR. Note that it can be
arch/x86/kvm/svm/pmu.c +2 -2
index dfcc38bd97d3..6e908bdc3310 100644
@@ -199,8 +199,8 @@ static void amd_pmu_refresh(struct kvm_vcpu *vcpu)
 					 kvm_pmu_cap.num_counters_gp);
 
 	if (pmu->version > 1) {
-		pmu->global_ctrl_mask = ~((1ull << pmu->nr_arch_gp_counters) - 1);
-		pmu->global_status_mask = pmu->global_ctrl_mask;
+		pmu->global_ctrl_rsvd = ~((1ull << pmu->nr_arch_gp_counters) - 1);
+		pmu->global_status_rsvd = pmu->global_ctrl_rsvd;
 	}
 
 	pmu->counter_bitmask[KVM_PMC_GP] = ((u64)1 << 48) - 1;
arch/x86/kvm/vmx/pmu_intel.c +13 -13
index be40474de6e4..eaee9a08952e 100644
@@ -348,14 +348,14 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 
 	switch (msr) {
 	case MSR_CORE_PERF_FIXED_CTR_CTRL:
-		if (data & pmu->fixed_ctr_ctrl_mask)
+		if (data & pmu->fixed_ctr_ctrl_rsvd)
 			return 1;
 
 		if (pmu->fixed_ctr_ctrl != data)
 			reprogram_fixed_counters(pmu, data);
 		break;
 	case MSR_IA32_PEBS_ENABLE:
-		if (data & pmu->pebs_enable_mask)
+		if (data & pmu->pebs_enable_rsvd)
 			return 1;
 
 		if (pmu->pebs_enable != data) {
@@ -371,7 +371,7 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 		pmu->ds_area = data;
 		break;
 	case MSR_PEBS_DATA_CFG:
-		if (data & pmu->pebs_data_cfg_mask)
+		if (data & pmu->pebs_data_cfg_rsvd)
 			return 1;
 
 		pmu->pebs_data_cfg = data;
@@ -456,7 +456,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)
 	union cpuid10_eax eax;
 	union cpuid10_edx edx;
 	u64 perf_capabilities;
-	u64 counter_mask;
+	u64 counter_rsvd;
 	int i;
 
 	memset(&lbr_desc->records, 0, sizeof(lbr_desc->records));
@@ -502,21 +502,21 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)
 	}
 
 	for (i = 0; i < pmu->nr_arch_fixed_counters; i++)
-		pmu->fixed_ctr_ctrl_mask &= ~(0xbull << (i * 4));
-	counter_mask = ~(((1ull << pmu->nr_arch_gp_counters) - 1) |
+		pmu->fixed_ctr_ctrl_rsvd &= ~(0xbull << (i * 4));
+	counter_rsvd = ~(((1ull << pmu->nr_arch_gp_counters) - 1) |
 		(((1ull << pmu->nr_arch_fixed_counters) - 1) << KVM_FIXED_PMC_BASE_IDX));
-	pmu->global_ctrl_mask = counter_mask;
+	pmu->global_ctrl_rsvd = counter_rsvd;
 
 	/*
 	 * GLOBAL_STATUS and GLOBAL_OVF_CONTROL (a.k.a. GLOBAL_STATUS_RESET)
 	 * share reserved bit definitions.  The kernel just happens to use
 	 * OVF_CTRL for the names.
 	 */
-	pmu->global_status_mask = pmu->global_ctrl_mask
+	pmu->global_status_rsvd = pmu->global_ctrl_rsvd
 			& ~(MSR_CORE_PERF_GLOBAL_OVF_CTRL_OVF_BUF |
 			    MSR_CORE_PERF_GLOBAL_OVF_CTRL_COND_CHGD);
 	if (vmx_pt_mode_is_host_guest())
-		pmu->global_status_mask &=
+		pmu->global_status_rsvd &=
 				~MSR_CORE_PERF_GLOBAL_OVF_CTRL_TRACE_TOPA_PMI;
 
 	entry = kvm_find_cpuid_entry_index(vcpu, 7, 0);
@@ -544,15 +544,15 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)
 
 	if (perf_capabilities & PERF_CAP_PEBS_FORMAT) {
 		if (perf_capabilities & PERF_CAP_PEBS_BASELINE) {
-			pmu->pebs_enable_mask = counter_mask;
+			pmu->pebs_enable_rsvd = counter_rsvd;
 			pmu->reserved_bits &= ~ICL_EVENTSEL_ADAPTIVE;
 			for (i = 0; i < pmu->nr_arch_fixed_counters; i++) {
-				pmu->fixed_ctr_ctrl_mask &=
+				pmu->fixed_ctr_ctrl_rsvd &=
 					~(1ULL << (KVM_FIXED_PMC_BASE_IDX + i * 4));
 			}
-			pmu->pebs_data_cfg_mask = ~0xff00000full;
+			pmu->pebs_data_cfg_rsvd = ~0xff00000full;
 		} else {
-			pmu->pebs_enable_mask =
+			pmu->pebs_enable_rsvd =
 				~((1ull << pmu->nr_arch_gp_counters) - 1);
 		}
 	}
Signature · 1 line
2.40.1
author
#2 lore raw

PATCH 2/2 KVM: x86/pmu: Manipulate FIXED_CTR_CTRL MSR with macros

In reply to Dapeng Mi

Magic numbers are used to manipulate the bit fields of FIXED_CTR_CTRL MSR. This makes reading code become difficult, so use pre-defined macros to replace these magic numbers.

---
 arch/x86/kvm/pmu.c           | 10 +++++-----
 arch/x86/kvm/pmu.h           |  6 ++++--
 arch/x86/kvm/vmx/pmu_intel.c | 12 +++++++++---
 3 files changed, 18 insertions(+), 10 deletions(-)
arch/x86/kvm/pmu.c +5 -5
index afbd67ca782c..0314a4fe8b2d 100644
@@ -469,11 +469,11 @@ static int reprogram_counter(struct kvm_pmc *pmc)
 	if (pmc_is_fixed(pmc)) {
 		fixed_ctr_ctrl = fixed_ctrl_field(pmu->fixed_ctr_ctrl,
 						  pmc->idx - KVM_FIXED_PMC_BASE_IDX);
-		if (fixed_ctr_ctrl & 0x1)
+		if (fixed_ctr_ctrl & INTEL_FIXED_0_KERNEL)
 			eventsel |= ARCH_PERFMON_EVENTSEL_OS;
-		if (fixed_ctr_ctrl & 0x2)
+		if (fixed_ctr_ctrl & INTEL_FIXED_0_USER)
 			eventsel |= ARCH_PERFMON_EVENTSEL_USR;
-		if (fixed_ctr_ctrl & 0x8)
+		if (fixed_ctr_ctrl & INTEL_FIXED_0_ENABLE_PMI)
 			eventsel |= ARCH_PERFMON_EVENTSEL_INT;
 		new_config = (u64)fixed_ctr_ctrl;
 	}
@@ -846,8 +846,8 @@ static inline bool cpl_is_matched(struct kvm_pmc *pmc)
 	} else {
 		config = fixed_ctrl_field(pmc_to_pmu(pmc)->fixed_ctr_ctrl,
 					  pmc->idx - KVM_FIXED_PMC_BASE_IDX);
-		select_os = config & 0x1;
-		select_user = config & 0x2;
+		select_os = config & INTEL_FIXED_0_KERNEL;
+		select_user = config & INTEL_FIXED_0_USER;
 	}
 
 	/*
arch/x86/kvm/pmu.h +4 -2
index 2eab8ea610db..d54741fe4bdd 100644
@@ -14,7 +14,8 @@
 					  MSR_IA32_MISC_ENABLE_BTS_UNAVAIL)
 
 /* retrieve the 4 bits for EN and PMI out of IA32_FIXED_CTR_CTRL */
-#define fixed_ctrl_field(ctrl_reg, idx) (((ctrl_reg) >> ((idx)*4)) & 0xf)
+#define fixed_ctrl_field(ctrl_reg, idx) \
+	(((ctrl_reg) >> ((idx) * INTEL_FIXED_BITS_STRIDE)) & INTEL_FIXED_BITS_MASK)
 
 #define VMWARE_BACKDOOR_PMC_HOST_TSC		0x10000
 #define VMWARE_BACKDOOR_PMC_REAL_TIME		0x10001
@@ -170,7 +171,8 @@ static inline bool pmc_speculative_in_use(struct kvm_pmc *pmc)
 
 	if (pmc_is_fixed(pmc))
 		return fixed_ctrl_field(pmu->fixed_ctr_ctrl,
-					pmc->idx - KVM_FIXED_PMC_BASE_IDX) & 0x3;
+					pmc->idx - KVM_FIXED_PMC_BASE_IDX) &
+					(INTEL_FIXED_0_KERNEL | INTEL_FIXED_0_USER);
 
 	return pmc->eventsel & ARCH_PERFMON_EVENTSEL_ENABLE;
 }
arch/x86/kvm/vmx/pmu_intel.c +9 -3
index eaee9a08952e..846a4e7fd34a 100644
@@ -501,8 +501,14 @@ 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_rsvd &= ~(0xbull << (i * 4));
+	for (i = 0; i < pmu->nr_arch_fixed_counters; i++) {
+		pmu->fixed_ctr_ctrl_rsvd &=
+			 ~intel_fixed_bits_by_idx(i,
+						  INTEL_FIXED_0_KERNEL |
+						  INTEL_FIXED_0_USER |
+						  INTEL_FIXED_0_ENABLE_PMI);
+	}
+
 	counter_rsvd = ~(((1ull << pmu->nr_arch_gp_counters) - 1) |
 		(((1ull << pmu->nr_arch_fixed_counters) - 1) << KVM_FIXED_PMC_BASE_IDX));
 	pmu->global_ctrl_rsvd = counter_rsvd;
@@ -548,7 +554,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)
 			pmu->reserved_bits &= ~ICL_EVENTSEL_ADAPTIVE;
 			for (i = 0; i < pmu->nr_arch_fixed_counters; i++) {
 				pmu->fixed_ctr_ctrl_rsvd &=
-					~(1ULL << (KVM_FIXED_PMC_BASE_IDX + i * 4));
+					~intel_fixed_bits_by_idx(i, ICL_FIXED_0_ADAPTIVE);
 			}
 			pmu->pebs_data_cfg_rsvd = ~0xff00000full;
 		} else {
Signature · 1 line
2.40.1
#3 lore raw
In reply to Dapeng Mi
Quoted 9 lines · Dapeng Mi

This small patchset refines the ambiguous naming in kvm_pmu structure and use macros instead of magic numbers to manipulate FIXED_CTR_CTRL MSR to increase readability.

No logic change is introduced in this patchset.

Dapeng Mi (2):
KVM: x86/pmu: Change ambiguous _mask suffix to _rsvd in kvm_pmu

So, it looks like the 1st patch is also in the upcoming RFCv2 for mediated passthrough vPMU. I will remove that from my list then.

Thanks. Regards
-Mingwei

Quoted 14 lines

KVM: x86/pmu: Manipulate FIXED_CTR_CTRL MSR with macros

 arch/x86/include/asm/kvm_host.h | 10 ++++-----
 arch/x86/kvm/pmu.c              | 26 ++++++++++++------------
 arch/x86/kvm/pmu.h              |  8 +++++---
 arch/x86/kvm/svm/pmu.c          |  4 ++--
 arch/x86/kvm/vmx/pmu_intel.c    | 36 +++++++++++++++++++--------------
 5 files changed, 46 insertions(+), 38 deletions(-)

base-commit: 7b076c6a308ec5bce9fc96e2935443ed228b9148 --
2.40.1

author
#4 lore raw
Quoted 11 lines · Mingwei Zhang
Quoted 8 lines · Dapeng Mi

This small patchset refines the ambiguous naming in kvm_pmu structure and use macros instead of magic numbers to manipulate FIXED_CTR_CTRL MSR to increase readability.

No logic change is introduced in this patchset.

Dapeng Mi (2):
KVM: x86/pmu: Change ambiguous _mask suffix to _rsvd in kvm_pmu

So, it looks like the 1st patch is also in the upcoming RFCv2 for mediated passthrough vPMU. I will remove that from my list then.

Mingwei, we'd better keep this patch in RFCv2 until the this patchset is merged, then we don't rebase it again when this patch is merged. Thanks.

Quoted 17 lines

Thanks. Regards
-Mingwei

Quoted 14 lines

KVM: x86/pmu: Manipulate FIXED_CTR_CTRL MSR with macros

 arch/x86/include/asm/kvm_host.h | 10 ++++-----
 arch/x86/kvm/pmu.c              | 26 ++++++++++++------------
 arch/x86/kvm/pmu.h              |  8 +++++---
 arch/x86/kvm/svm/pmu.c          |  4 ++--
 arch/x86/kvm/vmx/pmu_intel.c    | 36 +++++++++++++++++++--------------
 5 files changed, 46 insertions(+), 38 deletions(-)

base-commit: 7b076c6a308ec5bce9fc96e2935443ed228b9148 --
2.40.1

#5 lore raw
Quoted 10 lines · Dapeng
Quoted 7 lines · Mingwei Zhang
Quoted 6 lines · Dapeng Mi

This small patchset refines the ambiguous naming in kvm_pmu structure and use macros instead of magic numbers to manipulate FIXED_CTR_CTRL MSR to increase readability.

No logic change is introduced in this patchset.

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

Dapeng Mi (2):
KVM: x86/pmu: Change ambiguous _mask suffix to _rsvd in kvm_pmu

So, it looks like the 1st patch is also in the upcoming RFCv2 for mediated passthrough vPMU. I will remove that from my list then.

Mingwei, we'd better keep this patch in RFCv2 until the this patchset is merged, then we don't rebase it again when this patch is merged. Thanks.

yeah. too late. I don't want to have a duplicate patch in LKML. On the other hand, you could have waited a little bit before sending this one. Next time, coordinate with us before sending.

Thanks.
-Mingwei

Quoted 18 lines
Quoted 18 lines

Thanks. Regards
-Mingwei

Quoted 14 lines

KVM: x86/pmu: Manipulate FIXED_CTR_CTRL MSR with macros

 arch/x86/include/asm/kvm_host.h | 10 ++++-----
 arch/x86/kvm/pmu.c              | 26 ++++++++++++------------
 arch/x86/kvm/pmu.h              |  8 +++++---
 arch/x86/kvm/svm/pmu.c          |  4 ++--
 arch/x86/kvm/vmx/pmu_intel.c    | 36 +++++++++++++++++++--------------
 5 files changed, 46 insertions(+), 38 deletions(-)

base-commit: 7b076c6a308ec5bce9fc96e2935443ed228b9148 --
2.40.1

author
#6 lore raw
Quoted 12 lines · Mingwei Zhang
Quoted 11 lines · Dapeng
Quoted 9 lines · Mingwei Zhang
Quoted 8 lines · Dapeng Mi

This small patchset refines the ambiguous naming in kvm_pmu structure and use macros instead of magic numbers to manipulate FIXED_CTR_CTRL MSR to increase readability.

No logic change is introduced in this patchset.

Dapeng Mi (2):
KVM: x86/pmu: Change ambiguous _mask suffix to _rsvd in kvm_pmu

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

So, it looks like the 1st patch is also in the upcoming RFCv2 for mediated passthrough vPMU. I will remove that from my list then.

Mingwei, we'd better keep this patch in RFCv2 until the this patchset is merged, then we don't rebase it again when this patch is merged. Thanks.

yeah. too late. I don't want to have a duplicate patch in LKML. On the other hand, you could have waited a little bit before sending this one. Next time, coordinate with us before sending.

This patch has nothing to do with the mediated vPMU patchset in theory and can be merged earlier than the mediated vPMU patcheset which may need a long time to review and discuss. I hope this patch can be merged ASAP and so readers won't be mislead by the ambiguous suffix.

Quoted 20 lines

Thanks.
-Mingwei

Quoted 17 lines
Quoted 17 lines

Thanks. Regards
-Mingwei

Quoted 14 lines

KVM: x86/pmu: Manipulate FIXED_CTR_CTRL MSR with macros

 arch/x86/include/asm/kvm_host.h | 10 ++++-----
 arch/x86/kvm/pmu.c              | 26 ++++++++++++------------
 arch/x86/kvm/pmu.h              |  8 +++++---
 arch/x86/kvm/svm/pmu.c          |  4 ++--
 arch/x86/kvm/vmx/pmu_intel.c    | 36 +++++++++++++++++++--------------
 5 files changed, 46 insertions(+), 38 deletions(-)

base-commit: 7b076c6a308ec5bce9fc96e2935443ed228b9148 --
2.40.1

maintainer Applied
#7 lore raw
In reply to Dapeng Mi
Quoted 11 lines · Dapeng Mi

This small patchset refines the ambiguous naming in kvm_pmu structure and use macros instead of magic numbers to manipulate FIXED_CTR_CTRL MSR to increase readability.

No logic change is introduced in this patchset.

Dapeng Mi (2):
KVM: x86/pmu: Change ambiguous _mask suffix to _rsvd in kvm_pmu
KVM: x86/pmu: Manipulate FIXED_CTR_CTRL MSR with macros

[...]

Applied to kvm-x86 pmu, thanks!

[1/2] KVM: x86/pmu: Change ambiguous _mask suffix to _rsvd in kvm_pmu

      https://github.com/kvm-x86/linux/commit/0e102ce3d413
[2/2] KVM: x86/pmu: Manipulate FIXED_CTR_CTRL MSR with macros
      https://github.com/kvm-x86/linux/commit/75430c412a31

--
https://github.com/kvm-x86/linux/tree/next