x86/spec: Also print IBRS if IBPB is disabled.

If ones disables ibpb_enabled the 'spectre_v2' sysfs
shows "Vulnerable" but it should say "IBRS"

This fixes it.

OraBug: 27448313
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/arch/x86/kernel/cpu/bugs_64.c b/arch/x86/kernel/cpu/bugs_64.c
index 6dfbcadd74e4565e76267c0c93bf4fd00c9e18c7..2a79f3692c6e1e38518be6e85f39cb92b36703e0 100644 (file)
--- a/arch/x86/kernel/cpu/bugs_64.c
+++ b/arch/x86/kernel/cpu/bugs_64.c
@@ -146,10 +146,10 @@ ssize_t cpu_show_spectre_v2(struct device *dev,
 {
        if (!boot_cpu_has_bug(X86_BUG_SPECTRE_V2))
                return sprintf(buf, "Not affected\n");
-       if (ibrs_inuse && ibpb_inuse)
-               return sprintf(buf, "Mitigation: IBRS IBPB\n");
-       if (ibpb_inuse && !ibrs_inuse)
-               return sprintf(buf, "Mitigation: IBPB\n");
+       if (ibrs_inuse || ibpb_inuse)
+               return sprintf(buf, "Mitigation: %s%s\n",
+                               ibrs_inuse ? "IBRS " : "",
+                               ibpb_inuse ? "IBPB" : "");
        return sprintf(buf, "Vulnerable\n");
 }
 #endif