linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dave Hansen <dave.hansen@intel.com>
To: David Woodhouse <dwmw@amazon.co.uk>,
	arjan@linux.intel.com, tglx@linutronix.de, karahmed@amazon.de,
	x86@kernel.org, linux-kernel@vger.kernel.org,
	tim.c.chen@linux.intel.com, bp@alien8.de, peterz@infradead.org,
	pbonzini@redhat.com, ak@linux.intel.com,
	torvalds@linux-foundation.org, gregkh@linux-foundation.org,
	thomas.lendacky@amd.com
Subject: Re: [PATCH v2 5/5] x86/pti: Do not enable PTI on fixed Intel processors
Date: Tue, 23 Jan 2018 10:40:33 -0800	[thread overview]
Message-ID: <f8dae9e2-19c3-f915-73e5-ec1317db9381@intel.com> (raw)
In-Reply-To: <1516726375-25168-6-git-send-email-dwmw@amazon.co.uk>

On 01/23/2018 08:52 AM, David Woodhouse wrote:
> When they advertise the IA32_ARCH_CAPABILITIES MSR and it has the RDCL_NO
> bit set, they don't need KPTI either.
> 
> Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
> ---
>  arch/x86/kernel/cpu/common.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
> index e5d66e9..c05d0fe 100644
> --- a/arch/x86/kernel/cpu/common.c
> +++ b/arch/x86/kernel/cpu/common.c
> @@ -900,8 +900,14 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
>  
>  	setup_force_cpu_cap(X86_FEATURE_ALWAYS);
>  
> -	if (c->x86_vendor != X86_VENDOR_AMD)
> -		setup_force_cpu_bug(X86_BUG_CPU_MELTDOWN);
> +	if (c->x86_vendor != X86_VENDOR_AMD) {
> +		u64 ia32_cap = 0;
> +
> +		if (cpu_has(c, X86_FEATURE_ARCH_CAPABILITIES))
> +			rdmsrl(MSR_IA32_ARCH_CAPABILITIES, ia32_cap);
> +		if (!(ia32_cap & ARCH_CAP_RDCL_NO))
> +			setup_force_cpu_bug(X86_BUG_CPU_MELTDOWN);
> +	}

I'd really rather we break this out into a nice, linear set of
true/false conditions.

bool early_cpu_vulnerable_meltdown(struct cpuinfo_x86 *c)
{
	u64 ia32_cap = 0;

	/* AMD processors are not subject to Meltdown exploit: */
	if (c->x86_vendor == X86_VENDOR_AMD)
		return false;

	/* Assume all remaining CPUs not enumerating are vulnerable: */
	if (!cpu_has(c, X86_FEATURE_ARCH_CAPABILITIES))
		return true;

	/*
	 * Does the CPU explicitly enumerate that it is not vulnerable
	 * to Rogue Data Cache Load (aka Meltdown)?
	 */
	rdmsrl(MSR_IA32_ARCH_CAPABILITIES, ia32_cap);
	if (ia32_cap & ARCH_CAP_RDCL_NO)
		return false;

	/* Assume everything else is vulnerable */
	return true;
}

Then we get a nice:

	if (early_cpu_vulnerable_meltdown(c))
		setup_force_cpu_bug(X86_BUG_CPU_MELTDOWN);
 	setup_force_cpu_bug(X86_BUG_SPECTRE_V1);
 	setup_force_cpu_bug(X86_BUG_SPECTRE_V2);

Which clearly shows that Meltdown is special.

  parent reply	other threads:[~2018-01-23 18:40 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-23 16:52 [PATCH v2 0/5] Basic Speculation Control feature support David Woodhouse
2018-01-23 16:52 ` [PATCH v2 1/5] x86/cpufeatures: Add CPUID_7_EDX CPUID leaf David Woodhouse
2018-01-23 16:52 ` [PATCH v2 2/5] x86/cpufeatures: Add Intel feature bits for Speculation Control David Woodhouse
2018-01-23 18:43   ` Dave Hansen
2018-01-24  1:23     ` Woodhouse, David
2018-01-24  1:28       ` Dave Hansen
2018-01-24  8:13         ` Woodhouse, David
2018-01-23 16:52 ` [PATCH v2 3/5] x86/cpufeatures: Add AMD " David Woodhouse
2018-01-24  8:39   ` Kirill A. Shutemov
2018-01-24  8:40     ` David Woodhouse
2018-01-23 16:52 ` [PATCH v2 4/5] x86/msr: Add definitions for new speculation control MSRs David Woodhouse
2018-01-23 18:27   ` Dave Hansen
2018-01-23 18:31     ` Greg KH
2018-01-23 18:48       ` Woodhouse, David
2018-01-23 16:52 ` [PATCH v2 5/5] x86/pti: Do not enable PTI on fixed Intel processors David Woodhouse
2018-01-23 18:12   ` Andi Kleen
2018-01-24  1:21     ` David Woodhouse
2018-01-23 18:40   ` Dave Hansen [this message]
2018-01-24  1:27     ` David Woodhouse
2018-01-23 18:41   ` Dave Hansen
2018-01-23 18:44     ` Woodhouse, David
2018-01-23 18:45   ` Alan Cox
2018-01-23 19:02     ` Andrew Cooper
2018-01-23 20:45       ` Alan Cox
2018-01-23 20:38     ` Linus Torvalds
2018-01-23 20:50     ` David Woodhouse
2018-01-24 16:25     ` David Woodhouse
2018-01-24 17:07       ` Alan Cox
2018-01-24 17:42         ` David Woodhouse
2018-01-24 18:40           ` Alan Cox
2018-01-24 18:59             ` David Woodhouse
2018-01-24 19:37             ` David Woodhouse

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f8dae9e2-19c3-f915-73e5-ec1317db9381@intel.com \
    --to=dave.hansen@intel.com \
    --cc=ak@linux.intel.com \
    --cc=arjan@linux.intel.com \
    --cc=bp@alien8.de \
    --cc=dwmw@amazon.co.uk \
    --cc=gregkh@linux-foundation.org \
    --cc=karahmed@amazon.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=thomas.lendacky@amd.com \
    --cc=tim.c.chen@linux.intel.com \
    --cc=torvalds@linux-foundation.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).