Commit 439e70e2 authored by Will Deacon's avatar Will Deacon Committed by Catalin Marinas

arm64: idmap: Use "awx" flags for .idmap.text .pushsection directives

The identity map is mapped as both writeable and executable by the
SWAPPER_MM_MMUFLAGS and this is relied upon by the kpti code to manage
a synchronisation flag. Update the .pushsection flags to reflect the
actual mapping attributes.
Reported-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 79ddab3b
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <asm/virt.h> #include <asm/virt.h>
.text .text
.pushsection .idmap.text, "ax" .pushsection .idmap.text, "awx"
/* /*
* __cpu_soft_restart(el2_switch, entry, arg0, arg1, arg2) - Helper for * __cpu_soft_restart(el2_switch, entry, arg0, arg1, arg2) - Helper for
......
...@@ -455,7 +455,7 @@ ENDPROC(__primary_switched) ...@@ -455,7 +455,7 @@ ENDPROC(__primary_switched)
* end early head section, begin head code that is also used for * end early head section, begin head code that is also used for
* hotplug and needs to have the same protections as the text region * hotplug and needs to have the same protections as the text region
*/ */
.section ".idmap.text","ax" .section ".idmap.text","awx"
ENTRY(kimage_vaddr) ENTRY(kimage_vaddr)
.quad _text - TEXT_OFFSET .quad _text - TEXT_OFFSET
......
...@@ -96,7 +96,7 @@ ENTRY(__cpu_suspend_enter) ...@@ -96,7 +96,7 @@ ENTRY(__cpu_suspend_enter)
ret ret
ENDPROC(__cpu_suspend_enter) ENDPROC(__cpu_suspend_enter)
.pushsection ".idmap.text", "ax" .pushsection ".idmap.text", "awx"
ENTRY(cpu_resume) ENTRY(cpu_resume)
bl el2_setup // if in EL2 drop to EL1 cleanly bl el2_setup // if in EL2 drop to EL1 cleanly
bl __cpu_setup bl __cpu_setup
......
...@@ -90,7 +90,7 @@ ENDPROC(cpu_do_suspend) ...@@ -90,7 +90,7 @@ ENDPROC(cpu_do_suspend)
* *
* x0: Address of context pointer * x0: Address of context pointer
*/ */
.pushsection ".idmap.text", "ax" .pushsection ".idmap.text", "awx"
ENTRY(cpu_do_resume) ENTRY(cpu_do_resume)
ldp x2, x3, [x0] ldp x2, x3, [x0]
ldp x4, x5, [x0, #16] ldp x4, x5, [x0, #16]
...@@ -165,7 +165,7 @@ ENTRY(cpu_do_switch_mm) ...@@ -165,7 +165,7 @@ ENTRY(cpu_do_switch_mm)
b post_ttbr_update_workaround // Back to C code... b post_ttbr_update_workaround // Back to C code...
ENDPROC(cpu_do_switch_mm) ENDPROC(cpu_do_switch_mm)
.pushsection ".idmap.text", "ax" .pushsection ".idmap.text", "awx"
.macro __idmap_cpu_set_reserved_ttbr1, tmp1, tmp2 .macro __idmap_cpu_set_reserved_ttbr1, tmp1, tmp2
adrp \tmp1, empty_zero_page adrp \tmp1, empty_zero_page
...@@ -199,7 +199,7 @@ ENDPROC(idmap_cpu_replace_ttbr1) ...@@ -199,7 +199,7 @@ ENDPROC(idmap_cpu_replace_ttbr1)
.popsection .popsection
#ifdef CONFIG_UNMAP_KERNEL_AT_EL0 #ifdef CONFIG_UNMAP_KERNEL_AT_EL0
.pushsection ".idmap.text", "ax" .pushsection ".idmap.text", "awx"
.macro __idmap_kpti_get_pgtable_ent, type .macro __idmap_kpti_get_pgtable_ent, type
dc cvac, cur_\()\type\()p // Ensure any existing dirty dc cvac, cur_\()\type\()p // Ensure any existing dirty
...@@ -388,7 +388,7 @@ ENDPROC(idmap_kpti_install_ng_mappings) ...@@ -388,7 +388,7 @@ ENDPROC(idmap_kpti_install_ng_mappings)
* Initialise the processor for turning the MMU on. Return in x0 the * Initialise the processor for turning the MMU on. Return in x0 the
* value of the SCTLR_EL1 register. * value of the SCTLR_EL1 register.
*/ */
.pushsection ".idmap.text", "ax" .pushsection ".idmap.text", "awx"
ENTRY(__cpu_setup) ENTRY(__cpu_setup)
tlbi vmalle1 // Invalidate local TLB tlbi vmalle1 // Invalidate local TLB
dsb nsh dsb nsh
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment