Re: [tip: x86/pti] x86/speculation: Fix redundant MDS mitigation message
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
- Subject: Re: [tip: x86/pti] x86/speculation: Fix redundant MDS mitigation message
- From: Borislav Petkov <bp@xxxxxxxxx>
- Date: Sat, 16 Nov 2019 15:24:11 +0100
- Cc: linux-tip-commits@xxxxxxxxxxxxxxx, Pawan Gupta <pawan.kumar.gupta@xxxxxxxxxxxxxxx>, Waiman Long <longman@xxxxxxxxxx>, Borislav Petkov <bp@xxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, "H. Peter Anvin" <hpa@xxxxxxxxx>, Ingo Molnar <mingo@xxxxxxxxxx>, Josh Poimboeuf <jpoimboe@xxxxxxxxxx>, Mark Gross <mgross@xxxxxxxxxxxxxxx>, Peter Zijlstra <peterz@xxxxxxxxxxxxx>, Thomas Gleixner <tglx@xxxxxxxxxxxxx>, Tim Chen <tim.c.chen@xxxxxxxxxxxxxxx>, Tony Luck <tony.luck@xxxxxxxxx>, Tyler Hicks <tyhicks@xxxxxxxxxxxxx>, x86-ml <x86@xxxxxxxxxx>, Ingo Molnar <mingo@xxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx
- In-reply-to: <157390711921.12247.3084878540998345444.tip-bot2@tip-bot2>
- References: <20191115161445.30809-3-longman@redhat.com> <157390711921.12247.3084878540998345444.tip-bot2@tip-bot2>
- User-agent: Mutt/1.10.1 (2018-07-13)
On Sat, Nov 16, 2019 at 12:25:19PM -0000, tip-bot2 for Waiman Long wrote:
> +static void __init mds_print_mitigation(void)
> +{
> pr_info("%s\n", mds_strings[mds_mitigation]);
> }
Almost. This causes
MDS: Vulnerable
to be printed on an in-order 32-bit Atom here, which is wrong. I've
fixed it up to:
---
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index cb2fbd93ef4d..8bf64899f56a 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -256,6 +256,9 @@ static void __init mds_select_mitigation(void)
static void __init mds_print_mitigation(void)
{
+ if (!boot_cpu_has_bug(X86_BUG_MDS) || cpu_mitigations_off())
+ return;
+
pr_info("%s\n", mds_strings[mds_mitigation]);
}
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
[Index of Archives]
[Linux Stable Commits]
[Linux Stable Kernel]
[Linux Kernel]
[Linux USB Devel]
[Linux Video &Media]
[Linux Audio Users]
[Yosemite News]
[Linux SCSI]