mbox series

[RFC/RFT,00/16] arm64: backport SSBS handling to v4.19-stable

Message ID 20191004120430.11929-1-ard.biesheuvel@linaro.org (mailing list archive)
Headers show
Series arm64: backport SSBS handling to v4.19-stable | expand

Message

Ard Biesheuvel Oct. 4, 2019, 12:04 p.m. UTC
This is a fairly mechnical backport to v4.19 of the changes needed to support
managing the SSBS state, which controls whether Speculative Store Bypass is
permitted.

I have included Jeremy's sysfs changes as well, since they are equally
suitable for stable and made for a much cleaner backport, so it made
little sense to handle them separately.

These patches are presented for review, and are not being cc'ed to the
-stable maintainers just yet.

Cc: Will Deacon <will@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Jeremy Linton <jeremy.linton@arm.com>
Cc: Andre Przywara <andre.przywara@arm.com>

Jeremy Linton (6):
  arm64: add sysfs vulnerability show for meltdown
  arm64: Provide a command line to disable spectre_v2 mitigation
  arm64: Always enable spectre-v2 vulnerability detection
  arm64: Always enable ssb vulnerability detection
  arm64: add sysfs vulnerability show for spectre-v2
  arm64: add sysfs vulnerability show for speculative store bypass

Marc Zyngier (2):
  arm64: Advertise mitigation of Spectre-v2, or lack thereof
  arm64: Force SSBS on context switch

Mark Rutland (1):
  arm64: fix SSBS sanitization

Mian Yousaf Kaukab (2):
  arm64: Add sysfs vulnerability show for spectre-v1
  arm64: enable generic CPU vulnerabilites support

Will Deacon (5):
  arm64: cpufeature: Detect SSBS and advertise to userspace
  arm64: ssbd: Add support for PSTATE.SSBS rather than trapping to EL3
  KVM: arm64: Set SCTLR_EL2.DSSBS if SSBD is forcefully disabled and
    !vhe
  arm64: docs: Document SSBS HWCAP
  arm64: ssbs: Don't treat CPUs with SSBS as unaffected by SSB

 Documentation/admin-guide/kernel-parameters.txt |   8 +-
 Documentation/arm64/elf_hwcaps.txt              |   4 +
 arch/arm64/Kconfig                              |   1 +
 arch/arm64/include/asm/cpucaps.h                |   3 +-
 arch/arm64/include/asm/cpufeature.h             |   4 -
 arch/arm64/include/asm/kvm_host.h               |  11 +
 arch/arm64/include/asm/processor.h              |  17 ++
 arch/arm64/include/asm/ptrace.h                 |   1 +
 arch/arm64/include/asm/sysreg.h                 |  19 +-
 arch/arm64/include/uapi/asm/hwcap.h             |   1 +
 arch/arm64/include/uapi/asm/ptrace.h            |   1 +
 arch/arm64/kernel/cpu_errata.c                  | 257 +++++++++++++-------
 arch/arm64/kernel/cpufeature.c                  | 122 ++++++++--
 arch/arm64/kernel/cpuinfo.c                     |   1 +
 arch/arm64/kernel/process.c                     |  31 +++
 arch/arm64/kernel/ptrace.c                      |  15 +-
 arch/arm64/kernel/ssbd.c                        |  21 ++
 arch/arm64/kvm/hyp/sysreg-sr.c                  |  11 +
 18 files changed, 407 insertions(+), 121 deletions(-)

Comments

Ard Biesheuvel Oct. 8, 2019, 8:12 a.m. UTC | #1
On Fri, 4 Oct 2019 at 14:04, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
>
> This is a fairly mechnical backport to v4.19 of the changes needed to support
> managing the SSBS state, which controls whether Speculative Store Bypass is
> permitted.
>
> I have included Jeremy's sysfs changes as well, since they are equally
> suitable for stable and made for a much cleaner backport, so it made
> little sense to handle them separately.
>
> These patches are presented for review, and are not being cc'ed to the
> -stable maintainers just yet.
>
> Cc: Will Deacon <will@kernel.org>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Marc Zyngier <maz@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
> Cc: Jeremy Linton <jeremy.linton@arm.com>
> Cc: Andre Przywara <andre.przywara@arm.com>
>

If nobody has any objections, I'll send these out to -stable end of today.
Mark Rutland Oct. 8, 2019, 3:09 p.m. UTC | #2
On Tue, Oct 08, 2019 at 10:12:14AM +0200, Ard Biesheuvel wrote:
> On Fri, 4 Oct 2019 at 14:04, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> >
> > This is a fairly mechnical backport to v4.19 of the changes needed to support
> > managing the SSBS state, which controls whether Speculative Store Bypass is
> > permitted.
> >
> > I have included Jeremy's sysfs changes as well, since they are equally
> > suitable for stable and made for a much cleaner backport, so it made
> > little sense to handle them separately.
> >
> > These patches are presented for review, and are not being cc'ed to the
> > -stable maintainers just yet.
> >
> > Cc: Will Deacon <will@kernel.org>
> > Cc: Catalin Marinas <catalin.marinas@arm.com>
> > Cc: Marc Zyngier <maz@kernel.org>
> > Cc: Mark Rutland <mark.rutland@arm.com>
> > Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
> > Cc: Jeremy Linton <jeremy.linton@arm.com>
> > Cc: Andre Przywara <andre.przywara@arm.com>
> >
> 
> If nobody has any objections, I'll send these out to -stable end of today.

Other than patch 11, this looks good to me!

Mark.
Ard Biesheuvel Oct. 8, 2019, 3:10 p.m. UTC | #3
On Tue, 8 Oct 2019 at 17:09, Mark Rutland <mark.rutland@arm.com> wrote:
>
> On Tue, Oct 08, 2019 at 10:12:14AM +0200, Ard Biesheuvel wrote:
> > On Fri, 4 Oct 2019 at 14:04, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> > >
> > > This is a fairly mechnical backport to v4.19 of the changes needed to support
> > > managing the SSBS state, which controls whether Speculative Store Bypass is
> > > permitted.
> > >
> > > I have included Jeremy's sysfs changes as well, since they are equally
> > > suitable for stable and made for a much cleaner backport, so it made
> > > little sense to handle them separately.
> > >
> > > These patches are presented for review, and are not being cc'ed to the
> > > -stable maintainers just yet.
> > >
> > > Cc: Will Deacon <will@kernel.org>
> > > Cc: Catalin Marinas <catalin.marinas@arm.com>
> > > Cc: Marc Zyngier <maz@kernel.org>
> > > Cc: Mark Rutland <mark.rutland@arm.com>
> > > Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
> > > Cc: Jeremy Linton <jeremy.linton@arm.com>
> > > Cc: Andre Przywara <andre.przywara@arm.com>
> > >
> >
> > If nobody has any objections, I'll send these out to -stable end of today.
>
> Other than patch 11, this looks good to me!
>

Thanks Mark.