KVM: arm64: PMU: Fix SET_ONE_REG for vPMC regs
Subsystems (3)
v5 cover KVM: arm64: PMU: Fix SET_ONE_REG for vPMC regs
Prepare vPMC registers for user-initiated changes after first run. This is important specifically for debugging Windows on QEMU with GDB; QEMU tries to write back all visible registers when resuming the VM execution with GDB, corrupting the PMU state. Windows always uses the PMU so this can cause adverse effects on that particular OS.
This series also contains patch "KVM: arm64: PMU: Set raw values from user to PM{C,I}NTEN{SET,CLR}, PMOVS{SET,CLR}", which reverts semantic changes made for the mentioned registers in the past. It is necessary to migrate the PMU state properly on Firecracker, QEMU, and crosvm.
---
Changes in v5:
- Rebased.
- Link to v4: https://lore.kernel.org/r/[email protected]
Changes in v4:
- Reverted changes for functions implementing ioctls in patch
"KVM: arm64: PMU: Assume PMU presence in pmu-emul.c".
- Removed kvm_pmu_vcpu_reset().
- Reordered function calls in kvm_vcpu_reload_pmu() for better style.
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- Added patch "KVM: arm64: PMU: Assume PMU presence in pmu-emul.c".
- Added an explanation of this path series' motivation to each patch.
- Explained why userspace register writes and register reset should be covered in patch "KVM: arm64: PMU: Reload when user modifies registers".
- Marked patch "KVM: arm64: PMU: Set raw values from user to PM{C,I}NTEN{SET,CLR}, PMOVS{SET,CLR}" for stable.
- Reoreded so that patch "KVM: arm64: PMU: Set raw values from user to PM{C,I}NTEN{SET,CLR}, PMOVS{SET,CLR}" would come first.
- Added patch "KVM: arm64: PMU: Call kvm_pmu_handle_pmcr() after masking PMCNTENSET_EL0".
- Added patch "KVM: arm64: Reload PMCNTENSET_EL0".
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- Changed to utilize KVM_REQ_RELOAD_PMU as suggested by Oliver Upton.
- Added patch "KVM: arm64: PMU: Reload when user modifies registers" to cover more registers.
- Added patch "KVM: arm64: PMU: Set raw values from user to PM{C,I}NTEN{SET,CLR}, PMOVS{SET,CLR}".
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Akihiko Odaki (5):
KVM: arm64: PMU: Set raw values from user to PM{C,I}NTEN{SET,CLR}, PMOVS{SET,CLR}
KVM: arm64: PMU: Assume PMU presence in pmu-emul.c
KVM: arm64: PMU: Fix SET_ONE_REG for vPMC regs
KVM: arm64: PMU: Reload when user modifies registers
KVM: arm64: PMU: Reload when resetting
arch/arm64/kvm/arm.c | 17 ++++++++----- arch/arm64/kvm/emulate-nested.c | 6 +++-- arch/arm64/kvm/pmu-emul.c | 56 +++++++++++------------------------------ arch/arm64/kvm/reset.c | 3 --- arch/arm64/kvm/sys_regs.c | 52 ++++++++++++++++++++++---------------- include/kvm/arm_pmu.h | 4 +-- 6 files changed, 62 insertions(+), 76 deletions(-)
---
base-commit: 80e54e84911a923c40d7bee33a34c1b4be148d7a
change-id: 20250302-pmc-b90a86af945c
Best regards,
Signature · 1 line
Akihiko Odaki <[email protected]>
PATCH v5 1/5 KVM: arm64: PMU: Set raw values from user to PM{C,I}NTEN{SET,CLR}, PMOVS{SET,CLR}
Commit a45f41d754e0 ("KVM: arm64: Add {get,set}_user for PM{C,I}NTEN{SET,CLR}, PMOVS{SET,CLR}") changed KVM_SET_ONE_REG to update the mentioned registers in a way matching with the behavior of guest register writes. This is a breaking change of a UAPI though the new semantics looks cleaner and VMMs are not prepared for this.
Firecracker, QEMU, and crosvm perform migration by listing registers with KVM_GET_REG_LIST, getting their values with KVM_GET_ONE_REG and setting them with KVM_SET_ONE_REG. This algorithm assumes KVM_SET_ONE_REG restores the values retrieved with KVM_GET_ONE_REG without any alteration. However, bit operations added by the earlier commit do not preserve the values retried with KVM_GET_ONE_REG and potentially break migration.
Remove the bit operations that alter the values retrieved with KVM_GET_ONE_REG.
--- arch/arm64/kvm/sys_regs.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-)
arch/arm64/kvm/sys_regs.c +2 -19
@@ -1051,26 +1051,9 @@ static bool access_pmu_evtyper(struct kvm_vcpu *vcpu, struct sys_reg_params *p,static int set_pmreg (struct kvm_vcpu *vcpu,const struct sys_reg_desc *r,u64 val) { -bool set; - - val &=kvm_pmu_accessible_counter_mask (vcpu); - -switch (r->reg) { -case PMOVSSET_EL0 : -/* CRm[1] being set indicates a SET register, and CLR otherwise */ - set = r->CRm &2 ; -break ; -default : -/* Op2[0] being set indicates a SET register, and CLR otherwise */ - set = r->Op2 &1 ; -break ; - } - -if (set) -__vcpu_sys_reg (vcpu, r->reg) |= val; -else -__vcpu_sys_reg (vcpu, r->reg) &= ~val; +u64 mask =kvm_pmu_accessible_counter_mask (vcpu); +__vcpu_sys_reg (vcpu, r->reg) = val & mask;return 0 ; }
Signature · 1 line
2.48.1
PATCH v5 2/5 KVM: arm64: PMU: Assume PMU presence in pmu-emul.c
In reply to Akihiko OdakiMany functions in pmu-emul.c checks kvm_vcpu_has_pmu(vcpu). A favorable interpretation is defensive programming, but it also has downsides:
- It is confusing as it implies these functions are called without PMU although most of them are called only when a PMU is present.
- It makes semantics of functions fuzzy. For example, calling kvm_pmu_disable_counter_mask() without PMU may result in no-op as there are no enabled counters, but it's unclear what kvm_pmu_get_counter_value() returns when there is no PMU.
- It allows callers without checking kvm_vcpu_has_pmu(vcpu), but it is often wrong to call these functions without PMU.
- It is error-prone to duplicate kvm_vcpu_has_pmu(vcpu) checks into multiple functions. Many functions are called for system registers, and the system register infrastructure already employs less error-prone, comprehensive checks.
Check kvm_vcpu_has_pmu(vcpu) in callers of these functions instead, and remove the obsolete checks from pmu-emul.c. The only exceptions are the functions that implement ioctls as they have definitive semantics even when the PMU is not present.
--- arch/arm64/kvm/arm.c | 17 +++++++++++------ arch/arm64/kvm/emulate-nested.c | 6 ++++-- arch/arm64/kvm/pmu-emul.c | 26 +------------------------- arch/arm64/kvm/sys_regs.c | 6 ++++-- 4 files changed, 20 insertions(+), 35 deletions(-)
arch/arm64/kvm/arm.c +11 -6
@@ -835,9 +835,11 @@ int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu)if (ret)return ret; - ret =kvm_arm_pmu_v3_enable (vcpu); -if (ret) -return ret; +if (kvm_vcpu_has_pmu (vcpu)) { + ret =kvm_arm_pmu_v3_enable (vcpu); +if (ret) +return ret; + }if (is_protected_kvm_enabled ()) { ret =pkvm_create_hyp_vm (kvm);
@@ -1148,7 +1150,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)*/ preempt_disable (); -kvm_pmu_flush_hwstate (vcpu); +if (kvm_vcpu_has_pmu (vcpu)) +kvm_pmu_flush_hwstate (vcpu);local_irq_disable ();
@@ -1167,7 +1170,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)if (ret <=0 ||kvm_vcpu_exit_request (vcpu, &ret)) { vcpu->mode =OUTSIDE_GUEST_MODE ;isb ();/* Ensure work in x_flush_hwstate is committed */ -kvm_pmu_sync_hwstate (vcpu); +if (kvm_vcpu_has_pmu (vcpu)) +kvm_pmu_sync_hwstate (vcpu);if (unlikely (!irqchip_in_kernel (vcpu->kvm)))kvm_timer_sync_user (vcpu);kvm_vgic_sync_hwstate (vcpu);
@@ -1197,7 +1201,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)* that the vgic can properly sample the updated state of the * interrupt line. */ -kvm_pmu_sync_hwstate (vcpu); +if (kvm_vcpu_has_pmu (vcpu)) +kvm_pmu_sync_hwstate (vcpu);/* * Sync the vgic state before syncing the timer state because
arch/arm64/kvm/emulate-nested.c +4 -2
@@ -2516,7 +2516,8 @@ void kvm_emulate_nested_eret(struct kvm_vcpu *vcpu)kvm_arch_vcpu_load (vcpu,smp_processor_id ());preempt_enable (); -kvm_pmu_nested_transition (vcpu); +if (kvm_vcpu_has_pmu (vcpu)) +kvm_pmu_nested_transition (vcpu); } static void kvm_inject_el2_exception(struct kvm_vcpu *vcpu, u64 esr_el2,
@@ -2599,7 +2600,8 @@ static int kvm_inject_nested(struct kvm_vcpu *vcpu, u64 esr_el2,kvm_arch_vcpu_load (vcpu,smp_processor_id ());preempt_enable (); -kvm_pmu_nested_transition (vcpu); +if (kvm_vcpu_has_pmu (vcpu)) +kvm_pmu_nested_transition (vcpu);return 1 ; }
arch/arm64/kvm/pmu-emul.c +1 -25
@@ -150,9 +150,6 @@ static u64 kvm_pmu_get_pmc_value(struct kvm_pmc *pmc)*/ u64 kvm_pmu_get_counter_value (struct kvm_vcpu *vcpu,u64 select_idx) { -if (!kvm_vcpu_has_pmu (vcpu)) -return 0 ; -return kvm_pmu_get_pmc_value (kvm_vcpu_idx_to_pmc (vcpu, select_idx)); }
@@ -191,9 +188,6 @@ static void kvm_pmu_set_pmc_value(struct kvm_pmc *pmc, u64 val, bool force)*/ void kvm_pmu_set_counter_value (struct kvm_vcpu *vcpu,u64 select_idx,u64 val) { -if (!kvm_vcpu_has_pmu (vcpu)) -return ; -kvm_pmu_set_pmc_value (kvm_vcpu_idx_to_pmc (vcpu, select_idx), val, false); }
@@ -350,7 +344,7 @@ void kvm_pmu_reprogram_counter_mask(struct kvm_vcpu *vcpu, u64 val) {int i; -if (!kvm_vcpu_has_pmu (vcpu) || !val) +if (!val)return ;for (i =0 ; i <KVM_ARMV8_PMU_MAX_COUNTERS ; i++) {
@@ -401,9 +395,6 @@ static void kvm_pmu_update_state(struct kvm_vcpu *vcpu)struct kvm_pmu *pmu = &vcpu->arch.pmu;bool overflow; -if (!kvm_vcpu_has_pmu (vcpu)) -return ; - overflow =kvm_pmu_overflow_status (vcpu);if (pmu->irq_level == overflow)return ;
@@ -599,9 +590,6 @@ void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val) {int i; -if (!kvm_vcpu_has_pmu (vcpu)) -return ; -/* Fixup PMCR_EL0 to reconcile the PMU version and the LP bit */ if (!kvm_has_feat (vcpu->kvm,ID_AA64DFR0_EL1 , PMUVer,V3P5 )) val &= ~ARMV8_PMU_PMCR_LP ;
@@ -766,9 +754,6 @@ void kvm_pmu_set_counter_event_type(struct kvm_vcpu *vcpu, u64 data,struct kvm_pmc *pmc =kvm_vcpu_idx_to_pmc (vcpu, select_idx);u64 reg; -if (!kvm_vcpu_has_pmu (vcpu)) -return ; - reg =counter_index_to_evtreg (pmc->idx);__vcpu_sys_reg (vcpu, reg) = data &kvm_pmu_evtyper_mask (vcpu->kvm);
@@ -848,9 +833,6 @@ u64 kvm_pmu_get_pmceid(struct kvm_vcpu *vcpu, bool pmceid1)u64 val, mask =0 ;int base, i, nr_events; -if (!kvm_vcpu_has_pmu (vcpu)) -return 0 ; -if (!pmceid1) { val =read_sysreg (pmceid0_el0);/* always support CHAIN */
@@ -900,9 +882,6 @@ void kvm_vcpu_reload_pmu(struct kvm_vcpu *vcpu)int kvm_arm_pmu_v3_enable (struct kvm_vcpu *vcpu) { -if (!kvm_vcpu_has_pmu (vcpu)) -return 0 ; -if (!vcpu->arch.pmu.created)return -EINVAL ;
@@ -1231,9 +1210,6 @@ void kvm_pmu_nested_transition(struct kvm_vcpu *vcpu)unsigned long mask;int i; -if (!kvm_vcpu_has_pmu (vcpu)) -return ; - mask =__vcpu_sys_reg (vcpu,PMCNTENSET_EL0 );for_each_set_bit (i, &mask,32 ) {struct kvm_pmc *pmc =kvm_vcpu_idx_to_pmc (vcpu, i);
arch/arm64/kvm/sys_regs.c +4 -2
@@ -1853,12 +1853,14 @@ static int set_id_aa64dfr0_el1(struct kvm_vcpu *vcpu,static u64 read_sanitised_id_dfr0_el1 (struct kvm_vcpu *vcpu,const struct sys_reg_desc *rd) { -u8 perfmon =pmuver_to_perfmon (kvm_arm_pmu_get_pmuver_limit ()); +u8 perfmon;u64 val =read_sanitised_ftr_reg (SYS_ID_DFR0_EL1 ); val &= ~ID_DFR0_EL1_PerfMon_MASK; -if (kvm_vcpu_has_pmu (vcpu)) +if (kvm_vcpu_has_pmu (vcpu)) { + perfmon =pmuver_to_perfmon (kvm_arm_pmu_get_pmuver_limit ()); val |=SYS_FIELD_PREP (ID_DFR0_EL1 , PerfMon, perfmon); + } val =ID_REG_LIMIT_FIELD_ENUM (val,ID_DFR0_EL1 , CopDbg, Debugv8p8);
Signature · 1 line
2.48.1
PATCH v5 3/5 KVM: arm64: PMU: Fix SET_ONE_REG for vPMC regs
In reply to Akihiko OdakiReload the perf event when setting the vPMU counter (vPMC) registers (PMCCNTR_EL0 and PMEVCNTR<n>_EL0). This is a change corresponding to commit 9228b26194d1 ("KVM: arm64: PMU: Fix GET_ONE_REG for vPMC regs to return the current value") but for SET_ONE_REG.
Values of vPMC registers are saved in sysreg files on certain occasions. These saved values don't represent the current values of the vPMC registers if the perf events for the vPMCs count events after the save. The current values of those registers are the sum of the sysreg file value and the current perf event counter value. But, when userspace writes those registers (using KVM_SET_ONE_REG), KVM only updates the sysreg file value and leaves the current perf event counter value as is.
It is also important to keep the correct state even if userspace writes them after first run, specifically when debugging Windows on QEMU with GDB; QEMU tries to write back all visible registers when resuming the VM execution with GDB, corrupting the PMU state. Windows always uses the PMU so this can cause adverse effects on that particular OS.
Fix this by releasing the current perf event and trigger recreating one with KVM_REQ_RELOAD_PMU.
--- arch/arm64/kvm/pmu-emul.c | 13 +++++++++++++ arch/arm64/kvm/sys_regs.c | 20 +++++++++++++++++++- include/kvm/arm_pmu.h | 2 ++ 3 files changed, 34 insertions(+), 1 deletion(-)
arch/arm64/kvm/pmu-emul.c +13 -0
@@ -191,6 +191,19 @@ void kvm_pmu_set_counter_value(struct kvm_vcpu *vcpu, u64 select_idx, u64 val)kvm_pmu_set_pmc_value (kvm_vcpu_idx_to_pmc (vcpu, select_idx), val, false); } +/** +* kvm_pmu_set_counter_value_user - set PMU counter value from user +* @vcpu: The vcpu pointer +* @select_idx: The counter index +* @val: The counter value +*/ +void kvm_pmu_set_counter_value_user (struct kvm_vcpu *vcpu,u64 select_idx,u64 val) +{ +kvm_pmu_release_perf_event (kvm_vcpu_idx_to_pmc (vcpu, select_idx)); +__vcpu_sys_reg (vcpu,counter_index_to_reg (select_idx)) = val; +kvm_make_request (KVM_REQ_RELOAD_PMU , vcpu); +} +/** * kvm_pmu_release_perf_event - remove the perf event * @pmc: The PMU counter pointer
arch/arm64/kvm/sys_regs.c +19 -1
@@ -960,6 +960,22 @@ static int get_pmu_evcntr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r,return 0 ; } +static int set_pmu_evcntr (struct kvm_vcpu *vcpu,const struct sys_reg_desc *r, +u64 val) +{ +u64 idx; + +if (r->CRn ==9 && r->CRm ==13 && r->Op2 ==0 ) +/* PMCCNTR_EL0 */ + idx =ARMV8_PMU_CYCLE_IDX ; +else +/* PMEVCNTRn_EL0 */ + idx = ((r->CRm &3 ) <<3 ) | (r->Op2 &7 ); + +kvm_pmu_set_counter_value_user (vcpu, idx, val); +return 0 ; +} +static bool access_pmu_evcntr (struct kvm_vcpu *vcpu,struct sys_reg_params *p,const struct sys_reg_desc *r)
@@ -1238,6 +1254,7 @@ static int set_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r,#define PMU_PMEVCNTR_EL0 (n) \ { PMU_SYS_REG(PMEVCNTRn_EL0(n)), \ .reset = reset_pmevcntr, .get_user = get_pmu_evcntr, \ + .set_user = set_pmu_evcntr, \ .access = access_pmu_evcntr, .reg = (PMEVCNTR0_EL0 + n), }/* Macro to expand the PMEVTYPERn_EL0 register */
@@ -2835,7 +2852,8 @@ static const struct sys_reg_desc sys_reg_descs[] = { .access = access_pmceid, .reset = NULL }, { PMU_SYS_REG(PMCCNTR_EL0), .access = access_pmu_evcntr, .reset = reset_unknown, - .reg = PMCCNTR_EL0, .get_user = get_pmu_evcntr}, + .reg = PMCCNTR_EL0, .get_user = get_pmu_evcntr, + .set_user = set_pmu_evcntr }, { PMU_SYS_REG(PMXEVTYPER_EL0), .access = access_pmu_evtyper, .reset = NULL }, { PMU_SYS_REG(PMXEVCNTR_EL0),
include/kvm/arm_pmu.h +2 -0
@@ -47,8 +47,10 @@ static __always_inline bool kvm_arm_support_pmu_v3(void)#define kvm_arm_pmu_irq_initialized (v) ((v)->arch.pmu.irq_num >= VGIC_NR_SGIS)u64 kvm_pmu_get_counter_value (struct kvm_vcpu *vcpu,u64 select_idx);void kvm_pmu_set_counter_value (struct kvm_vcpu *vcpu,u64 select_idx,u64 val); +void kvm_pmu_set_counter_value_user (struct kvm_vcpu *vcpu,u64 select_idx,u64 val);u64 kvm_pmu_implemented_counter_mask (struct kvm_vcpu *vcpu);u64 kvm_pmu_accessible_counter_mask (struct kvm_vcpu *vcpu); +u64 kvm_pmu_valid_counter_mask (struct kvm_vcpu *vcpu);u64 kvm_pmu_get_pmceid (struct kvm_vcpu *vcpu,bool pmceid1);void kvm_pmu_vcpu_init (struct kvm_vcpu *vcpu);void kvm_pmu_vcpu_reset (struct kvm_vcpu *vcpu);
Signature · 1 line
2.48.1
kernel test robot
build botkernel test robot noticed the following build errors:
Hi Akihiko,
kernel test robot noticed the following build errors:
[auto build test ERROR on 80e54e84911a923c40d7bee33a34c1b4be148d7a]
url: https://github.com/intel-lab-lkp/linux/commits/Akihiko-Odaki/KVM-arm64-PMU-Set-raw-values-from-user-to-PM-C-I-NTEN-SET-CLR-PMOVS-SET-CLR/20250315-173731 base: 80e54e84911a923c40d7bee33a34c1b4be148d7a patch link: https://lore.kernel.org/r/20250315-pmc-v5-3-ecee87dab216%40daynix.com patch subject: [PATCH v5 3/5] KVM: arm64: PMU: Fix SET_ONE_REG for vPMC regs config: arm64-randconfig-r122-20250317 (https://download.01.org/0day-ci/archive/20250317/[email protected]/config) compiler: aarch64-linux-gcc (GCC) 14.2.0 reproduce: (https://download.01.org/0day-ci/archive/20250317/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
arch/arm64/kvm/sys_regs.c: In function 'set_pmu_evcntr':
>> arch/arm64/kvm/sys_regs.c:975:9: error: implicit declaration of function 'kvm_pmu_set_counter_value_user'; did you mean 'kvm_pmu_set_counter_value'? [-Wimplicit-function-declaration]
975 | kvm_pmu_set_counter_value_user(vcpu, idx, val);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| kvm_pmu_set_counter_valuevim +975 arch/arm64/kvm/sys_regs.c
962
963 static int set_pmu_evcntr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r,
964 u64 val)
965 {
966 u64 idx;
967
968 if (r->CRn == 9 && r->CRm == 13 && r->Op2 == 0)
969 /* PMCCNTR_EL0 */
970 idx = ARMV8_PMU_CYCLE_IDX;
971 else
972 /* PMEVCNTRn_EL0 */
973 idx = ((r->CRm & 3) << 3) | (r->Op2 & 7);
974
> 975 kvm_pmu_set_counter_value_user(vcpu, idx, val);
976 return 0;
977 }
978
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Marc Zyngier
maintainerQuoted 44 lines · kernel test robot
Hi Akihiko,
kernel test robot noticed the following build errors:
[auto build test ERROR on
80e54e84911a923c40d7bee33a34c1b4be148d7a]url: https://github.com/intel-lab-lkp/linux/commits/Akihiko-Odaki/KVM-arm64-PMU-Set-raw-values-from-user-to-PM-C-I-NTEN-SET-CLR-PMOVS-SET-CLR/20250315-173731 base: 80e54e84911a923c40d7bee33a34c1b4be148d7a patch link: https://lore.kernel.org/r/20250315-pmc-v5-3-ecee87dab216%40daynix.com patch subject: [PATCH v5 3/5] KVM: arm64: PMU: Fix SET_ONE_REG for vPMC regs config: arm64-randconfig-r122-20250317 (https://download.01.org/0day-ci/archive/20250317/[email protected]/config) compiler: aarch64-linux-gcc (GCC) 14.2.0 reproduce: (https://download.01.org/0day-ci/archive/20250317/[email protected]/reproduce)If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/All errors (new ones prefixed by >>):
arch/arm64/kvm/sys_regs.c: In function 'set_pmu_evcntr':Quoted 1 line
Quoted 1 line
arch/arm64/kvm/sys_regs.c:975:9: error: implicit declaration of function 'kvm_pmu_set_counter_value_user'; did you mean 'kvm_pmu_set_counter_value'? [-Wimplicit-function-declaration]975 | kvm_pmu_set_counter_value_user(vcpu, idx, val); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | kvm_pmu_set_counter_valuevim +975
arch/arm64/kvm/sys_regs.c962 963 static int set_pmu_evcntr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r, 964 u64 val) 965 { 966 u64 idx; 967 968 if (r->CRn == 9 && r->CRm == 13 && r->Op2 == 0) 969 /* PMCCNTR_EL0 */ 970 idx = ARMV8_PMU_CYCLE_IDX; 971 else 972 /* PMEVCNTRn_EL0 */ 973 idx = ((r->CRm & 3) << 3) | (r->Op2 & 7); 974
Quoted 5 lines
Quoted 1 line
975
kvm_pmu_set_counter_value_user(vcpu, idx, val);976 return 0; 977 } 978
Looks like a case of missing stub definitions when CONFIG_HW_PERF_EVENTS isn't selected.
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
PATCH v5 4/5 KVM: arm64: PMU: Reload when user modifies registers
In reply to Akihiko OdakiCommit d0c94c49792c ("KVM: arm64: Restore PMU configuration on first run") added the code to reload the PMU configuration on first run.
It is also important to keep the correct state even if system registers are modified after first run, specifically when debugging Windows on QEMU with GDB; QEMU tries to write back all visible registers when resuming the VM execution with GDB, corrupting the PMU state. Windows always uses the PMU so this can cause adverse effects on that particular OS.
The usual register writes and reset are already handled independently, but register writes from userspace are not covered.
Trigger the code to reload the PMU configuration for them instead so that PMU configuration changes made by users will be applied also after the first run.
--- arch/arm64/kvm/pmu-emul.c | 3 --- arch/arm64/kvm/sys_regs.c | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-)
arch/arm64/kvm/pmu-emul.c +0 -3
@@ -917,9 +917,6 @@ int kvm_arm_pmu_v3_enable(struct kvm_vcpu *vcpu)return -EINVAL ; } -/* One-off reload of the PMU on first run */ -kvm_make_request (KVM_REQ_RELOAD_PMU , vcpu); -return 0 ; }
arch/arm64/kvm/sys_regs.c +4 -0
@@ -1070,6 +1070,8 @@ static int set_pmreg(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r, u64 vau64 mask =kvm_pmu_accessible_counter_mask (vcpu);__vcpu_sys_reg (vcpu, r->reg) = val & mask; +kvm_make_request (KVM_REQ_RELOAD_PMU , vcpu); +return 0 ; }
@@ -1228,6 +1230,8 @@ static int set_pmcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *r, val |=ARMV8_PMU_PMCR_LC ;__vcpu_sys_reg (vcpu, r->reg) = val; +kvm_make_request (KVM_REQ_RELOAD_PMU , vcpu); +return 0 ; }
Signature · 1 line
2.48.1
PATCH v5 5/5 KVM: arm64: PMU: Reload when resetting
In reply to Akihiko OdakiReplace kvm_pmu_vcpu_reset() with the generic PMU reloading mechanism to ensure the consistency with system registers and to reduce code size.
--- arch/arm64/kvm/pmu-emul.c | 14 -------------- arch/arm64/kvm/reset.c | 3 --- arch/arm64/kvm/sys_regs.c | 3 +++ include/kvm/arm_pmu.h | 2 -- 4 files changed, 3 insertions(+), 19 deletions(-)
arch/arm64/kvm/pmu-emul.c +0 -14
@@ -254,20 +254,6 @@ void kvm_pmu_vcpu_init(struct kvm_vcpu *vcpu) pmu->pmc[i].idx = i; } -/** -* kvm_pmu_vcpu_reset - reset pmu state for cpu -* @vcpu: The vcpu pointer -* -*/ -void kvm_pmu_vcpu_reset (struct kvm_vcpu *vcpu) -{ -unsigned long mask =kvm_pmu_implemented_counter_mask (vcpu); -int i; - -for_each_set_bit (i, &mask,32 ) -kvm_pmu_stop_counter (kvm_vcpu_idx_to_pmc (vcpu, i)); -} -/** * kvm_pmu_vcpu_destroy - free perf event of PMU for cpu * @vcpu: The vcpu pointer
arch/arm64/kvm/reset.c +0 -3
@@ -196,9 +196,6 @@ void kvm_reset_vcpu(struct kvm_vcpu *vcpu) vcpu->arch.reset_state.reset = false;spin_unlock (&vcpu->arch.mp_state_lock); -/* Reset PMU outside of the non-preemptible section */ -kvm_pmu_vcpu_reset (vcpu); -preempt_disable (); loaded = (vcpu->cpu !=-1 );if (loaded)
arch/arm64/kvm/sys_regs.c +3 -0
@@ -4480,6 +4480,9 @@ void kvm_reset_sys_regs(struct kvm_vcpu *vcpu) }set_bit (KVM_ARCH_FLAG_ID_REGS_INITIALIZED , &kvm->arch.flags); + +if (kvm_vcpu_has_pmu (vcpu)) +kvm_make_request (KVM_REQ_RELOAD_PMU , vcpu); }/**
include/kvm/arm_pmu.h +0 -2
@@ -53,7 +53,6 @@ u64 kvm_pmu_accessible_counter_mask(struct kvm_vcpu *vcpu);u64 kvm_pmu_valid_counter_mask (struct kvm_vcpu *vcpu);u64 kvm_pmu_get_pmceid (struct kvm_vcpu *vcpu,bool pmceid1);void kvm_pmu_vcpu_init (struct kvm_vcpu *vcpu); -void kvm_pmu_vcpu_reset (struct kvm_vcpu *vcpu);void kvm_pmu_vcpu_destroy (struct kvm_vcpu *vcpu);void kvm_pmu_reprogram_counter_mask (struct kvm_vcpu *vcpu,u64 val);void kvm_pmu_flush_hwstate (struct kvm_vcpu *vcpu);
@@ -126,7 +125,6 @@ static inline u64 kvm_pmu_accessible_counter_mask(struct kvm_vcpu *vcpu)return 0 ; }static inline void kvm_pmu_vcpu_init (struct kvm_vcpu *vcpu) {} -static inline void kvm_pmu_vcpu_reset (struct kvm_vcpu *vcpu) {}static inline void kvm_pmu_vcpu_destroy (struct kvm_vcpu *vcpu) {}static inline void kvm_pmu_reprogram_counter_mask (struct kvm_vcpu *vcpu,u64 val) {}static inline void kvm_pmu_flush_hwstate (struct kvm_vcpu *vcpu) {}
Signature · 1 line
2.48.1
Quoted 56 lines · Akihiko Odaki
Prepare vPMC registers for user-initiated changes after first run. This is important specifically for debugging Windows on QEMU with GDB; QEMU tries to write back all visible registers when resuming the VM execution with GDB, corrupting the PMU state. Windows always uses the PMU so this can cause adverse effects on that particular OS.
This series also contains patch "KVM: arm64: PMU: Set raw values from user to PM{C,I}NTEN{SET,CLR}, PMOVS{SET,CLR}", which reverts semantic changes made for the mentioned registers in the past. It is necessary to migrate the PMU state properly on Firecracker, QEMU, and crosvm.
Signed-off-by Akihiko Odaki <[email protected]>---
Changes in v5:
- Rebased.
- Link to v4: https://lore.kernel.org/r/[email protected]Changes in v4:
- Reverted changes for functions implementing ioctls in patch
"KVM: arm64: PMU: Assume PMU presence inpmu-emul.c".
- Removedkvm_pmu_vcpu_reset().
- Reordered function calls inkvm_vcpu_reload_pmu()for better style.
- Link to v3: https://lore.kernel.org/r/[email protected]Changes in v3:
- Added patch "KVM: arm64: PMU: Assume PMU presence inpmu-emul.c".
- Added an explanation of this path series' motivation to each patch.
- Explained why userspace register writes and register reset should be covered in patch "KVM: arm64: PMU: Reload when user modifies registers".
- Marked patch "KVM: arm64: PMU: Set raw values from user to PM{C,I}NTEN{SET,CLR}, PMOVS{SET,CLR}" for stable.
- Reoreded so that patch "KVM: arm64: PMU: Set raw values from user to PM{C,I}NTEN{SET,CLR}, PMOVS{SET,CLR}" would come first.
- Added patch "KVM: arm64: PMU: Callkvm_pmu_handle_pmcr()after maskingPMCNTENSET_EL0".
- Added patch "KVM: arm64: ReloadPMCNTENSET_EL0".
- Link to v2: https://lore.kernel.org/r/[email protected]Changes in v2:
- Changed to utilizeKVM_REQ_RELOAD_PMUas suggested by Oliver Upton.
- Added patch "KVM: arm64: PMU: Reload when user modifies registers" to cover more registers.
- Added patch "KVM: arm64: PMU: Set raw values from user to PM{C,I}NTEN{SET,CLR}, PMOVS{SET,CLR}".
- Link to v1: https://lore.kernel.org/r/[email protected]---
Akihiko Odaki (5):
KVM: arm64: PMU: Set raw values from user to PM{C,I}NTEN{SET,CLR}, PMOVS{SET,CLR}
KVM: arm64: PMU: Assume PMU presence inpmu-emul.c
KVM: arm64: PMU: FixSET_ONE_REGfor vPMC regs
KVM: arm64: PMU: Reload when user modifies registers
KVM: arm64: PMU: Reload when resetting
Quoted 7 lines
arch/arm64/kvm/arm.c | 17 ++++++++----- arch/arm64/kvm/emulate-nested.c | 6 +++-- arch/arm64/kvm/pmu-emul.c | 56 +++++++++++------------------------------ arch/arm64/kvm/reset.c | 3 --- arch/arm64/kvm/sys_regs.c | 52 ++++++++++++++++++++++---------------- include/kvm/arm_pmu.h | 4 +-- 6 files changed, 62 insertions(+), 76 deletions(-)
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Oliver Upton
AppliedQuoted 6 lines · Akihiko Odaki
Prepare vPMC registers for user-initiated changes after first run. This is important specifically for debugging Windows on QEMU with GDB; QEMU tries to write back all visible registers when resuming the VM execution with GDB, corrupting the PMU state. Windows always uses the PMU so this can cause adverse effects on that particular OS.
Quoted 6 lines
This series also contains patch "KVM: arm64: PMU: Set raw values from user to PM{C,I}NTEN{SET,CLR}, PMOVS{SET,CLR}", which reverts semantic changes made for the mentioned registers in the past. It is necessary to migrate the PMU state properly on Firecracker, QEMU, and crosvm.
[...]
Squashed in a fix for CONFIG_HW_PERF_EVENTS=n build.
Applied to next, thanks!
[1/5] KVM: arm64: PMU: Set raw values from user to PM{C,I}NTEN{SET,CLR}, PMOVS{SET,CLR}
https://git.kernel.org/kvmarm/kvmarm/c/f2aeb7bbd574 [2/5] KVM: arm64: PMU: Assume PMU presence in pmu-emul.c https://git.kernel.org/kvmarm/kvmarm/c/be5ccac3f15e [3/5] KVM: arm64: PMU: Fix SET_ONE_REG for vPMC regs https://git.kernel.org/kvmarm/kvmarm/c/64074ca8ca92 [4/5] KVM: arm64: PMU: Reload when user modifies registers https://git.kernel.org/kvmarm/kvmarm/c/1db4aaa05589 [5/5] KVM: arm64: PMU: Reload when resetting https://git.kernel.org/kvmarm/kvmarm/c/fe53538069bb
--
Best,
Oliver