From: Will Deacon <will@kernel.org>
To: "Rémi Denis-Courmont" <remi@remlab.net>
Cc: mark.rutland@arm.com, catalin.marinas@arm.com,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 3/3] arm64: reduce trampoline data alignment
Date: Tue, 17 Mar 2020 22:34:33 +0000 [thread overview]
Message-ID: <20200317223433.GL20788@willie-the-truck> (raw)
In-Reply-To: <20200316124046.103844-3-remi@remlab.net>
On Mon, Mar 16, 2020 at 02:40:46PM +0200, Rémi Denis-Courmont wrote:
> From: Rémi Denis-Courmont <remi.denis.courmont@huawei.com>
>
> The trampoline data, currently consisting of two relocated pointers,
> must be within a single page. However, there are no needs for it to
> start a page.
>
> This reduces the alignment to 16 bytes (with SDEI) or 8 bytes (without
> SDEI), which is sufficient to ensure that the data is entirely within a
> single page of the fixmap.
>
> Signed-off-by: Rémi Denis-Courmont <remi.denis.courmont@huawei.com>
> ---
> arch/arm64/kernel/entry.S | 4 ++--
> arch/arm64/mm/mmu.c | 5 ++---
> 2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
> index af17fcb4aaea..b648f9fe1e33 100644
> --- a/arch/arm64/kernel/entry.S
> +++ b/arch/arm64/kernel/entry.S
> @@ -858,12 +858,12 @@ SYM_CODE_END(tramp_exit_compat)
> .popsection // .entry.tramp.text
> #ifdef CONFIG_RANDOMIZE_BASE
> .pushsection ".rodata", "a"
> - .align PAGE_SHIFT
> #ifdef CONFIG_ARM_SDE_INTERFACE
> + .align 4 // all .rodata must be in a single fixmap page
> SYM_DATA_START(__sdei_asm_trampoline_next_handler)
> .quad __sdei_asm_handler
> SYM_DATA_END(__sdei_asm_trampoline_next_handler)
> -#endif
> +#endif /* CONFIG_ARM_SDE_INTERFACE */
> SYM_DATA_START(__entry_tramp_data_start)
> .quad vectors
> SYM_DATA_END(__entry_tramp_data_start)
> diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
> index 9b08f7c7e6f0..6a0e75f48e7b 100644
> --- a/arch/arm64/mm/mmu.c
> +++ b/arch/arm64/mm/mmu.c
> @@ -599,9 +599,8 @@ static int __init map_entry_trampoline(void)
> if (IS_ENABLED(CONFIG_RANDOMIZE_BASE)) {
> extern char __entry_tramp_data_start[];
>
> - __set_fixmap(FIX_ENTRY_TRAMP_DATA,
> - __pa_symbol(__entry_tramp_data_start),
> - PAGE_KERNEL_RO);
> + pa_start = __pa_symbol(__entry_tramp_data_start) & PAGE_MASK;
> + __set_fixmap(FIX_ENTRY_TRAMP_DATA, pa_start, PAGE_KERNEL_RO);
> }
>
> return 0;
Acked-by: Will Deacon <will@kernel.org>
Will
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-03-17 22:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-16 12:40 [PATCH 3/3] arm64: reduce trampoline data alignment Rémi Denis-Courmont
2020-03-17 22:34 ` Will Deacon [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-03-19 9:12 [PATCHv3 0/3] clean up KPTI / SDEI " Rémi Denis-Courmont
2020-03-19 9:14 ` [PATCH 3/3] arm64: reduce " Rémi Denis-Courmont
2020-03-21 13:40 ` Catalin Marinas
2020-03-23 11:58 ` Mark Rutland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200317223433.GL20788@willie-the-truck \
--to=will@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=remi@remlab.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox