Commit 9f98ddd6 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Marc Zyngier
Browse files

kvm: arm64: Add helper for loading the stage2 setting for a VM 



We load the stage2 context of a guest for different operations,
including running the guest and tlb maintenance on behalf of the
guest. As of now only the vttbr is private to the guest, but this
is about to change with IPA per VM. Add a helper to load the stage2
configuration for a VM, which could do the right thing with the
future changes.

Cc: Christoffer Dall <cdall@kernel.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 7788a280

arch/arm64/include/asm/kvm_hyp.h

+9 −0
Original line number Diff line number Diff line
@@ -155,5 +155,14 @@ void deactivate_traps_vhe_put(void); 
u64 __guest_enter(struct kvm_vcpu *vcpu, struct kvm_cpu_context *host_ctxt);

void __noreturn __hyp_do_panic(unsigned long, ...);



/*

 * Must be called from hyp code running at EL2 with an updated VTTBR

 * and interrupts disabled.

 */

static __always_inline void __hyp_text __load_guest_stage2(struct kvm *kvm)

{

	write_sysreg(kvm->arch.vttbr, vttbr_el2);

}



#endif /* __ARM64_KVM_HYP_H__ */

arch/arm64/kvm/hyp/switch.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ void deactivate_traps_vhe_put(void) 


static void __hyp_text __activate_vm(struct kvm *kvm)

{

	write_sysreg(kvm->arch.vttbr, vttbr_el2);

	__load_guest_stage2(kvm);

}



static void __hyp_text __deactivate_vm(struct kvm_vcpu *vcpu)

arch/arm64/kvm/hyp/tlb.c

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static void __hyp_text __tlb_switch_to_guest_vhe(struct kvm *kvm) 
	 * bits. Changing E2H is impossible (goodbye TTBR1_EL2), so

	 * let's flip TGE before executing the TLB operation.

	 */

	write_sysreg(kvm->arch.vttbr, vttbr_el2);

	__load_guest_stage2(kvm);

	val = read_sysreg(hcr_el2);

	val &= ~HCR_TGE;

	write_sysreg(val, hcr_el2);
@@ -39,7 +39,7 @@ static void __hyp_text __tlb_switch_to_guest_vhe(struct kvm *kvm) 


static void __hyp_text __tlb_switch_to_guest_nvhe(struct kvm *kvm)

{

	write_sysreg(kvm->arch.vttbr, vttbr_el2);

	__load_guest_stage2(kvm);

	isb();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE