Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23ce6b7d authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Greg Kroah-Hartman
Browse files

KVM: arm64: nvhe: Save the SPE context early 



commit b96b0c5de685df82019e16826a282d53d86d112c upstream

The nVHE KVM hyp drains and disables the SPE buffer, before
entering the guest, as the EL1&0 translation regime
is going to be loaded with that of the guest.

But this operation is performed way too late, because :
 - The owning translation regime of the SPE buffer
   is transferred to EL2. (MDCR_EL2_E2PB == 0)
 - The guest Stage1 is loaded.

Thus the flush could use the host EL1 virtual address,
but use the EL2 translations instead of host EL1, for writing
out any cached data.

Fix this by moving the SPE buffer handling early enough.
The restore path is doing the right thing.

Cc: stable@vger.kernel.org # v4.19
Cc: Christoffer Dall <christoffer.dall@arm.com>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Alexandru Elisei <alexandru.elisei@arm.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Acked-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a75a5d16

arch/arm64/include/asm/kvm_hyp.h

+3 −0
Original line number Diff line number Diff line
@@ -144,6 +144,9 @@ void __sysreg32_restore_state(struct kvm_vcpu *vcpu); 


void __debug_switch_to_guest(struct kvm_vcpu *vcpu);

void __debug_switch_to_host(struct kvm_vcpu *vcpu);

void __debug_save_host_buffers_nvhe(struct kvm_vcpu *vcpu);

void __debug_restore_host_buffers_nvhe(struct kvm_vcpu *vcpu);





void __fpsimd_save_state(struct user_fpsimd_state *fp_regs);

void __fpsimd_restore_state(struct user_fpsimd_state *fp_regs);

arch/arm64/kvm/hyp/debug-sr.c

+15 −9
Original line number Diff line number Diff line
@@ -149,20 +149,28 @@ static void __hyp_text __debug_restore_state(struct kvm_vcpu *vcpu, 
	write_sysreg(ctxt->sys_regs[MDCCINT_EL1], mdccint_el1);

}



void __hyp_text __debug_switch_to_guest(struct kvm_vcpu *vcpu)

void __hyp_text __debug_save_host_buffers_nvhe(struct kvm_vcpu *vcpu)

{

	struct kvm_cpu_context *host_ctxt;

	struct kvm_cpu_context *guest_ctxt;

	struct kvm_guest_debug_arch *host_dbg;

	struct kvm_guest_debug_arch *guest_dbg;



	/*

	 * Non-VHE: Disable and flush SPE data generation

	 * VHE: The vcpu can run, but it can't hide.

	 */

	if (!has_vhe())

	__debug_save_spe_nvhe(&vcpu->arch.host_debug_state.pmscr_el1);



}



void __hyp_text __debug_restore_host_buffers_nvhe(struct kvm_vcpu *vcpu)

{

	__debug_restore_spe_nvhe(vcpu->arch.host_debug_state.pmscr_el1);

}



void __hyp_text __debug_switch_to_guest(struct kvm_vcpu *vcpu)

{

	struct kvm_cpu_context *host_ctxt;

	struct kvm_cpu_context *guest_ctxt;

	struct kvm_guest_debug_arch *host_dbg;

	struct kvm_guest_debug_arch *guest_dbg;



	if (!(vcpu->arch.flags & KVM_ARM64_DEBUG_DIRTY))

		return;
@@ -182,8 +190,6 @@ void __hyp_text __debug_switch_to_host(struct kvm_vcpu *vcpu) 
	struct kvm_guest_debug_arch *host_dbg;

	struct kvm_guest_debug_arch *guest_dbg;



	if (!has_vhe())

		__debug_restore_spe_nvhe(vcpu->arch.host_debug_state.pmscr_el1);



	if (!(vcpu->arch.flags & KVM_ARM64_DEBUG_DIRTY))

		return;

arch/arm64/kvm/hyp/switch.c

+3 −1
Original line number Diff line number Diff line
@@ -560,6 +560,7 @@ int __hyp_text __kvm_vcpu_run_nvhe(struct kvm_vcpu *vcpu) 
	guest_ctxt = &vcpu->arch.ctxt;



	__sysreg_save_state_nvhe(host_ctxt);

	__debug_save_host_buffers_nvhe(vcpu);



	__activate_traps(vcpu);

	__activate_vm(kern_hyp_va(vcpu->kvm));
@@ -599,11 +600,12 @@ int __hyp_text __kvm_vcpu_run_nvhe(struct kvm_vcpu *vcpu) 
	if (vcpu->arch.flags & KVM_ARM64_FP_ENABLED)

		__fpsimd_save_fpexc32(vcpu);



	__debug_switch_to_host(vcpu);

	/*

	 * This must come after restoring the host sysregs, since a non-VHE

	 * system may enable SPE here and make use of the TTBRs.

	 */

	__debug_switch_to_host(vcpu);

	__debug_restore_host_buffers_nvhe(vcpu);



	return exit_code;

}