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

[mirror_ubuntu-artful-kernel.git] / virt / kvm / arm / arm.c

diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
index a39a1e161e63d53f5e199189c0427a733b2e9544..4de94f8da84ef2994b0f6ca750458de2ec6d8365 100644 (file)
--- a/virt/kvm/arm/arm.c
+++ b/virt/kvm/arm/arm.c
@@ -1136,7 +1136,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();
@@ -1390,6 +1390,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
         */