diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2015-10-27 12:18:48 +0000 |
---|---|---|
committer | Marc Zyngier <marc.zyngier@arm.com> | 2015-12-14 11:30:43 +0000 |
commit | 910917bb7db070cc67557a6b3c8fcceaa5c398a7 (patch) | |
tree | 86716f40661c3a9a503a0a47b398169d6eb77e46 /arch/arm/kvm | |
parent | 044ac37d1281fc7b59d5dce4fe979a99369e95f2 (diff) | |
download | op-kernel-dev-910917bb7db070cc67557a6b3c8fcceaa5c398a7.zip op-kernel-dev-910917bb7db070cc67557a6b3c8fcceaa5c398a7.tar.gz |
arm64: KVM: Map the kernel RO section into HYP
In order to run C code in HYP, we must make sure that the kernel's
RO section is mapped into HYP (otherwise things break badly).
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'arch/arm/kvm')
-rw-r--r-- | arch/arm/kvm/arm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 8a79a57..6e35d1d 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -44,6 +44,7 @@ #include <asm/kvm_emulate.h> #include <asm/kvm_coproc.h> #include <asm/kvm_psci.h> +#include <asm/sections.h> #ifdef REQUIRES_VIRT __asm__(".arch_extension virt"); @@ -1068,6 +1069,12 @@ static int init_hyp_mode(void) goto out_free_mappings; } + err = create_hyp_mappings(__start_rodata, __end_rodata); + if (err) { + kvm_err("Cannot map rodata section\n"); + goto out_free_mappings; + } + /* * Map the Hyp stack pages */ |