aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/module.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-01-04 14:09:43 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-02-17 18:27:32 -0500
commitdc21af99fadcfa0ae65b52fd0895f85824f0c288 (patch)
treed2d293d79fdb405f25ca7fb18aa16aba6ecea261 /arch/arm/kernel/module.c
parent5b7de4547b388d3949620e21d072e35b6f2638fa (diff)
ARM: P2V: introduce phys_to_virt/virt_to_phys runtime patching
This idea came from Nicolas, Eric Miao produced an initial version, which was then rewritten into this. Patch the physical to virtual translations at runtime. As we modify the code, this makes it incompatible with XIP kernels, but allows us to achieve this with minimal loss of performance. As many translations are of the form: physical = virtual + (PHYS_OFFSET - PAGE_OFFSET) virtual = physical - (PHYS_OFFSET - PAGE_OFFSET) we generate an 'add' instruction for __virt_to_phys(), and a 'sub' instruction for __phys_to_virt(). We calculate at run time (PHYS_OFFSET - PAGE_OFFSET) by comparing the address prior to MMU initialization with where it should be once the MMU has been initialized, and place this constant into the above add/sub instructions. Once we have (PHYS_OFFSET - PAGE_OFFSET), we can calculate the real PHYS_OFFSET as PAGE_OFFSET is a build-time constant, and save this for the C-mode PHYS_OFFSET variable definition to use. At present, we are unable to support Realview with Sparsemem enabled as this uses a complex mapping function, and MSM as this requires a constant which will not fit in our math instruction. Add a module version magic string for this feature to prevent incompatible modules being loaded. Tested-by: Tony Lindgren <tony@atomide.com> Reviewed-by: Nicolas Pitre <nicolas.pitre@linaro.org> Tested-by: Nicolas Pitre <nicolas.pitre@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/module.c')
-rw-r--r--arch/arm/kernel/module.c23
1 files changed, 22 insertions, 1 deletions
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
index 2cfe8161b478..c5679f6d9f64 100644
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
@@ -268,12 +268,28 @@ struct mod_unwind_map {
268 const Elf_Shdr *txt_sec; 268 const Elf_Shdr *txt_sec;
269}; 269};
270 270
271static const Elf_Shdr *find_mod_section(const Elf32_Ehdr *hdr,
272 const Elf_Shdr *sechdrs, const char *name)
273{
274 const Elf_Shdr *s, *se;
275 const char *secstrs = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
276
277 for (s = sechdrs, se = sechdrs + hdr->e_shnum; s < se; s++)
278 if (strcmp(name, secstrs + s->sh_name) == 0)
279 return s;
280
281 return NULL;
282}
283
284extern void fixup_pv_table(const void *, unsigned long);
285
271int module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs, 286int module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs,
272 struct module *mod) 287 struct module *mod)
273{ 288{
289 const Elf_Shdr *s = NULL;
274#ifdef CONFIG_ARM_UNWIND 290#ifdef CONFIG_ARM_UNWIND
275 const char *secstrs = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset; 291 const char *secstrs = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
276 const Elf_Shdr *s, *sechdrs_end = sechdrs + hdr->e_shnum; 292 const Elf_Shdr *sechdrs_end = sechdrs + hdr->e_shnum;
277 struct mod_unwind_map maps[ARM_SEC_MAX]; 293 struct mod_unwind_map maps[ARM_SEC_MAX];
278 int i; 294 int i;
279 295
@@ -315,6 +331,11 @@ int module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs,
315 maps[i].txt_sec->sh_addr, 331 maps[i].txt_sec->sh_addr,
316 maps[i].txt_sec->sh_size); 332 maps[i].txt_sec->sh_size);
317#endif 333#endif
334#ifdef CONFIG_ARM_PATCH_PHYS_VIRT
335 s = find_mod_section(hdr, sechdrs, ".pv_table");
336 if (s)
337 fixup_pv_table((void *)s->sh_addr, s->sh_size);
338#endif
318 return 0; 339 return 0;
319} 340}
320 341