From patchwork Wed Jan 15 14:28:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 11334983 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5970013B4 for ; Wed, 15 Jan 2020 14:29:25 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 373922465A for ; Wed, 15 Jan 2020 14:29:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="q4/siAbT"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="O8eX09fy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 373922465A 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.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=ty1f0x+69WCZVuQs0S6xHvbZGXWcxBP003NkyU1C4Wo=; b=q4/siAbTGgrATp KDDvCnwC/pjEjsuuCovWyaDyJuMyPUCFdyD4juzwYKR4LoMtX7zAkDU6/rTrVfuk3qV/RmgX1U4XT GbjfxUu+0h9IxgGbWP/BeOgsih25/CGgT6KoDXJm9prTrBpxZobUjBD342UgvNKPzNN3pWPwyaKog a+HnZGD5V7uFivd98NyjsZZ2bAOId3ayKqc/ecFY0cKVeVBOBvfHNXDNsexBCUUB8iKmnvX/hujKS 5NFwwMu8z/YxzVwZDOXyc75Rp5ikB87op/AItztBwj8c3EvbglRbrlL8/NZ974I/oeEbTf6VbUDOs fqCwYWoPLmFF1DcwECUA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1irjff-0007hw-MA; Wed, 15 Jan 2020 14:29:23 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1irjfR-0007XH-94 for linux-arm-kernel@lists.infradead.org; Wed, 15 Jan 2020 14:29:10 +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 BC3822467A; Wed, 15 Jan 2020 14:29:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579098549; bh=NS+WkmkBqm1jKci5W7p0yqlGhR7MP0lFDwITqyj1vGg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O8eX09fyKL8fleo5NiMVXHEfcQF5aMiCXeyoO71YuRAuiJoA6DVIVyyWTI0VIXOw4 B3PRt0nuNOU/W7xj9saE7uzwi08pgAT7qV05zebkihfwdf0uWnn0x0qePLViBSpMm5 RosTy+zhIpaDyQzXhrVNofOKm2YlwrkfnlxbW0VQ= From: Will Deacon To: broonie@kernel.org Subject: [PATCH 1/2] arm64: Simplify early check for broken TX1 when KASLR is enabled Date: Wed, 15 Jan 2020 14:28:59 +0000 Message-Id: <20200115142900.28976-2-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200115142900.28976-1-will@kernel.org> References: <20200115142900.28976-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200115_062909_333890_5D431DCA X-CRM114-Status: GOOD ( 13.90 ) X-Spam-Score: -5.2 (-----) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-5.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [198.145.29.99 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender 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: kernel-team@android.com, Suzuki K Poulose , Marc Zyngier , Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Now that the decision to use non-global mappings is stored in a variable, the check to avoid enabling them for the terminally broken ThunderX1 platform can be simplified so that it is only keyed off the MIDR value. Signed-off-by: Will Deacon --- arch/arm64/kernel/cpufeature.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 4a031111ceb5..d5242b44dc5a 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -980,9 +980,7 @@ has_useable_cnp(const struct arm64_cpu_capabilities *entry, int scope) */ bool kaslr_requires_kpti(void) { - bool tx1_bug; u64 ftr; - if (!IS_ENABLED(CONFIG_RANDOMIZE_BASE)) return false; @@ -1000,18 +998,13 @@ bool kaslr_requires_kpti(void) * Systems affected by Cavium erratum 24756 are incompatible * with KPTI. */ - if (!IS_ENABLED(CONFIG_CAVIUM_ERRATUM_27456)) { - tx1_bug = false; - } else if (!static_branch_likely(&arm64_const_caps_ready)) { + if (IS_ENABLED(CONFIG_CAVIUM_ERRATUM_27456)) { extern const struct midr_range cavium_erratum_27456_cpus[]; - tx1_bug = is_midr_in_range_list(read_cpuid_id(), - cavium_erratum_27456_cpus); - } else { - tx1_bug = __cpus_have_const_cap(ARM64_WORKAROUND_CAVIUM_27456); + if (is_midr_in_range_list(read_cpuid_id(), + cavium_erratum_27456_cpus)) + return false; } - if (tx1_bug) - return false; return kaslr_offset() > 0; } From patchwork Wed Jan 15 14:29:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 11334985 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4371C13A0 for ; Wed, 15 Jan 2020 14:29:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 171D1214AF for ; Wed, 15 Jan 2020 14:29:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pAgtTpvB"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="vGbyjeeU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 171D1214AF 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.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=09PSP5V/VbxxuKcx2XaZDgJg5GXjHN304od3QO8bPiQ=; b=pAgtTpvBqvXzFn nE2DLh/nc1IStl42ojiQ6AhGjxIK2+ocsMa6g9/jL6REYWL7I5uM7FTachctW+N16C7SPYcmqkh+F sKCpyM2qvIumN/455YpSU3KNbfRDRF1tutqewdbQ1sGv8NDHH/J5/cF7k9ycwczc4j+RCnC97T9rr RV0EDSGbFllk0HUnO3Uo0uvMDEIYYKPc0QVP37j2hVMi/eSYE2LmWwdRq7/KMusPTpdotqgiC7obA 0dYlLl+1c/vNJTEbocYesYTLFaKuTxC040SUgUmLpemc4+oDe/QUI/QO0Ez3qI11FyNsJ1LXxdhMn 7IbQmnE1xZpA7q3NkFxg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1irjfs-0007vn-GU; Wed, 15 Jan 2020 14:29:36 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1irjfS-0007Xi-UN for linux-arm-kernel@lists.infradead.org; Wed, 15 Jan 2020 14:29:15 +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 6973F2467E; Wed, 15 Jan 2020 14:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579098550; bh=1cOnVqau+V6XqIPtoRyiCW27AG7oqpfHDA6sa8PXs+c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vGbyjeeU1f42rrsR4NuEBfCbyEYqWoEQCe183f9rk0I5kOAmm+xgcgjskh1C21IXz yDGN9ftq61RAEjj7Xi65FianBy7er8/MeXSvDUzOiWlwlBbJkE48ljJPknSYqCz6AV kjWf9nYYojRpkGfrYViI8qsBZX3gxtWkkIzKfGC4= From: Will Deacon To: broonie@kernel.org Subject: [PATCH 2/2] arm64: Use register field helper in kaslr_requires_kpti() Date: Wed, 15 Jan 2020 14:29:00 +0000 Message-Id: <20200115142900.28976-3-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200115142900.28976-1-will@kernel.org> References: <20200115142900.28976-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200115_062910_994900_E0AFC25D X-CRM114-Status: GOOD ( 12.68 ) X-Spam-Score: -5.2 (-----) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-5.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [198.145.29.99 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender 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: kernel-team@android.com, Suzuki K Poulose , Marc Zyngier , Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Rather than open-code the extraction of the E0PD field from the MMFR2 register, we can use the cpuid_feature_extract_unsigned_field() helper instead. Signed-off-by: Will Deacon Reviewed-by: Mark Brown --- arch/arm64/kernel/cpufeature.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index d5242b44dc5a..1ebeb5bc17d2 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -980,7 +980,6 @@ has_useable_cnp(const struct arm64_cpu_capabilities *entry, int scope) */ bool kaslr_requires_kpti(void) { - u64 ftr; if (!IS_ENABLED(CONFIG_RANDOMIZE_BASE)) return false; @@ -989,8 +988,9 @@ bool kaslr_requires_kpti(void) * where available. */ if (IS_ENABLED(CONFIG_ARM64_E0PD)) { - ftr = read_sysreg_s(SYS_ID_AA64MMFR2_EL1); - if ((ftr >> ID_AA64MMFR2_E0PD_SHIFT) & 0xf) + u64 mmfr2 = read_sysreg_s(SYS_ID_AA64MMFR2_EL1); + if (cpuid_feature_extract_unsigned_field(mmfr2, + ID_AA64MMFR2_E0PD_SHIFT)) return false; }