From 52a268ea87885b0433090da1954d799242eef069 Mon Sep 17 00:00:00 2001
From: Will Deacon <willdeacon@google.com>
Date: Thu, 7 Jul 2022 15:49:11 +0100
Subject: [PATCH] Revert "ANDROID: KVM: arm64: Do not pass host struct pointers
 to __pkvm_teardown_shadow()"

This reverts commit 0856ec2e5348c13b069421c12f42aed345991a25.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I994e06c090d65f16ca663e517950b681cbcdc7a1
---
 arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 2 +-
 arch/arm64/kvm/hyp/nvhe/hyp-main.c     | 4 ++--
 arch/arm64/kvm/hyp/nvhe/pkvm.c         | 8 ++++++--
 arch/arm64/kvm/pkvm.c                  | 3 +--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/arch/arm64/kvm/hyp/include/nvhe/pkvm.h b/arch/arm64/kvm/hyp/include/nvhe/pkvm.h
index 9e9615a061aa..05bd6c2d04af 100644
--- a/arch/arm64/kvm/hyp/include/nvhe/pkvm.h
+++ b/arch/arm64/kvm/hyp/include/nvhe/pkvm.h
@@ -66,7 +66,7 @@ extern phys_addr_t pvmfw_base;
 extern phys_addr_t pvmfw_size;
 
 int __pkvm_init_shadow(struct kvm *kvm, void *shadow_va, size_t size, void *pgd);
-int __pkvm_teardown_shadow(int shadow_handle);
+int __pkvm_teardown_shadow(struct kvm *kvm);
 struct kvm_vcpu *get_shadow_vcpu(int shadow_handle, int vcpu_idx);
 void put_shadow_vcpu(struct kvm_vcpu *vcpu);
 
diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c
index 2b23cbf3c3e2..5946fb5462c0 100644
--- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c
+++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c
@@ -966,9 +966,9 @@ static void handle___pkvm_init_shadow(struct kvm_cpu_context *host_ctxt)
 
 static void handle___pkvm_teardown_shadow(struct kvm_cpu_context *host_ctxt)
 {
-	DECLARE_REG(int, shadow_handle, host_ctxt, 1);
+	DECLARE_REG(struct kvm *, host_kvm, host_ctxt, 1);
 
-	cpu_reg(host_ctxt, 1) = __pkvm_teardown_shadow(shadow_handle);
+	cpu_reg(host_ctxt, 1) = __pkvm_teardown_shadow(host_kvm);
 }
 
 typedef void (*hcall_t)(struct kvm_cpu_context *);
diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c
index b69f61ce7db3..13c72b1b6b9c 100644
--- a/arch/arm64/kvm/hyp/nvhe/pkvm.c
+++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c
@@ -637,17 +637,21 @@ err:
 	return ret;
 }
 
-int __pkvm_teardown_shadow(int shadow_handle)
+int __pkvm_teardown_shadow(struct kvm *kvm)
 {
 	struct kvm_hyp_memcache *mc;
 	struct kvm_shadow_vm *vm;
 	struct kvm *host_kvm;
 	size_t shadow_size;
-	int err;
+	int err, shadow_handle;
 	u64 pfn;
 	u64 nr_pages;
 	void *addr;
 
+	kvm = kern_hyp_va(kvm);
+
+	shadow_handle = kvm->arch.pkvm.shadow_handle;
+
 	/* Lookup then remove entry from the shadow table. */
 	hyp_spin_lock(&shadow_lock);
 	vm = find_shadow_by_handle(shadow_handle);
diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c
index 23a6b954657f..22e2208509ba 100644
--- a/arch/arm64/kvm/pkvm.c
+++ b/arch/arm64/kvm/pkvm.c
@@ -203,8 +203,7 @@ void kvm_shadow_destroy(struct kvm *kvm)
 	struct list_head *ppages;
 
 	if (kvm->arch.pkvm.shadow_handle)
-		WARN_ON(kvm_call_hyp_nvhe(__pkvm_teardown_shadow,
-					  kvm->arch.pkvm.shadow_handle));
+		WARN_ON(kvm_call_hyp_nvhe(__pkvm_teardown_shadow, kvm));
 
 	free_hyp_memcache(&kvm->arch.pkvm.teardown_mc);