From 437fc98ccb2dd2ac42f2e831260ef33a528ba7ce Mon Sep 17 00:00:00 2001 From: Sebastian Ene Date: Thu, 21 Apr 2022 10:45:51 +0000 Subject: [PATCH] ANDROID: arm64: Auto-enroll MMIO guard on protected vms Set the MMIO guard flag for protected vms prior to entering the guest for the first time. Bug: 216798684 Change-Id: I1448102ae85176d495ae7f8d6d20de4092049f0d Signed-off-by: Sebastian Ene Signed-off-by: Fuad Tabba Signed-off-by: Quentin Perret --- arch/arm64/kvm/hyp/nvhe/pkvm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index 24c7f0486c65..18fc2d0a6e70 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -929,6 +929,9 @@ void pkvm_reset_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu) /* PC: IPA of pvmfw base */ *vcpu_pc(&hyp_vcpu->vcpu) = entry; hyp_vm->pvmfw_entry_vcpu = NULL; + + /* Auto enroll MMIO guard */ + set_bit(KVM_ARCH_FLAG_MMIO_GUARD, &hyp_vm->kvm.arch.flags); } reset_state->reset = false;