* tip-bot for David Woodhouse <[email protected]> wrote:
> Commit-ID: 670c3e8da87fa4046a55077b1409cf250865a203
> Gitweb:
> https://git.kernel.org/tip/670c3e8da87fa4046a55077b1409cf250865a203
> Author: David Woodhouse <[email protected]>
> AuthorDate: Sun, 11 Feb 2018 15:19:19 +0000
> Committer: Ingo Molnar <[email protected]>
> CommitDate: Sun, 11 Feb 2018 19:44:46 +0100
>
> x86/speculation: Use IBRS if available before calling into firmware
>
> Retpoline means the kernel is safe because it has no indirect branches.
> But firmware isn't, so use IBRS for firmware calls if it's available.
>
> Signed-off-by: David Woodhouse <[email protected]>
> Cc: Linus Torvalds <[email protected]>
> Cc: Peter Zijlstra <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Link:
> http://lkml.kernel.org/r/[email protected]
> Signed-off-by: Ingo Molnar <[email protected]>
> ---
> arch/x86/include/asm/apm.h | 6 ++++++
> arch/x86/include/asm/cpufeatures.h | 1 +
> arch/x86/include/asm/efi.h | 17 +++++++++++++++--
> arch/x86/include/asm/nospec-branch.h | 37
> +++++++++++++++++++++++++++---------
> arch/x86/kernel/cpu/bugs.c | 12 +++++++++++-
> drivers/watchdog/hpwdt.c | 3 +++
> 6 files changed, 64 insertions(+), 12 deletions(-)
> --- a/arch/x86/include/asm/nospec-branch.h
> +++ b/arch/x86/include/asm/nospec-branch.h
> +/*
> + * With retpoline, we must use IBRS to restrict branch prediction
> + * before calling into firmware.
> + */
> +static inline void firmware_restrict_branch_speculation_start(void)
> +{
> + alternative_msr_write(MSR_IA32_SPEC_CTRL, SPEC_CTRL_IBRS,
> + X86_FEATURE_USE_IBRS_FW);
> +}
> +
> +static inline void firmware_restrict_branch_speculation_end(void)
> +{
> + alternative_msr_write(MSR_IA32_SPEC_CTRL, 0,
> + X86_FEATURE_USE_IBRS_FW);
BTW., there's a detail that only occurred to me today, this enabling/disabling
sequence is not NMI safe, and it might be called from NMI context:
> --- a/drivers/watchdog/hpwdt.c
> +++ b/drivers/watchdog/hpwdt.c
> @@ -38,6 +38,7 @@
> #endif /* CONFIG_HPWDT_NMI_DECODING */
> #include <asm/nmi.h>
> #include <asm/frame.h>
> +#include <asm/nospec-branch.h>
>
> #define HPWDT_VERSION "1.4.0"
> #define SECS_TO_TICKS(secs) ((secs) * 1000 / 128)
> @@ -486,11 +487,13 @@ static int hpwdt_pretimeout(unsigned int ulReason,
> struct pt_regs *regs)
> if (!hpwdt_nmi_decoding)
> return NMI_DONE;
>
> + firmware_restrict_branch_speculation_start();
> spin_lock_irqsave(&rom_lock, rom_pl);
> if (!die_nmi_called && !is_icru && !is_uefi)
> asminline_call(&cmn_regs, cru_rom_addr);
> die_nmi_called = 1;
> spin_unlock_irqrestore(&rom_lock, rom_pl);
> + firmware_restrict_branch_speculation_end();
>
> if (allow_kdump)
> hpwdt_stop();
But ... this is a (comparatively rare) hardware-watchdog tick function, and the
chance of racing with say an EFI call seems minuscule. The race will result in
an
EFI call being performed with speculation enabled, sporadically.
Is this something we should worry about?
Thanks,
Ingo
