diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2015-10-27 12:18:48 +0000 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-11-09 22:15:47 +0800 |
| commit | 38ddb602f47ae9790eefb71630104e016649f3d7 (patch) | |
| tree | 28b577beda2623624ce3385effc4aa57b1f4130a /arch/arm | |
| parent | eccbe96e1fc0d89088bfac7ddf762f108e2ce94c (diff) | |
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>
(cherry picked from commit 910917bb7db070cc67557a6b3c8fcceaa5c398a7)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'arch/arm')
| -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 d7bef2144760..449e312f1892 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"); @@ -1065,6 +1066,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 */ |