Re: [PATCH] arm64: move kimage_vaddr to .rodata

From: Will Deacon
Date: Tue Mar 17 2020 - 18:27:03 EST


On Thu, Mar 12, 2020 at 11:40:02AM +0200, Rémi Denis-Courmont wrote:
> From: Remi Denis-Courmont <remi.denis.courmont@xxxxxxxxxx>
>
> This datum is not referenced from .idmap.text: it does not need to be
> mapped in idmap. Lets move it to .rodata as it is never written to after
> early boot of the primary CPU.
> (Maybe .data.ro_after_init would be cleaner though?)
>
> Signed-off-by: Rémi Denis-Courmont <remi@xxxxxxxxxx>
> ---
> arch/arm64/kernel/head.S | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
> index 6e08ee2b4d55..8e5c0e0040e4 100644
> --- a/arch/arm64/kernel/head.S
> +++ b/arch/arm64/kernel/head.S
> @@ -457,17 +457,19 @@ SYM_FUNC_START_LOCAL(__primary_switched)
> b start_kernel
> SYM_FUNC_END(__primary_switched)
>
> + .pushsection ".rodata", "a"
> +SYM_DATA_START(kimage_vaddr)
> + .quad _text - TEXT_OFFSET
> +SYM_DATA_END(kimage_vaddr)
> +EXPORT_SYMBOL(kimage_vaddr)
> + .popsection
> +
> /*
> * end early head section, begin head code that is also used for
> * hotplug and needs to have the same protections as the text region
> */
> .section ".idmap.text","awx"
>
> -SYM_DATA_START(kimage_vaddr)
> - .quad _text - TEXT_OFFSET
> -SYM_DATA_END(kimage_vaddr)
> -EXPORT_SYMBOL(kimage_vaddr)

Acked-by: Will Deacon <will@xxxxxxxxxx>

Will