Commit da2e7434 authored by Alexandru Elisei's avatar Alexandru Elisei Committed by Oliver Upton
Browse files

KVM: arm64: VHE: Save and restore host MDCR_EL2 value correctly 



Prior to commit 75a5fbaf ("KVM: arm64: Compute MDCR_EL2 at
vcpu_load()"), host MDCR_EL2 was saved correctly:

kvm_arch_vcpu_load()
  kvm_vcpu_load_debug() /* Doesn't touch hardware MDCR_EL2. */
  kvm_vcpu_load_vhe()
    __activate_traps_common()
       /* Saves host MDCR_EL2. */
       *host_data_ptr(host_debug_state.mdcr_el2) = read_sysreg(mdcr_el2)
       /* Writes VCPU MDCR_EL2. */
       write_sysreg(vcpu->arch.mdcr_el2, mdcr_el2)

The MDCR_EL2 value saved previously was restored in
kvm_arch_vcpu_put() -> kvm_vcpu_put_vhe().

After the aforementioned commit, host MDCR_EL2 is never saved:

kvm_arch_vcpu_load()
  kvm_vcpu_load_debug() /* Writes VCPU MDCR_EL2 */
  kvm_vcpu_load_vhe()
    __activate_traps_common()
       /* Saves **VCPU** MDCR_EL2. */
       *host_data_ptr(host_debug_state.mdcr_el2) = read_sysreg(mdcr_el2)
       /* Writes VCPU MDCR_EL2 a second time. */
       write_sysreg(vcpu->arch.mdcr_el2, mdcr_el2)

kvm_arch_vcpu_put() -> kvm_vcpu_put_vhe() then restores the VCPU MDCR_EL2
value. Also VCPU's MDCR_EL2 value gets written to hardware twice now.

Fix this by saving the host MDCR_EL2 in kvm_arch_vcpu_load() before it gets
overwritten by the VCPU's MDCR_EL2 value, and restore it on VCPU put.

Signed-off-by: default avatarAlexandru Elisei <alexandru.elisei@arm.com>
Reviewed-by: default avatarOliver Upton <oliver.upton@linux.dev>
Link: https://lore.kernel.org/r/20250902130833.338216-3-alexandru.elisei@arm.com


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent efad60e4

arch/arm64/kvm/debug.c

+6 −0
Original line number Diff line number Diff line
@@ -145,6 +145,9 @@ void kvm_vcpu_load_debug(struct kvm_vcpu *vcpu) 
	/* Must be called before kvm_vcpu_load_vhe() */

	KVM_BUG_ON(vcpu_get_flag(vcpu, SYSREGS_ON_CPU), vcpu->kvm);



	if (has_vhe())

		*host_data_ptr(host_debug_state.mdcr_el2) = read_sysreg(mdcr_el2);



	/*

	 * Determine which of the possible debug states we're in:

	 *
@@ -191,6 +194,9 @@ void kvm_vcpu_load_debug(struct kvm_vcpu *vcpu) 


void kvm_vcpu_put_debug(struct kvm_vcpu *vcpu)

{

	if (has_vhe())

		write_sysreg(*host_data_ptr(host_debug_state.mdcr_el2), mdcr_el2);



	if (likely(!(vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP)))

		return;

arch/arm64/kvm/hyp/include/hyp/switch.h

+0 −5
Original line number Diff line number Diff line
@@ -431,9 +431,6 @@ static inline void __activate_traps_common(struct kvm_vcpu *vcpu) 
		vcpu_set_flag(vcpu, PMUSERENR_ON_CPU);

	}



	*host_data_ptr(host_debug_state.mdcr_el2) = read_sysreg(mdcr_el2);

	write_sysreg(vcpu->arch.mdcr_el2, mdcr_el2);



	if (cpus_have_final_cap(ARM64_HAS_HCX)) {

		u64 hcrx = vcpu->arch.hcrx_el2;

		if (is_nested_ctxt(vcpu)) {
@@ -454,8 +451,6 @@ static inline void __deactivate_traps_common(struct kvm_vcpu *vcpu) 
{

	struct kvm_cpu_context *hctxt = host_data_ptr(host_ctxt);



	write_sysreg(*host_data_ptr(host_debug_state.mdcr_el2), mdcr_el2);



	write_sysreg(0, hstr_el2);

	if (system_supports_pmuv3()) {

		write_sysreg(ctxt_sys_reg(hctxt, PMUSERENR_EL0), pmuserenr_el0);

arch/arm64/kvm/hyp/nvhe/switch.c

+6 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ extern void kvm_nvhe_prepare_backtrace(unsigned long fp, unsigned long pc); 
static void __activate_traps(struct kvm_vcpu *vcpu)

{

	___activate_traps(vcpu, vcpu->arch.hcr_el2);



	*host_data_ptr(host_debug_state.mdcr_el2) = read_sysreg(mdcr_el2);

	write_sysreg(vcpu->arch.mdcr_el2, mdcr_el2);



	__activate_traps_common(vcpu);

	__activate_cptr_traps(vcpu);
@@ -93,6 +97,8 @@ static void __deactivate_traps(struct kvm_vcpu *vcpu) 
		isb();

	}



	write_sysreg(*host_data_ptr(host_debug_state.mdcr_el2), mdcr_el2);



	__deactivate_traps_common(vcpu);



	write_sysreg_hcr(this_cpu_ptr(&kvm_init_params)->hcr_el2);