From: linux@armlinux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 00/15] ARM Spectre variant 2 fixes
Date: Tue, 29 May 2018 10:07:57 +0100 [thread overview]
Message-ID: <20180529090756.GG17671@n2100.armlinux.org.uk> (raw)
Fourth version:
- Only warn once per CPU about incorrect IBE bit
(this avoids spamming the kernel log on cpuidle implementations that
use cpu_suspend() - spotted by Mark Brown.)
arch/arm/include/asm/bugs.h | 6 +-
arch/arm/include/asm/cp15.h | 3 +
arch/arm/include/asm/cputype.h | 8 ++
arch/arm/include/asm/kvm_asm.h | 2 -
arch/arm/include/asm/kvm_host.h | 14 ++-
arch/arm/include/asm/kvm_mmu.h | 23 ++++-
arch/arm/include/asm/proc-fns.h | 4 +
arch/arm/include/asm/system_misc.h | 15 ++++
arch/arm/kernel/Makefile | 1 +
arch/arm/kernel/bugs.c | 18 ++++
arch/arm/kernel/smp.c | 4 +
arch/arm/kernel/suspend.c | 2 +
arch/arm/kvm/hyp/hyp-entry.S | 112 +++++++++++++++++++++++-
arch/arm/mm/Kconfig | 23 +++++
arch/arm/mm/Makefile | 2 +-
arch/arm/mm/fault.c | 3 +
arch/arm/mm/proc-macros.S | 3 +-
arch/arm/mm/proc-v7-2level.S | 6 --
arch/arm/mm/proc-v7-bugs.c | 173 +++++++++++++++++++++++++++++++++++++
arch/arm/mm/proc-v7.S | 154 ++++++++++++++++++++++++++-------
20 files changed, 526 insertions(+), 50 deletions(-)
create mode 100644 arch/arm/kernel/bugs.c
create mode 100644 arch/arm/mm/proc-v7-bugs.c
On Fri, May 25, 2018 at 02:59:39PM +0100, Russell King - ARM Linux wrote:
> Third version:
> - Remove "PSCI" from the SMC version of the workaround as well.
> - Avoid reporting active workaround if the IBE bit is not set.
> - Only probe for workaround_1 on Cortex A57 and A72, or non-ARM CPUs.
> - Require features probe for workaround_1 to return zero.
> - Validation that all CPUs in the system have the same workaround status.
> - Avoid corrupting r12 in workaround_1 KVM hypervisor implementation.
>
> arch/arm/include/asm/bugs.h | 6 +-
> arch/arm/include/asm/cp15.h | 3 +
> arch/arm/include/asm/cputype.h | 8 ++
> arch/arm/include/asm/kvm_asm.h | 2 -
> arch/arm/include/asm/kvm_host.h | 14 ++-
> arch/arm/include/asm/kvm_mmu.h | 23 ++++-
> arch/arm/include/asm/proc-fns.h | 4 +
> arch/arm/include/asm/system_misc.h | 15 ++++
> arch/arm/kernel/Makefile | 1 +
> arch/arm/kernel/bugs.c | 18 ++++
> arch/arm/kernel/smp.c | 4 +
> arch/arm/kernel/suspend.c | 2 +
> arch/arm/kvm/hyp/hyp-entry.S | 112 +++++++++++++++++++++++-
> arch/arm/mm/Kconfig | 23 +++++
> arch/arm/mm/Makefile | 2 +-
> arch/arm/mm/fault.c | 3 +
> arch/arm/mm/proc-macros.S | 3 +-
> arch/arm/mm/proc-v7-2level.S | 6 --
> arch/arm/mm/proc-v7-bugs.c | 170 +++++++++++++++++++++++++++++++++++++
> arch/arm/mm/proc-v7.S | 154 ++++++++++++++++++++++++++-------
> 20 files changed, 523 insertions(+), 50 deletions(-)
> create mode 100644 arch/arm/kernel/bugs.c
> create mode 100644 arch/arm/mm/proc-v7-bugs.c
>
> On Mon, May 21, 2018 at 12:42:38PM +0100, Russell King - ARM Linux wrote:
> > This is the second posting - the original cover note is below. Comments
> > from previous series addresesd:
> > - Drop R7 and R8 changes.
> > - Remove "PSCI" from the hypervisor version of the workaround.
> >
> > arch/arm/include/asm/bugs.h | 6 +-
> > arch/arm/include/asm/cp15.h | 3 +
> > arch/arm/include/asm/cputype.h | 5 ++
> > arch/arm/include/asm/kvm_asm.h | 2 -
> > arch/arm/include/asm/kvm_host.h | 14 +++-
> > arch/arm/include/asm/kvm_mmu.h | 23 +++++-
> > arch/arm/include/asm/proc-fns.h | 4 +
> > arch/arm/include/asm/system_misc.h | 8 ++
> > arch/arm/kernel/Makefile | 1 +
> > arch/arm/kernel/bugs.c | 18 +++++
> > arch/arm/kernel/smp.c | 4 +
> > arch/arm/kernel/suspend.c | 2 +
> > arch/arm/kvm/hyp/hyp-entry.S | 108 +++++++++++++++++++++++++-
> > arch/arm/mm/Kconfig | 23 ++++++
> > arch/arm/mm/Makefile | 2 +-
> > arch/arm/mm/fault.c | 3 +
> > arch/arm/mm/proc-macros.S | 3 +-
> > arch/arm/mm/proc-v7-2level.S | 6 --
> > arch/arm/mm/proc-v7-bugs.c | 130 +++++++++++++++++++++++++++++++
> > arch/arm/mm/proc-v7.S | 154 +++++++++++++++++++++++++++++--------
> > 20 files changed, 469 insertions(+), 50 deletions(-)
> > create mode 100644 arch/arm/kernel/bugs.c
> > create mode 100644 arch/arm/mm/proc-v7-bugs.c
> >
> > On Wed, May 16, 2018 at 11:59:49AM +0100, Russell King - ARM Linux wrote:
> > > This series addresses the Spectre variant 2 issues on ARM Cortex and
> > > Broadcom Brahma B15 CPUs. Due to the complexity of the bug, it is not
> > > possible to verify that this series fixes any of the bugs, since it
> > > has not been able to reproduce these exact scenarios using test
> > > programs.
> > >
> > > I believe that this covers the entire extent of the Spectre variant 2
> > > issues, with the exception of Cortex A53 and Cortex A72 processors as
> > > these require a substantially more complex solution (except where the
> > > workaround is implemented in PSCI firmware.)
> > >
> > > Spectre variant 1 is not covered by this series.
> > >
> > > The patch series is based partly on Marc Zyngier's work from February -
> > > two of the KVM patches are from Marc's work.
> > >
> > > The main differences are:
> > > - Inclusion of more processors as per current ARM Ltd security update
> > > documentation.
> > > - Extension of "bugs" infrastructure to detect Cortex A8 and Cortex A15
> > > CPUs missing out on the IBE bit being set on (re-)entry to the kernel
> > > through all paths.
> > > - Handle all suspect userspace-touching-kernelspace aborts irrespective
> > > of mapping type.
> > >
> > > The first patch will trivially conflict with the Broadcom Brahma
> > > updates already in arm-soc - it has been necessary to independently
> > > add the ID definitions for the B15 CPU.
> > >
> > > Having worked through this series, I'm of the opinion that the
> > > define_processor_functions macro in proc-v7 are probably more hassle
> > > than they're worth - here, we don't need the global equivalent symbols,
> > > because we never refer to them from the kernel code for any V7
> > > processor (MULTI_CPU is always defined.)
> > >
> > > This series is currently in my "spectre" branch (along with some
> > > Spectre variant 1 patches.)
> > >
> > > Please carefully review.
> > >
> > > arch/arm/include/asm/bugs.h | 6 +-
> > > arch/arm/include/asm/cp15.h | 3 +
> > > arch/arm/include/asm/cputype.h | 5 ++
> > > arch/arm/include/asm/kvm_asm.h | 2 -
> > > arch/arm/include/asm/kvm_host.h | 14 +++-
> > > arch/arm/include/asm/kvm_mmu.h | 23 +++++-
> > > arch/arm/include/asm/proc-fns.h | 4 +
> > > arch/arm/include/asm/system_misc.h | 8 ++
> > > arch/arm/kernel/Makefile | 1 +
> > > arch/arm/kernel/bugs.c | 18 +++++
> > > arch/arm/kernel/smp.c | 4 +
> > > arch/arm/kernel/suspend.c | 2 +
> > > arch/arm/kvm/hyp/hyp-entry.S | 108 ++++++++++++++++++++++++-
> > > arch/arm/mm/Kconfig | 23 ++++++
> > > arch/arm/mm/Makefile | 2 +-
> > > arch/arm/mm/fault.c | 3 +
> > > arch/arm/mm/proc-macros.S | 3 +-
> > > arch/arm/mm/proc-v7-2level.S | 6 --
> > > arch/arm/mm/proc-v7-bugs.c | 130 ++++++++++++++++++++++++++++++
> > > arch/arm/mm/proc-v7.S | 158 +++++++++++++++++++++++++++++--------
> > > 20 files changed, 471 insertions(+), 52 deletions(-)
> > >
> > > --
> > > RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
> > > FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
> > > According to speedtest.net: 8.21Mbps down 510kbps up
> > >
> > > _______________________________________________
> > > linux-arm-kernel mailing list
> > > linux-arm-kernel at lists.infradead.org
> > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> >
> > --
> > RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
> > FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
> > According to speedtest.net: 8.21Mbps down 510kbps up
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
> --
> RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
> FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
> According to speedtest.net: 8.21Mbps down 510kbps up
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
According to speedtest.net: 8.21Mbps down 510kbps up
next reply other threads:[~2018-05-29 9:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-29 9:07 Russell King - ARM Linux [this message]
2018-05-29 9:09 ` [PATCH v4 01/15] ARM: add more CPU part numbers for Cortex and Brahma B15 CPUs Russell King
2018-05-29 9:09 ` [PATCH v4 02/15] ARM: bugs: prepare processor bug infrastructure Russell King
2018-05-29 9:09 ` [PATCH v4 03/15] ARM: bugs: hook processor bug checking into SMP and suspend paths Russell King
2018-05-29 9:09 ` [PATCH v4 04/15] ARM: bugs: add support for per-processor bug checking Russell King
2018-05-29 9:09 ` [PATCH v4 05/15] ARM: spectre: add Kconfig symbol for CPUs vulnerable to Spectre Russell King
2018-05-29 9:09 ` [PATCH v4 06/15] ARM: spectre-v2: harden branch predictor on context switches Russell King
2018-05-29 9:09 ` [PATCH v4 07/15] ARM: spectre-v2: add Cortex A8 and A15 validation of the IBE bit Russell King
2018-05-29 9:09 ` [PATCH v4 08/15] ARM: spectre-v2: harden user aborts in kernel space Russell King
2018-05-29 9:09 ` [PATCH v4 09/15] ARM: spectre-v2: add firmware based hardening Russell King
2018-05-29 9:09 ` [PATCH v4 10/15] ARM: spectre-v2: warn about incorrect context switching functions Russell King
2018-05-29 9:09 ` [PATCH v4 11/15] ARM: KVM: invalidate BTB on guest exit for Cortex-A12/A17 Russell King
2018-05-29 9:09 ` [PATCH v4 12/15] ARM: KVM: invalidate icache on guest exit for Cortex-A15 Russell King
2018-05-29 9:10 ` [PATCH v4 13/15] ARM: spectre-v2: KVM: invalidate icache on guest exit for Brahma B15 Russell King
2018-05-29 9:10 ` [PATCH v4 14/15] ARM: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling Russell King
2018-05-29 9:10 ` [PATCH v4 15/15] ARM: KVM: report support for SMCCC_ARCH_WORKAROUND_1 Russell King
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=20180529090756.GG17671@n2100.armlinux.org.uk \
--to=linux@armlinux.org.uk \
--cc=linux-arm-kernel@lists.infradead.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