Subject: Re: [PATCH] x86/pti: Rename BUG_CPU_INSECURE to BUG_CPU_MELTDOWN
To: Thomas Gleixner <tglx@linutronix.de>,
        "Woodhouse, David" <dwmw@amazon.co.uk>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "tim.c.chen@linux.intel.com" <tim.c.chen@linux.intel.com>,
        "peterz@infradead.org" <peterz@infradead.org>,
        "torvalds@linux-foundation.org" <torvalds@linux-foundation.org>,
        "ak@linux.intel.com" <ak@linux.intel.com>,
        "riel@redhat.com" <riel@redhat.com>,
        "keescook@google.com" <keescook@google.com>,
        "gnomes@lxorguk.ukuu.org.uk" <gnomes@lxorguk.ukuu.org.uk>,
        "pjt@google.com" <pjt@google.com>,
        "dave.hansen@intel.com" <dave.hansen@intel.com>,
        "luto@amacapital.net" <luto@amacapital.net>,
        "jikos@kernel.org" <jikos@kernel.org>,
        "gregkh@linux-foundation.org" <gregkh@linux-foundation.org>
References: <alpine.DEB.2.20.1801051509210.1724@nanos>
From: Tom Lendacky <thomas.lendacky@amd.com>
Message-ID: <fb318280-8b13-2c15-6ed2-5945e8f1007a@amd.com>
Date: Fri, 5 Jan 2018 08:22:40 -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.1801051509210.1724@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: 05 Jan 2018 14:22:43.5181 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: f91df11a-63fa-4856-e691-08d55447c9a8
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1147
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/5/2018 8:10 AM, Thomas Gleixner wrote:
> Use the name associated with the attack which needs page table isolation
> for mitigation.
> 
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> ---
>  arch/x86/include/asm/cpufeatures.h |    2 +-
>  arch/x86/mm/pti.c                  |    6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)

Don't you need to update the value in arch/x86/kernel/cpu/common.c, also?

Thanks,
Tom

> 
> --- a/arch/x86/include/asm/cpufeatures.h
> +++ b/arch/x86/include/asm/cpufeatures.h
> @@ -341,6 +341,6 @@
>  #define X86_BUG_SWAPGS_FENCE		X86_BUG(11) /* SWAPGS without input dep on GS */
>  #define X86_BUG_MONITOR			X86_BUG(12) /* IPI required to wake up remote CPU */
>  #define X86_BUG_AMD_E400		X86_BUG(13) /* CPU is among the affected by Erratum 400 */
> -#define X86_BUG_CPU_INSECURE		X86_BUG(14) /* CPU is insecure and needs kernel page table isolation */
> +#define X86_BUG_CPU_MELTDOWN		X86_BUG(14) /* CPU is affected by meltdown attack and needs kernel page table isolation */
>  
>  #endif /* _ASM_X86_CPUFEATURES_H */
> --- a/arch/x86/mm/pti.c
> +++ b/arch/x86/mm/pti.c
> @@ -56,13 +56,13 @@
>  
>  static void __init pti_print_if_insecure(const char *reason)
>  {
> -	if (boot_cpu_has_bug(X86_BUG_CPU_INSECURE))
> +	if (boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN))
>  		pr_info("%s\n", reason);
>  }
>  
>  static void __init pti_print_if_secure(const char *reason)
>  {
> -	if (!boot_cpu_has_bug(X86_BUG_CPU_INSECURE))
> +	if (!boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN))
>  		pr_info("%s\n", reason);
>  }
>  
> @@ -96,7 +96,7 @@ void __init pti_check_boottime_disable(v
>  	}
>  
>  autosel:
> -	if (!boot_cpu_has_bug(X86_BUG_CPU_INSECURE))
> +	if (!boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN))
>  		return;
>  enable:
>  	setup_force_cpu_cap(X86_FEATURE_PTI);
>