From patchwork Tue Oct 27 21:51:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 11861949 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A117C4363A for ; Tue, 27 Oct 2020 21:53:04 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EF49920759 for ; Tue, 27 Oct 2020 21:53:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="IVsuz29V"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="0mMOxqkq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF49920759 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=N35Y0rteVYILjK4/Q2PGfMuyxXX2Dfr09sPOzaLrkfg=; b=IVsuz29VRFryNLzkkau0nvv/h 88lhmUfXX0TXLOh/xBy+Zo+kvKAJ0AvIU0WjvKSwkV39subOsJ9vRHHM2C0QSBNmhdFqUAQMeD1Qv bLxzmOCwWw42sEg17yqrsQVnHYPcJAsjnL+crA4zWDXydwMWltl4QRy+tFCMSuMQ6JysDmB75rQFt y/a+kyWI5bUClNBYcH4XitRz9fr+k49ub++/n3n/+A0ACn1/WftJBMOxqwUqXZg+LSi+2FCYeLHtV 1oaoJQ7RV9dkNRnKZJMrVNkZ7uCo+ir6lUqD/h8MyQdTw/me5t5N75OE3ajRna/S069tLJnPB9Ybm gjDxUbO0A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXWsX-0002QQ-72; Tue, 27 Oct 2020 21:51:41 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXWsL-0002N7-Uv for linux-arm-kernel@lists.infradead.org; Tue, 27 Oct 2020 21:51:31 +0000 Received: from localhost.localdomain (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4C6512223C; Tue, 27 Oct 2020 21:51:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603835489; bh=GAUTwFhizKAw0Z9lmj6Hxux2DjN4LfuQzDBctcI63WI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0mMOxqkq/GUDbYIwo0xjmXYRUaxpVGR9HvrBC+6y58kagcN3uPDfrh0WpegeVNStj AMPFd4AwowY2CUbeu33+hYtnS0Utv1gdyjaYS1xRmNgFeKJpWCETAm2HIjOgozQ48F /lOaSIpsTdUK/kAMY0WJzHH6dOct60Qc31iCFoyY= From: Will Deacon To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/6] arm64: Allow mismatched 32-bit EL0 support Date: Tue, 27 Oct 2020 21:51:14 +0000 Message-Id: <20201027215118.27003-3-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201027215118.27003-1-will@kernel.org> References: <20201027215118.27003-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201027_175130_204940_07B49A13 X-CRM114-Status: GOOD ( 21.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch@vger.kernel.org, Marc Zyngier , kernel-team@android.com, Peter Zijlstra , Catalin Marinas , Qais Yousef , Suren Baghdasaryan , Greg Kroah-Hartman , Will Deacon , Morten Rasmussen Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When confronted with a mixture of CPUs, some of which support 32-bit applications and others which don't, we quite sensibly treat the system as 64-bit only for userspace and prevent execve() of 32-bit binaries. Unfortunately, some crazy folks have decided to build systems like this with the intention of running 32-bit applications, so relax our sanitisation logic to continue to advertise 32-bit support to userspace on these systems and track the real 32-bit capable cores in a cpumask instead. For now, the default behaviour remains but will be tied to a command-line option in a later patch. Signed-off-by: Will Deacon --- arch/arm64/include/asm/cpufeature.h | 3 ++ arch/arm64/kernel/cpufeature.c | 54 +++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h index f7e7144af174..aeab42cb917e 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h @@ -582,6 +582,9 @@ static inline bool cpu_supports_mixed_endian_el0(void) return id_aa64mmfr0_mixed_endian_el0(read_cpuid(ID_AA64MMFR0_EL1)); } +const struct cpumask *system_32bit_el0_cpumask(void); +bool system_has_mismatched_32bit_el0(void); + static inline bool system_supports_32bit_el0(void) { return cpus_have_const_cap(ARM64_HAS_32BIT_EL0); diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index dcc165b3fc04..2e2219cbd54c 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -104,6 +104,10 @@ DECLARE_BITMAP(boot_capabilities, ARM64_NPATCHABLE); bool arm64_use_ng_mappings = false; EXPORT_SYMBOL(arm64_use_ng_mappings); +static bool __read_mostly __allow_mismatched_32bit_el0; +/* Mask of CPUs supporting 32-bit EL0. Only valid if we allow a mismatch */ +static cpumask_var_t cpu_32bit_el0_mask __cpumask_var_read_mostly; + /* * Flag to indicate if we have computed the system wide * capabilities based on the boot time active CPUs. This @@ -942,8 +946,11 @@ static int update_32bit_cpu_features(int cpu, struct cpuinfo_arm64 *info, * as the register values may be UNKNOWN and we're not going to be * using them for anything. */ - if (!id_aa64pfr0_32bit_el0(pfr0)) - return taint; + if (!id_aa64pfr0_32bit_el0(info->reg_id_aa64pfr0)) + return 0; + + if (__allow_mismatched_32bit_el0) + cpumask_set_cpu(cpu, cpu_32bit_el0_mask); /* * If we don't have AArch32 at EL1, then relax the strictness of @@ -1193,6 +1200,47 @@ has_cpuid_feature(const struct arm64_cpu_capabilities *entry, int scope) return feature_matches(val, entry); } +static int __init init_32bit_el0_mask(void) +{ + if (!__allow_mismatched_32bit_el0) + return 0; + + if (!alloc_cpumask_var(&cpu_32bit_el0_mask, GFP_KERNEL)) + return -ENOMEM; + + if (id_aa64pfr0_32bit_el0(per_cpu(cpu_data, 0).reg_id_aa64pfr0)) + cpumask_set_cpu(0, cpu_32bit_el0_mask); + + return 0; +} +early_initcall(init_32bit_el0_mask); + +const struct cpumask *system_32bit_el0_cpumask(void) +{ + if (__allow_mismatched_32bit_el0) + return cpu_32bit_el0_mask; + + return system_supports_32bit_el0() ? cpu_present_mask : cpu_none_mask; +} + +bool system_has_mismatched_32bit_el0(void) +{ + u64 reg; + unsigned int fld; + + if (!__allow_mismatched_32bit_el0) + return false; + + reg = read_sanitised_ftr_reg(SYS_ID_AA64PFR0_EL1); + fld = cpuid_feature_extract_unsigned_field(reg, ID_AA64PFR0_EL0_SHIFT); + return fld == ID_AA64PFR0_EL0_64BIT_ONLY; +} + +static bool has_32bit_el0(const struct arm64_cpu_capabilities *entry, int scope) +{ + return has_cpuid_feature(entry, scope) || __allow_mismatched_32bit_el0; +} + static bool has_useable_gicv3_cpuif(const struct arm64_cpu_capabilities *entry, int scope) { bool has_sre; @@ -1803,7 +1851,7 @@ static const struct arm64_cpu_capabilities arm64_features[] = { .desc = "32-bit EL0 Support", .capability = ARM64_HAS_32BIT_EL0, .type = ARM64_CPUCAP_SYSTEM_FEATURE, - .matches = has_cpuid_feature, + .matches = has_32bit_el0, .sys_reg = SYS_ID_AA64PFR0_EL1, .sign = FTR_UNSIGNED, .field_pos = ID_AA64PFR0_EL0_SHIFT,