From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751149AbeAVLvh (ORCPT <rfc822;w@1wt.eu>);
        Mon, 22 Jan 2018 06:51:37 -0500
Received: from mail-io0-f194.google.com ([209.85.223.194]:43692 "EHLO
        mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1750955AbeAVLvf (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 22 Jan 2018 06:51:35 -0500
X-Google-Smtp-Source: AH8x225FbGwLUckYRev7K0HRGHu5bICZjMcmY/XN1e+9LYcBwa1kl7i98Nfbf/Tq1S/v7lByjwUrx9f3PApXAjPaks8=
MIME-Version: 1.0
In-Reply-To: <20180122114155.GC15456@arm.com>
References: <20180118135354.GB20783@arm.com> <1516364568-95577-1-git-send-email-jnair@caviumnetworks.com>
 <1516364568-95577-2-git-send-email-jnair@caviumnetworks.com> <20180122114155.GC15456@arm.com>
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Date: Mon, 22 Jan 2018 11:51:34 +0000
Message-ID: <CAKv+Gu_kOYYx3Qa8OsfsxJDLMSrWVNrt7kmtJOue9sVaTdGqXg@mail.gmail.com>
Subject: Re: [PATCH v3 2/2] arm64: Turn on KPTI only on CPUs that need it
To: Will Deacon <will.deacon@arm.com>
Cc: Jayachandran C <jnair@caviumnetworks.com>,
        Jon Masters <jcm@jonmasters.org>, Marc Zyngier <marc.zyngier@arm.com>,
        linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
        Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Laura Abbott <labbott@redhat.com>,
        Christoffer Dall <christoffer.dall@linaro.org>,
        "Suzuki K. Poulose" <suzuki.poulose@arm.com>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 22 January 2018 at 11:41, Will Deacon <will.deacon@arm.com> wrote:
> 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.
>

If we start adding opt outs here, we should at least include A53, and
probably replace

>>       if (IS_ENABLED(CONFIG_RANDOMIZE_BASE))
>>               return true;

with

>>       if (IS_ENABLED(CONFIG_RANDOMIZE_BASE) && kaslr_offset() > 0)
>>               return true;

so that adding 'nokaslr' to the command line also disables KPTI.