All of lore.kernel.org
 help / color / mirror / Atom feed
From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 2/2] arm64: Turn on KPTI only on CPUs that need it
Date: Mon, 22 Jan 2018 11:41:55 +0000	[thread overview]
Message-ID: <20180122114155.GC15456@arm.com> (raw)
In-Reply-To: <1516364568-95577-2-git-send-email-jnair@caviumnetworks.com>

On Fri, Jan 19, 2018 at 04:22:48AM -0800, Jayachandran C wrote:
> Whitelist Broadcom Vulcan/Cavium ThunderX2 processors in
> unmap_kernel_at_el0(). These CPUs are not vulnerable to
> CVE-2017-5754 and do not need KPTI when KASLR is off.
> 
> Signed-off-by: Jayachandran C <jnair@caviumnetworks.com>
> ---
>  arch/arm64/kernel/cpufeature.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
> index 647d44b..fb698ca 100644
> --- a/arch/arm64/kernel/cpufeature.c
> +++ b/arch/arm64/kernel/cpufeature.c
> @@ -866,6 +866,13 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry,
>  	if (IS_ENABLED(CONFIG_RANDOMIZE_BASE))
>  		return true;
>  
> +	/* Don't force KPTI for CPUs that are not vulnerable */
> +	switch (read_cpuid_id() & MIDR_CPU_MODEL_MASK) {
> +	case MIDR_CAVIUM_THUNDERX2:
> +	case MIDR_BRCM_VULCAN:
> +		return false;
> +	}
> +
>  	/* Defer to CPU feature registers */
>  	return !cpuid_feature_extract_unsigned_field(pfr0,
>  						     ID_AA64PFR0_CSV3_SHIFT);

We'll need to re-jig this to work properly with big/little because this is
only called once, but that's ok for now:

Acked-by: Will Deacon <will.deacon@arm.com>

Suzuki has a series reworking much of the cpufeatures code so that we can
do this properly for 4.17.

Will

WARNING: multiple messages have this Message-ID (diff)
From: Will Deacon <will.deacon@arm.com>
To: Jayachandran C <jnair@caviumnetworks.com>
Cc: Jon Masters <jcm@jonmasters.org>,
	marc.zyngier@arm.com, linux-arm-kernel@lists.infradead.org,
	lorenzo.pieralisi@arm.com, ard.biesheuvel@linaro.org,
	catalin.marinas@arm.com, linux-kernel@vger.kernel.org,
	labbott@redhat.com, christoffer.dall@linaro.org,
	suzuki.poulose@arm.com
Subject: Re: [PATCH v3 2/2] arm64: Turn on KPTI only on CPUs that need it
Date: Mon, 22 Jan 2018 11:41:55 +0000	[thread overview]
Message-ID: <20180122114155.GC15456@arm.com> (raw)
In-Reply-To: <1516364568-95577-2-git-send-email-jnair@caviumnetworks.com>

On Fri, Jan 19, 2018 at 04:22:48AM -0800, Jayachandran C wrote:
> Whitelist Broadcom Vulcan/Cavium ThunderX2 processors in
> unmap_kernel_at_el0(). These CPUs are not vulnerable to
> CVE-2017-5754 and do not need KPTI when KASLR is off.
> 
> Signed-off-by: Jayachandran C <jnair@caviumnetworks.com>
> ---
>  arch/arm64/kernel/cpufeature.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
> index 647d44b..fb698ca 100644
> --- a/arch/arm64/kernel/cpufeature.c
> +++ b/arch/arm64/kernel/cpufeature.c
> @@ -866,6 +866,13 @@ static bool unmap_kernel_at_el0(const struct arm64_cpu_capabilities *entry,
>  	if (IS_ENABLED(CONFIG_RANDOMIZE_BASE))
>  		return true;
>  
> +	/* Don't force KPTI for CPUs that are not vulnerable */
> +	switch (read_cpuid_id() & MIDR_CPU_MODEL_MASK) {
> +	case MIDR_CAVIUM_THUNDERX2:
> +	case MIDR_BRCM_VULCAN:
> +		return false;
> +	}
> +
>  	/* Defer to CPU feature registers */
>  	return !cpuid_feature_extract_unsigned_field(pfr0,
>  						     ID_AA64PFR0_CSV3_SHIFT);

We'll need to re-jig this to work properly with big/little because this is
only called once, but that's ok for now:

Acked-by: Will Deacon <will.deacon@arm.com>

Suzuki has a series reworking much of the cpufeatures code so that we can
do this properly for 4.17.

Will

  reply	other threads:[~2018-01-22 11:41 UTC|newest]

Thread overview: 133+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-05 13:12 [PATCH v2 00/11] arm64 kpti hardening and variant 2 workarounds Will Deacon
2018-01-05 13:12 ` Will Deacon
2018-01-05 13:12 ` [PATCH v2 01/11] arm64: use RET instruction for exiting the trampoline Will Deacon
2018-01-05 13:12   ` Will Deacon
2018-01-06 13:13   ` Ard Biesheuvel
2018-01-06 13:13     ` Ard Biesheuvel
2018-01-08 14:33     ` Will Deacon
2018-01-08 14:33       ` Will Deacon
2018-01-08 14:38       ` Ard Biesheuvel
2018-01-08 14:38         ` Ard Biesheuvel
2018-01-08 14:45         ` Will Deacon
2018-01-08 14:45           ` Will Deacon
2018-01-08 14:56           ` Ard Biesheuvel
2018-01-08 14:56             ` Ard Biesheuvel
2018-01-08 15:27         ` David Laight
2018-01-08 15:27           ` David Laight
2018-01-05 13:12 ` [PATCH v2 02/11] arm64: Kconfig: Reword UNMAP_KERNEL_AT_EL0 kconfig entry Will Deacon
2018-01-05 13:12   ` Will Deacon
2018-01-05 13:12 ` [PATCH v2 03/11] arm64: Take into account ID_AA64PFR0_EL1.CSV3 Will Deacon
2018-01-05 13:12   ` Will Deacon
2018-01-08  7:24   ` [v2,03/11] " Jayachandran C
2018-01-08  7:24     ` Jayachandran C
2018-01-08  9:20     ` Marc Zyngier
2018-01-08  9:20       ` Marc Zyngier
2018-01-08 17:40       ` Jayachandran C
2018-01-08 17:40         ` Jayachandran C
2018-01-08 17:51         ` Will Deacon
2018-01-08 17:51           ` Will Deacon
2018-01-08 18:22           ` Alan Cox
2018-01-08 18:22             ` Alan Cox
2018-01-09  4:06           ` Jayachandran C
2018-01-09  4:06             ` Jayachandran C
2018-01-09 10:00             ` Will Deacon
2018-01-09 10:00               ` Will Deacon
2018-01-19  1:00               ` Jon Masters
2018-01-19  1:00                 ` Jon Masters
2018-01-08 17:52         ` Marc Zyngier
2018-01-08 17:52           ` Marc Zyngier
2018-01-08 17:06     ` Will Deacon
2018-01-08 17:06       ` Will Deacon
2018-01-08 17:50       ` Jayachandran C
2018-01-08 17:50         ` Jayachandran C
2018-01-05 13:12 ` [PATCH v2 04/11] arm64: cpufeature: Pass capability structure to ->enable callback Will Deacon
2018-01-05 13:12   ` Will Deacon
2018-01-05 13:12 ` [PATCH v2 05/11] drivers/firmware: Expose psci_get_version through psci_ops structure Will Deacon
2018-01-05 13:12   ` Will Deacon
2018-01-05 13:12 ` [PATCH v2 06/11] arm64: Move post_ttbr_update_workaround to C code Will Deacon
2018-01-05 13:12   ` Will Deacon
2018-01-05 13:12 ` [PATCH v2 07/11] arm64: Add skeleton to harden the branch predictor against aliasing attacks Will Deacon
2018-01-05 13:12   ` Will Deacon
2018-01-08  0:15   ` Jon Masters
2018-01-08  0:15     ` Jon Masters
2018-01-08 12:16   ` James Morse
2018-01-08 12:16     ` James Morse
2018-01-08 14:26     ` Will Deacon
2018-01-08 14:26       ` Will Deacon
2018-01-17  4:10   ` Yisheng Xie
2018-01-17  4:10     ` Yisheng Xie
2018-01-17 10:07     ` Will Deacon
2018-01-17 10:07       ` Will Deacon
2018-01-18  8:37       ` Yisheng Xie
2018-01-18  8:37         ` Yisheng Xie
2018-01-19  3:37       ` Li Kun
2018-01-19  3:37         ` Li Kun
2018-01-19 14:28         ` Will Deacon
2018-01-19 14:28           ` Will Deacon
2018-01-22  6:52           ` Li Kun
2018-01-22  6:52             ` Li Kun
2018-01-05 13:12 ` [PATCH v2 08/11] arm64: KVM: Use per-CPU vector when BP hardening is enabled Will Deacon
2018-01-05 13:12   ` Will Deacon
2018-01-05 13:12 ` [PATCH v2 09/11] arm64: KVM: Make PSCI_VERSION a fast path Will Deacon
2018-01-05 13:12   ` Will Deacon
2018-01-05 13:12 ` [PATCH v2 10/11] arm64: cputype: Add missing MIDR values for Cortex-A72 and Cortex-A75 Will Deacon
2018-01-05 13:12   ` Will Deacon
2018-01-05 13:12 ` [PATCH v2 11/11] arm64: Implement branch predictor hardening for affected Cortex-A CPUs Will Deacon
2018-01-05 13:12   ` Will Deacon
2018-01-05 14:46   ` James Morse
2018-01-05 14:46     ` James Morse
2018-01-05 14:57     ` Marc Zyngier
2018-01-05 14:57       ` Marc Zyngier
2018-01-08  6:31   ` [v2, " Jayachandran C
2018-01-08  6:31     ` Jayachandran C
2018-01-08  6:53     ` [PATCH 1/2] arm64: cputype: Add MIDR values for Cavium ThunderX2 CPUs Jayachandran C
2018-01-08  6:53       ` Jayachandran C
2018-01-08  6:53       ` [PATCH 2/2] arm64: Branch predictor hardening for Cavium ThunderX2 Jayachandran C
2018-01-08  6:53         ` Jayachandran C
2018-01-08 16:46         ` Will Deacon
2018-01-08 16:46           ` Will Deacon
2018-01-08 17:19           ` Jayachandran C
2018-01-08 17:19             ` Jayachandran C
2018-01-08 17:23             ` Will Deacon
2018-01-08 17:23               ` Will Deacon
2018-01-09  2:26               ` Jayachandran C
2018-01-09  2:26                 ` Jayachandran C
2018-01-09  9:53                 ` Will Deacon
2018-01-09  9:53                   ` Will Deacon
2018-01-09 12:47           ` [PATCH v2] " Jayachandran C
2018-01-09 12:47             ` Jayachandran C
2018-01-16 21:50             ` Jon Masters
2018-01-16 21:52             ` Jon Masters
2018-01-16 23:45               ` Jayachandran C
2018-01-17 18:34                 ` Jon Masters
2018-01-17 18:34                   ` Jon Masters
2018-01-18 13:53                 ` Will Deacon
2018-01-18 13:53                   ` Will Deacon
2018-01-18 17:56                   ` Jayachandran C
2018-01-18 17:56                     ` Jayachandran C
2018-01-18 18:27                     ` Jon Masters
2018-01-18 18:27                       ` Jon Masters
2018-01-18 23:28                       ` Jayachandran C
2018-01-18 23:28                         ` Jayachandran C
2018-01-19  1:17                         ` Jon Masters
2018-01-19  1:17                           ` Jon Masters
2018-01-19 12:22                   ` [PATCH v3 1/2] " Jayachandran C
2018-01-19 12:22                     ` Jayachandran C
2018-01-19 12:22                     ` [PATCH v3 2/2] arm64: Turn on KPTI only on CPUs that need it Jayachandran C
2018-01-19 12:22                       ` Jayachandran C
2018-01-22 11:41                       ` Will Deacon [this message]
2018-01-22 11:41                         ` Will Deacon
2018-01-22 11:51                         ` Ard Biesheuvel
2018-01-22 11:51                           ` Ard Biesheuvel
2018-01-22 11:55                           ` Will Deacon
2018-01-22 11:55                             ` Will Deacon
2018-01-22 18:59                         ` Jon Masters
2018-01-22 18:59                           ` Jon Masters
2018-01-19 19:08                     ` [PATCH v3 1/2] arm64: Branch predictor hardening for Cavium ThunderX2 Jon Masters
2018-01-19 19:08                       ` Jon Masters
2018-01-22 11:33                     ` Will Deacon
2018-01-22 11:33                       ` Will Deacon
2018-01-22 19:00                       ` Jon Masters
2018-01-22 19:00                         ` Jon Masters
2018-01-23  9:51                         ` Will Deacon
2018-01-23  9:51                           ` Will Deacon

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=20180122114155.GC15456@arm.com \
    --to=will.deacon@arm.com \
    --cc=linux-arm-kernel@lists.infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.