Re: [PATCH v2 3/3] x86/speculation: Enable cross-hyperthread spectre v2 STIBP mitigation

[Peter Zijlstra]

On Mon, Sep 03, 2018 at 04:34:44PM +0200, Peter Zijlstra wrote:
> On Mon, Sep 03, 2018 at 02:45:31PM +0200, Jiri Kosina wrote:
> 
> > +static bool __init stibp_needed(void)
> > +{
> > +	return (cpu_smt_control != CPU_SMT_NOT_SUPPORTED &&
> > +			boot_cpu_has(X86_FEATURE_STIBP));
> > +}
> 
> Should that not be:
> 
> 	((cpu_smt_control != CPU_SMT_NOT_SUPPORTED) ||

s/||/&&/

> 	 (cpu_smt_control != CPU_SMT_FORCE_DISABLED)) &&
> 	boot_cpu_has(X86_FEATURE_STIBP);
> 
> instead?