From 6f741e863cbf7b6cac97a604ba269bf4eda9dad0 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 Signed-off-by: Sebastian Ene Change-Id: I1448102ae85176d495ae7f8d6d20de4092049f0d --- arch/arm64/kvm/hyp/nvhe/pkvm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index 6c8b2f420476..511b5dd5a6fb 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -833,6 +833,10 @@ void pkvm_reset_vcpu(struct kvm_vcpu *vcpu) *vcpu_pc(vcpu) = entry; vm->pvmfw_entry_vcpu = NULL; + + /* Auto enroll MMIO guard */ + set_bit(KVM_ARCH_FLAG_MMIO_GUARD, + &vcpu->arch.pkvm.shadow_vm->arch.flags); } else { *vcpu_pc(vcpu) = reset_state->pc; vcpu_set_reg(vcpu, 0, reset_state->r0);