Merge tag 'kvmarm-fixes-6.16-6' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

bonzini · bonzini · commit be8543845da5 · 2025-07-15T19:32:23.000+02:00
KVM/arm64 fixes for 6.16, take svenkatr#6 - Fix use of u64_replace_bits() in adjusting the guest's view of MDCR_EL2.HPMN.
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
@@ -2624,7 +2624,7 @@ static bool access_mdcr(struct kvm_vcpu *vcpu,
 	 */
 	if (hpmn > vcpu->kvm->arch.nr_pmu_counters) {
 		hpmn = vcpu->kvm->arch.nr_pmu_counters;
-		u64_replace_bits(val, hpmn, MDCR_EL2_HPMN);
+		u64p_replace_bits(&val, hpmn, MDCR_EL2_HPMN);
 	}
 
 	__vcpu_assign_sys_reg(vcpu, MDCR_EL2, val);

Original file line number	Diff line number	Diff line change
`@@ -2624,7 +2624,7 @@ static bool access_mdcr(struct kvm_vcpu *vcpu,`
`2624`	`2624`	`*/`
`2625`	`2625`	`if (hpmn > vcpu->kvm->arch.nr_pmu_counters) {`
`2626`	`2626`	`hpmn = vcpu->kvm->arch.nr_pmu_counters;`
`2627`		`- u64_replace_bits(val, hpmn, MDCR_EL2_HPMN);`
	`2627`	`+ u64p_replace_bits(&val, hpmn, MDCR_EL2_HPMN);`
`2628`	`2628`	`}`
`2629`	`2629`
`2630`	`2630`	`__vcpu_assign_sys_reg(vcpu, MDCR_EL2, val);`