From 7c52b4e55a90cdb666848b724c1331296f322a0a Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Wed, 5 Jan 2022 18:43:16 +0000 Subject: [PATCH] ANDROID: KVM: arm64: pkvm: Update the shadow view of pkvm.enabled at creation time As we can't really rely on the host side for the protection status, snapshot the expected status at VM creation time. Signed-off-by: Marc Zyngier Bug: 209580772 Change-Id: I0943eadba25e6c9fe718f29e749b9fcc8fbb79ba Signed-off-by: Will Deacon --- arch/arm64/kvm/hyp/nvhe/pkvm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index a7f14e2df6e5..a3e53009696a 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -358,6 +358,7 @@ static int init_shadow_structs(struct kvm *kvm, struct kvm_shadow_vm *vm, vm->host_kvm = kvm; vm->created_vcpus = 0; vm->arch.pkvm.pvmfw_load_addr = kvm->arch.pkvm.pvmfw_load_addr; + vm->arch.pkvm.enabled = READ_ONCE(kvm->arch.pkvm.enabled); for (i = 0; i < nr_vcpus; i++) { struct kvm_vcpu *host_vcpu = kern_hyp_va(vcpu_array[i]);