From 497c7db99e4a3502432ac96a99cc1529cf385f2a Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:49:11 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: Refactor __sync_vcpu_state()" This reverts commit 13a11f20733a0457da85c3a419e52b7840197371. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I257360d510bce73651682601c2a0b772d9e61593 --- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c index 69e509544804..2e85ee068bb2 100644 --- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c +++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c @@ -485,7 +485,7 @@ static void sync_timer_state(struct pkvm_loaded_state *state) __vcpu_sys_reg(shadow_vcpu, CNTV_CTL_EL0) = read_sysreg_el0(SYS_CNTV_CTL); } -static void __copy_vcpu_state(const struct kvm_vcpu *from_vcpu, +static void __sync_vcpu_state(struct kvm_vcpu *from_vcpu, struct kvm_vcpu *to_vcpu) { int i; @@ -507,20 +507,6 @@ static void __copy_vcpu_state(const struct kvm_vcpu *from_vcpu, } } -static void __sync_vcpu_state(struct kvm_vcpu *shadow_vcpu) -{ - struct kvm_vcpu *host_vcpu = shadow_vcpu->arch.pkvm.host_vcpu; - - __copy_vcpu_state(shadow_vcpu, host_vcpu); -} - -static void __flush_vcpu_state(struct kvm_vcpu *shadow_vcpu) -{ - struct kvm_vcpu *host_vcpu = shadow_vcpu->arch.pkvm.host_vcpu; - - __copy_vcpu_state(host_vcpu, shadow_vcpu); -} - static void flush_shadow_state(struct pkvm_loaded_state *state) { struct kvm_vcpu *shadow_vcpu = state->vcpu; @@ -538,7 +524,7 @@ static void flush_shadow_state(struct pkvm_loaded_state *state) */ if (!state->is_protected) { if (READ_ONCE(host_vcpu->arch.flags) & KVM_ARM64_PKVM_STATE_DIRTY) - __flush_vcpu_state(shadow_vcpu); + __sync_vcpu_state(host_vcpu, shadow_vcpu); state->vcpu->arch.hcr_el2 = HCR_GUEST_FLAGS & ~(HCR_RW | HCR_TWI | HCR_TWE); state->vcpu->arch.hcr_el2 |= host_vcpu->arch.hcr_el2; @@ -678,7 +664,7 @@ static void handle___pkvm_vcpu_put(struct kvm_cpu_context *host_ctxt) if (!state->is_protected && !(READ_ONCE(vcpu->arch.flags) & KVM_ARM64_PKVM_STATE_DIRTY)) - __sync_vcpu_state(state->vcpu); + __sync_vcpu_state(state->vcpu, vcpu); put_shadow_vcpu(state->vcpu); @@ -701,7 +687,7 @@ static void handle___pkvm_vcpu_sync_state(struct kvm_cpu_context *host_ctxt) state->vcpu->arch.pkvm.host_vcpu != vcpu) return; - __sync_vcpu_state(state->vcpu); + __sync_vcpu_state(state->vcpu, vcpu); } }