arm64: KVM: Use per-CPU vector when BP hardening is enabled

Now that we have per-CPU vectors, let's plug then in the KVM/arm64 code.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
index c8d49879307f..2df6a5c42f77 100644
--- a/virt/kvm/arm/arm.c
+++ b/virt/kvm/arm/arm.c
@@ -1158,7 +1158,7 @@ static void cpu_init_hyp_mode(void *dummy)
         pgd_ptr = kvm_mmu_get_httbr();
         stack_page = __this_cpu_read(kvm_arm_hyp_stack_page);
         hyp_stack_ptr = stack_page + PAGE_SIZE;
-        vector_ptr = (unsigned long)kvm_ksym_ref(__kvm_hyp_vector);
+        vector_ptr = (unsigned long)kvm_get_hyp_vector();
 
         __cpu_init_hyp_mode(pgd_ptr, hyp_stack_ptr, vector_ptr);
         __cpu_init_stage2();
@@ -1403,6 +1403,12 @@ static int init_hyp_mode(void)
                 goto out_err;
         }
 
+        err = kvm_map_vectors();
+        if (err) {
+                kvm_err("Cannot map vectors\n");
+                goto out_err;
+        }
+
         /*
          * Map the Hyp stack pages
          */