[MODERATED] Re: [PATCH v5 07/11] [PATCH v5 07/10] Linux Patch #7

[Borislav Petkov <bp@suse.de>]

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;
>  
>  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);
>  
> -	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();
>  
> @@ -60,6 +53,18 @@ void __init check_bugs(void)
>  	 */
>  	ssb_select_mitigation();
>  
> +	/*
> +	 * 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 <bp@suse.de>

-- 
Regards/Gruss,
    Boris.

SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
--