From 1fef38359c8699e7d6ca630133e5e6ec0b823ed4 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Wed, 5 Jan 2022 18:49:29 +0000 Subject: [PATCH] ANDROID: KVM: arm64: pkvm: Don't init pvm traps non non-protected guests We want the host to handle everything as usual. Signed-off-by: Marc Zyngier Bug: 209580772 Change-Id: Icf8ee146917e886bca258815cf948a1b12540353 Signed-off-by: Will Deacon --- arch/arm64/kvm/hyp/nvhe/pkvm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index a3e53009696a..d80e0d8f255e 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -379,7 +379,8 @@ static int init_shadow_structs(struct kvm *kvm, struct kvm_shadow_vm *vm, if (ret) return ret; - pkvm_vcpu_init_traps(shadow_vcpu); + if (vm->arch.pkvm.enabled) + pkvm_vcpu_init_traps(shadow_vcpu); kvm_reset_pvm_sys_regs(shadow_vcpu); vm->vcpus[i] = shadow_vcpu;