From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx2.suse.de ([195.135.220.15]) by Galois.linutronix.de with esmtps (TLS1.0:DHE_RSA_CAMELLIA_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1fBeFJ-0002cy-JV for speck@linutronix.de; Thu, 26 Apr 2018 12:35:28 +0200 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id DFDF0AC21 for ; Thu, 26 Apr 2018 10:35:19 +0000 (UTC) Date: Thu, 26 Apr 2018 12:35:05 +0200 From: Borislav Petkov Subject: [MODERATED] Re: [PATCH v5 07/11] [PATCH v5 07/10] Linux Patch #7 Message-ID: <20180426103505.GD15043@pd.tnic> References: <20180426020546.201159727@localhost.localdomain> MIME-Version: 1.0 In-Reply-To: <20180426020546.201159727@localhost.localdomain> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable To: speck@linutronix.de List-ID: On Wed, Apr 25, 2018 at 10:04:22PM -0400, speck for konrad.wilk_at_oracle.com= wrote: > x86/bugs/Intel: set proper CPU features and latch mitigation for RDS ... > diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c > index dff706bba3aa..99cdd44c20bc 100644 > --- a/arch/x86/kernel/cpu/bugs.c > +++ b/arch/x86/kernel/cpu/bugs.c > @@ -37,8 +37,6 @@ u64 __read_mostly x86_spec_ctrl_base; > =20 > void __init check_bugs(void) > { > - identify_boot_cpu(); > - > /* > * Read the SPEC_CTRL MSR to account for reserved bits which may have > * unknown values. > @@ -46,11 +44,6 @@ void __init check_bugs(void) > if (boot_cpu_has(X86_FEATURE_IBRS)) > rdmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base); > =20 > - if (!IS_ENABLED(CONFIG_SMP)) { > - pr_info("CPU: "); > - print_cpu_info(&boot_cpu_data); > - } > - > /* Select the proper spectre mitigation before patching alternatives */ > spectre_v2_select_mitigation(); > =20 > @@ -60,6 +53,18 @@ void __init check_bugs(void) > */ > ssb_select_mitigation(); > =20 > + /* > + * Need to do this _after_ spec_store_bypass_select_mitigation to ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ As mentioned yesterday already: s/spec_store_bypass_select_mitigation/ssb_select_mitigation/ in the comment above. With that: Reviewed-by: Borislav Petkov --=20 Regards/Gruss, Boris. SUSE Linux GmbH, GF: Felix Imend=C3=B6rffer, Jane Smithard, Graham Norton, HR= B 21284 (AG N=C3=BCrnberg) --=20