mbox series

[v2,0/3] arm64 kpti fixes

Message ID 20231127120049.2258650-5-ardb@google.com (mailing list archive)
Headers show
Series arm64 kpti fixes | expand

Message

Ard Biesheuvel Nov. 27, 2023, noon UTC
From: Ard Biesheuvel <ardb@kernel.org>

A couple of fixes and tweaks for KPTI - the first patch is a true
regression in v6.7, the others are minor tweaks.

v2:
- add two more tweaks
- use correct method to test system cap before alternatives have been
  applied
- move check into kpti_install_ng_mappings()

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>

Ard Biesheuvel (3):
  arm64: Avoid enabling KPTI unnecessarily
  arm64: mm: Only map KPTI trampoline if it is going to be used
  arm64: Kconfig: drop KAISER reference from KPTI option description

 arch/arm64/Kconfig             | 2 +-
 arch/arm64/kernel/cpufeature.c | 4 ++++
 arch/arm64/mm/mmu.c            | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

Comments

Mark Rutland Nov. 27, 2023, 12:47 p.m. UTC | #1
On Mon, Nov 27, 2023 at 01:00:50PM +0100, Ard Biesheuvel wrote:
> From: Ard Biesheuvel <ardb@kernel.org>
> 
> A couple of fixes and tweaks for KPTI - the first patch is a true
> regression in v6.7, the others are minor tweaks.
> 
> v2:
> - add two more tweaks
> - use correct method to test system cap before alternatives have been
>   applied
> - move check into kpti_install_ng_mappings()
> 
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Marc Zyngier <maz@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>

Thanks for this! For the series:

Acked-by: Mark Rutland <mark.rutland@arm.com>

Mark.

> 
> Ard Biesheuvel (3):
>   arm64: Avoid enabling KPTI unnecessarily
>   arm64: mm: Only map KPTI trampoline if it is going to be used
>   arm64: Kconfig: drop KAISER reference from KPTI option description
> 
>  arch/arm64/Kconfig             | 2 +-
>  arch/arm64/kernel/cpufeature.c | 4 ++++
>  arch/arm64/mm/mmu.c            | 3 +++
>  3 files changed, 8 insertions(+), 1 deletion(-)
> 
> -- 
> 2.43.0.rc1.413.gea7ed67945-goog
>
Catalin Marinas Nov. 30, 2023, 7:14 p.m. UTC | #2
On Mon, 27 Nov 2023 13:00:50 +0100, Ard Biesheuvel wrote:
> A couple of fixes and tweaks for KPTI - the first patch is a true
> regression in v6.7, the others are minor tweaks.
> 
> v2:
> - add two more tweaks
> - use correct method to test system cap before alternatives have been
>   applied
> - move check into kpti_install_ng_mappings()
> 
> [...]

Applied to arm64 (for-next/fixes), thanks!

[1/3] arm64: Avoid enabling KPTI unnecessarily
      https://git.kernel.org/arm64/c/f5259997f3e8

I only picked up the first fix in the series, I'll leave the other two
for 6.8.
Will Deacon Dec. 11, 2023, 8:27 p.m. UTC | #3
On Mon, 27 Nov 2023 13:00:50 +0100, Ard Biesheuvel wrote:
> From: Ard Biesheuvel <ardb@kernel.org>
> 
> A couple of fixes and tweaks for KPTI - the first patch is a true
> regression in v6.7, the others are minor tweaks.
> 
> v2:
> - add two more tweaks
> - use correct method to test system cap before alternatives have been
>   applied
> - move check into kpti_install_ng_mappings()
> 
> [...]

Applied last two to arm64 (for-next/cpufeature), thanks!

[2/3] arm64: mm: Only map KPTI trampoline if it is going to be used
      https://git.kernel.org/arm64/c/8885c7398fe5
[3/3] arm64: Kconfig: drop KAISER reference from KPTI option description
      https://git.kernel.org/arm64/c/7540f70df98f

Cheers,