Re: [PATCH] x86/pti: Rename BUG_CPU_INSECURE to BUG_CPU_MELTDOWN

[Thomas Gleixner]

On Fri, 5 Jan 2018, Tom Lendacky wrote:

> 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@xxxxxxxxxxxxx>
> > ---
> >  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?

Indeed. I'm sure I wanted to :)

> 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);
> > 
>