releases/4.9.169/powerpc-fsl-update-spectre-v2-reporting.patch

   1 From 32fb2f8c5f3bd536bfd650cde52536ebf3553b0e Mon Sep 17 00:00:00 2001
   2 From: Diana Craciun <diana.craciun@nxp.com>
   3 Date: Thu, 11 Apr 2019 21:46:27 +1000
   4 Subject: powerpc/fsl: Update Spectre v2 reporting
   5
   6 commit dfa88658fb0583abb92e062c7a9cd5a5b94f2a46 upstream.
   7
   8 Report branch predictor state flush as a mitigation for
   9 Spectre variant 2.
  10
  11 Signed-off-by: Diana Craciun <diana.craciun@nxp.com>
  12 Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  13 Signed-off-by: Sasha Levin <sashal@kernel.org>
  14 ---
  15  arch/powerpc/kernel/security.c | 5 ++++-
  16  1 file changed, 4 insertions(+), 1 deletion(-)
  17
  18 diff --git a/arch/powerpc/kernel/security.c b/arch/powerpc/kernel/security.c
  19 index 6dc5cdc2b87c..43ce800e73bf 100644
  20 --- a/arch/powerpc/kernel/security.c
  21 +++ b/arch/powerpc/kernel/security.c
  22 @@ -213,8 +213,11 @@ ssize_t cpu_show_spectre_v2(struct device *dev, struct device_attribute *attr, c
  23
  24                 if (count_cache_flush_type == COUNT_CACHE_FLUSH_HW)
  25                         seq_buf_printf(&s, "(hardware accelerated)");
  26 -       } else
  27 +       } else if (btb_flush_enabled) {
  28 +               seq_buf_printf(&s, "Mitigation: Branch predictor state flush");
  29 +       } else {
  30                 seq_buf_printf(&s, "Vulnerable");
  31 +       }
  32
  33         seq_buf_printf(&s, "\n");
  34
  35 --
  36 2.19.1
  37