From: Mark Rutland <mark.rutland@arm.com>
To: Ard Biesheuvel <ardb@google.com>
Cc: linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com,
will@kernel.org, maz@kernel.org, Ard Biesheuvel <ardb@kernel.org>
Subject: Re: [PATCH] arm64: Avoid enabling KPTI unnecessarily
Date: Mon, 27 Nov 2023 11:10:07 +0000 [thread overview]
Message-ID: <ZWR5D_6GWuOhIPGc@FVFF77S0Q05N> (raw)
In-Reply-To: <20231127102141.2241123-2-ardb@google.com>
Hi Ard,
On Mon, Nov 27, 2023 at 11:21:42AM +0100, Ard Biesheuvel wrote:
> From: Ard Biesheuvel <ardb@kernel.org>
>
> Commit 42c5a3b04bf6 refactored the KPTI init code in a way that results
> in the use of non-global kernel mappings even on systems that have no
> need for it, and even when KPTI has been disabled explicitly via the
> command line.
>
> Ensure that this only happens when we have decided (based on the
> detected CPU features) that KPTI should be enabled.
>
> Fixes: 42c5a3b04bf6 ("arm64: Split kpti_install_ng_mappings()")
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
> arch/arm64/kernel/cpufeature.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
> index 646591c67e7a..4b1762b9c37c 100644
> --- a/arch/arm64/kernel/cpufeature.c
> +++ b/arch/arm64/kernel/cpufeature.c
> @@ -3352,7 +3352,8 @@ void __init setup_system_features(void)
> */
> enable_cpu_capabilities(SCOPE_ALL & ~SCOPE_BOOT_CPU);
>
> - kpti_install_ng_mappings();
> + if (arm64_kernel_unmapped_at_el0())
> + kpti_install_ng_mappings();
My bad; I had intended that kpti_install_ng_mappings() checked everything
necessary, but clearly I missed this.
Modulo breakage, could we move the conditionality into
kpti_install_ng_mappings()?
Thanks,
Mark.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
prev parent reply other threads:[~2023-11-27 11:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-27 10:21 [PATCH] arm64: Avoid enabling KPTI unnecessarily Ard Biesheuvel
2023-11-27 10:33 ` Marc Zyngier
2023-11-27 10:55 ` Ard Biesheuvel
2023-11-27 11:10 ` Mark Rutland [this message]
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=ZWR5D_6GWuOhIPGc@FVFF77S0Q05N \
--to=mark.rutland@arm.com \
--cc=ardb@google.com \
--cc=ardb@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
--cc=will@kernel.org \
/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