arm64: kvm: deal with kernel symbols outside of linear mapping

KVM on arm64 uses a fixed offset between the linear mapping at EL1 and
the HYP mapping at EL2. Before we can move the kernel virtual mapping
out of the linear mapping, we have to make sure that references to kernel
symbols that are accessed via the HYP mapping are translated to their
linear equivalent.

Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index dda1959f0dde..975da6cfbf59 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -982,7 +982,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_hyp_vector;
+        vector_ptr = (unsigned long)kvm_ksym_ref(__kvm_hyp_vector);
 
         __cpu_init_hyp_mode(boot_pgd_ptr, pgd_ptr, hyp_stack_ptr, vector_ptr);
 
@@ -1074,13 +1074,15 @@ static int init_hyp_mode(void)
         /*
          * Map the Hyp-code called directly from the host
          */
-        err = create_hyp_mappings(__kvm_hyp_code_start, __kvm_hyp_code_end);
+        err = create_hyp_mappings(kvm_ksym_ref(__kvm_hyp_code_start),
+                                  kvm_ksym_ref(__kvm_hyp_code_end));
         if (err) {
                 kvm_err("Cannot map world-switch code\n");
                 goto out_free_mappings;
         }
 
-        err = create_hyp_mappings(__start_rodata, __end_rodata);
+        err = create_hyp_mappings(kvm_ksym_ref(__start_rodata),
+                                  kvm_ksym_ref(__end_rodata));
         if (err) {
                 kvm_err("Cannot map rodata section\n");
                 goto out_free_mappings;