Subject: Re: [PATCH v1 1/2] x86/retpoline: Add a function to clear the
 RETPOLINE_AMD feature
To: Thomas Gleixner <tglx@linutronix.de>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
        Rik van Riel <riel@redhat.com>,
        Andi Kleen <ak@linux.intel.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Linus Torvalds <torvalds@linux-foundation.org>,
        Jiri Kosina <jikos@kernel.org>,
        Dan Williams <dan.j.williams@intel.com>,
        Dave Hansen <dave.hansen@intel.com>,
        Borislav Petkov <bp@alien8.de>,
        Andy Lutomirski <luto@kernel.org>,
        Kees Cook <keescook@google.com>,
        Tim Chen <tim.c.chen@linux.intel.com>,
        Greg Kroah-Hartman <gregkh@linux-foundation.org>,
        David Woodhouse <dwmw@amazon.co.uk>,
        Paul Turner <pjt@google.com>
References: <20180109223723.29322.59126.stgit@tlendack-t1.amdoffice.net>
 <20180109223736.29322.5436.stgit@tlendack-t1.amdoffice.net>
 <alpine.DEB.2.20.1801092345560.2200@nanos>
 <12147db9-e975-268f-55ee-247868e0e0d8@amd.com>
 <alpine.DEB.2.20.1801100004040.2200@nanos>
From: Tom Lendacky <thomas.lendacky@amd.com>
Message-ID: <a366ccaf-736d-225a-5eb9-bcbcd6251d47@amd.com>
Date: Tue, 9 Jan 2018 17:38:19 -0600
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101
 Thunderbird/52.5.2
MIME-Version: 1.0
In-Reply-To: <alpine.DEB.2.20.1801100004040.2200@nanos>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jan 2018 23:38:23.3047 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 72fbcbeb-84ef-4339-84c8-08d557ba13a9
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1139
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Return-Path: <linux-kernel-owner@vger.kernel.org>

On 1/9/2018 5:09 PM, Thomas Gleixner wrote:
> On Tue, 9 Jan 2018, Tom Lendacky wrote:
>> On 1/9/2018 4:46 PM, Thomas Gleixner wrote:
>>> Urgh. That's an awful hack. why not do the obvious?
>>
>> My first attempt was very similar to your change below, but testing
>> showed that spectre_v2_check_boottime_disable() is called before the
>> X86_FEATURE_LFENCE_RDTSC can be set.  I can look at moving where the
>> X86_FEATURE_LFENCE_RDTSC is set, maybe into early_init_amd() or such
>> if you think that would be best.
> 
> Wait, we can move the selection _AFTER_ identify_boot_cpu().

Much cleaner.  Since it's just a single patch now, do you want me to
re-submit this after I test it or will you just pick this up as is?

I did notice that the patch does change the behavior associated with
the command line options, though.  Not sure if that was intentional.

Thanks,
Tom

> 
> Thanks,
> 
> 	tglx
> 
> 8<----------------
> 
> --- a/arch/x86/include/asm/nospec-branch.h
> +++ b/arch/x86/include/asm/nospec-branch.h
> @@ -152,7 +152,5 @@
>  # define THUNK_TARGET(addr) [thunk_target] "rm" (addr)
>  #endif
>  
> -void spectre_v2_check_boottime_disable(void);
> -
>  #endif /* __ASSEMBLY__ */
>  #endif /* __NOSPEC_BRANCH_H__ */
> --- a/arch/x86/kernel/cpu/bugs.c
> +++ b/arch/x86/kernel/cpu/bugs.c
> @@ -24,6 +24,8 @@
>  #include <asm/pgtable.h>
>  #include <asm/set_memory.h>
>  
> +static void __init spectre_v2_check_boottime_disable(void);
> +
>  void __init check_bugs(void)
>  {
>  	identify_boot_cpu();
> @@ -33,6 +35,9 @@ void __init check_bugs(void)
>  		print_cpu_info(&boot_cpu_data);
>  	}
>  
> +	/* Select the proper spectre mitigation before patching alternatives */
> +	spectre_v2_check_boottime_disable();
> +
>  #ifdef CONFIG_X86_32
>  	/*
>  	 * Check whether we are able to run this kernel safely on SMP.
> @@ -106,7 +111,7 @@ static inline bool match_option(const ch
>  	return len == arglen && !strncmp(arg, opt, len);
>  }
>  
> -void __init spectre_v2_check_boottime_disable(void)
> +static void __init spectre_v2_check_boottime_disable(void)
>  {
>  	char arg[20];
>  	int ret;
> @@ -148,14 +153,21 @@ void __init spectre_v2_check_boottime_di
>  retpoline:
>  	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) {
>  	retpoline_amd:
> +		if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD ||
> +		    !boot_cpu_has(X86_FEATURE_LFENCE_RDTSC)) {
> +			pr_info("AMD retpoline not supported, fall back to generic\n");
> +			goto retpoline_generic;
> +		}
> +
>  		spectre_v2_enabled = retp_compiler() ?
>  			SPECTRE_V2_RETPOLINE_AMD : SPECTRE_V2_RETPOLINE_MINIMAL_AMD;
>  		setup_force_cpu_cap(X86_FEATURE_RETPOLINE_AMD);
> -	} else {
> -	retpoline_generic:
> -		spectre_v2_enabled = retp_compiler() ?
> -			SPECTRE_V2_RETPOLINE_GENERIC : SPECTRE_V2_RETPOLINE_MINIMAL;
> +		setup_force_cpu_cap(X86_FEATURE_RETPOLINE);
> +		return;
>  	}
> +retpoline_generic:
> +	spectre_v2_enabled = retp_compiler() ?
> +		SPECTRE_V2_RETPOLINE_GENERIC : SPECTRE_V2_RETPOLINE_MINIMAL;
>  	setup_force_cpu_cap(X86_FEATURE_RETPOLINE);
>  	return;
>  #else
> --- a/arch/x86/kernel/setup.c
> +++ b/arch/x86/kernel/setup.c
> @@ -1322,8 +1322,6 @@ void __init setup_arch(char **cmdline_p)
>  
>  	register_refined_jiffies(CLOCK_TICK_RATE);
>  
> -	spectre_v2_check_boottime_disable();
> -
>  #ifdef CONFIG_EFI
>  	if (efi_enabled(EFI_BOOT))
>  		efi_apply_memmap_quirks();
>