From a5d986619f2f0f0833c54dbe04e6183c9ec6e6be Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:48:48 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: Fix for do not allow memslot changes after first VM run under pKVM" This reverts commit e2e042c0c42d5a33b7303e1c66c32d4fa94a6d9f. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I9a2364b3afd0cf12c7dba466f2d032424ba901e4 --- arch/arm64/kvm/mmu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 6e1de374ac5b..cb8db727edad 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1796,6 +1796,10 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, hva_t reg_end = hva + mem->memory_size; int ret = 0; + if (change != KVM_MR_CREATE && change != KVM_MR_MOVE && + change != KVM_MR_FLAGS_ONLY) + return 0; + /* In protected mode, cannot modify memslots once a VM has run. */ if (is_protected_kvm_enabled() && (change == KVM_MR_DELETE || change == KVM_MR_MOVE) && @@ -1803,10 +1807,6 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, return -EPERM; } - if (change != KVM_MR_CREATE && change != KVM_MR_MOVE && - change != KVM_MR_FLAGS_ONLY) - return 0; - /* * Prevent userspace from creating a memory region outside of the IPA * space addressable by the KVM guest IPA space.