commit 6450df3d7e103af142213c6d1fad9baec18483b6
author Sebastian Ene <sebastianene@google.com> Thu Apr 21 10:45:51 2022 +0000
committer Sebastian Ene <sebastianene@google.com> Wed Apr 27 10:05:05 2022 +0000
tree 491550563d83c6bfa511fbb2defce84d09858fd8
parent 3e591c63b13772a1de0ffed995b482166d27ed71

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 <sebastianene@google.com>
Change-Id: I1448102ae85176d495ae7f8d6d20de4092049f0d

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

diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c
index 6c8b2f4..511b5dd 100644
--- a/arch/arm64/kvm/hyp/nvhe/pkvm.c
+++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c
@@ -833,6 +833,10 @@
 		*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);