From patchwork Mon Feb 3 10:18:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brodsky X-Patchwork-Id: 13957187 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5356C02193 for ; Mon, 3 Feb 2025 10:20:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C0EE9280013; Mon, 3 Feb 2025 05:20:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BBEB4280002; Mon, 3 Feb 2025 05:20:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A37D4280013; Mon, 3 Feb 2025 05:20:12 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 68C01280002 for ; Mon, 3 Feb 2025 05:20:12 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1E2A2436CF for ; Mon, 3 Feb 2025 10:20:11 +0000 (UTC) X-FDA: 83078238222.27.39E0E20 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf25.hostedemail.com (Postfix) with ESMTP id 73FA0A000C for ; Mon, 3 Feb 2025 10:20:09 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=none; spf=pass (imf25.hostedemail.com: domain of kevin.brodsky@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=kevin.brodsky@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738578009; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1RJ6r3cxM9fgt2mbPkhm9caNHqt7aSNUg8ljSrwtyWY=; b=tvgyqkv0f2zq60ZQI9qhYjDLZOJN7m46ah8y/TUnCCBMbWyLwoifYwRGFs0k6TuilAZKGJ 3bDygVBJkV23tfVKpNm5FAyxThP93ni5teEVtBsIBOhiCjbAMwq0uTl33OJ9XuPpf6NXMa 0cpt5BDet5DHk993eHlGj8NQG3nbVP4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738578009; a=rsa-sha256; cv=none; b=fcgIYt+jHFqiPwHytKFyYzOrvaa/gUaKgsNDH++UuuEkVIjF3zgKKNvs1Erl3TD8fQRM5P WF1OL9Gy7HX6M+FyLmMQTknwuWkWg1J8ZiniWqa5xjKgTkRvwIPskGObx+AlcPR3Kmh+Xd GHOdmthqeiIifhcymNqV+XjullNNL/0= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=none; spf=pass (imf25.hostedemail.com: domain of kevin.brodsky@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=kevin.brodsky@arm.com; dmarc=pass (policy=none) header.from=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3B2CE1682; Mon, 3 Feb 2025 02:20:33 -0800 (PST) Received: from e123572-lin.arm.com (e123572-lin.cambridge.arm.com [10.1.194.54]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 48ED23F63F; Mon, 3 Feb 2025 02:20:05 -0800 (PST) From: Kevin Brodsky To: linux-hardening@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Kevin Brodsky , Andrew Morton , Mark Brown , Catalin Marinas , Dave Hansen , Jann Horn , Jeff Xu , Joey Gouly , Kees Cook , Linus Walleij , Andy Lutomirski , Marc Zyngier , Peter Zijlstra , Pierre Langlois , Quentin Perret , "Mike Rapoport (IBM)" , Ryan Roberts , Thomas Gleixner , Will Deacon , Matthew Wilcox , Qi Zheng , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, x86@kernel.org Subject: [RFC PATCH v3 07/15] arm64: Enable kpkeys Date: Mon, 3 Feb 2025 10:18:31 +0000 Message-ID: <20250203101839.1223008-8-kevin.brodsky@arm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250203101839.1223008-1-kevin.brodsky@arm.com> References: <20250203101839.1223008-1-kevin.brodsky@arm.com> MIME-Version: 1.0 X-Stat-Signature: 1bnu3njgmprtyh5t9krsbhs87bxnepyo X-Rspamd-Queue-Id: 73FA0A000C X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1738578009-688607 X-HE-Meta: U2FsdGVkX19ZnzjoHRYAK+qdGRy7zExRx5BIA45avvIU4o4v2j7zweDuc0nE1Mo8Ehjp/Vi/Pq+mG6BO3LEmtnmTmAPOoOfFO1NAq5i4c1XztPhHxj7mTUEN/deQ7+k+mHKJk4mVdSE0s8cefvea8bSUxUmarc92eIiaGerfYiZTIz6Tg1LRmloY+N4N5dyTaCME+CRml296xVjaiAXRrHyzVupaV1QUQsmS1b43TkqxM9fPp8NxyVpN3jRZsFnlUueH1+/xLwG9CqKdxfnN4pLSvTAZO8aFBtFmjL/YR1BlgXzevu2Ex4xdZ89lzzpt/ZRcJ4yr8qG1VRF2ZqDEePoQhxts4YUh/lQt6w3kERuISZsMFfYm3ilkC0oNKG2Uej6puyJf2X+hBP8gleYc52p93WQjFYL6h2YkjsshdsiKJjzXp1dMGwY7vJZ6SdXn2B34n66vRbJlgHZt+MhwOlN8wulC2IxB/ix3EHop7WID9CpxgwPnQbQKz1wKP9jG4jR4PsJBoql+FcSUtlgY7DZ0rhplTvOg2bdXIqlG8gbgUbIdLV9Zqo08Jx2SXg06i60t4JFpPbWyWarU7e+PONDODokh5AvIluSmBofng1X/kXRqyvhd06CkFPb7jPsdRjwYLE0++Uc/T5Jtdlw8doKA/973vy+cNmXuCBA1t9sGPsOXSWhmbdcRic8ht4fKR8c5Phm4LbT1IX/w5LZM6hRge9qWtG4RAgD2cJCdzRPg8wggZZXkbsudMqoXcc7xYmIM4q/o63QpdQZ9w/OtB2BZ1IL/ddUdtJKE6UVKuP08UQtAgB5vwUPI+4XlvvD8q9K4jqYwxpywvK9yxkdZLqoLlZhft7SjnvV3CZO7jsj5Ji1C5HZdj7iWr/Jd5F1iE2GmWXIJmIj8Kmkmzb7acMjlphJ//oH8ZrvPR6LjpsfF/spBgwDmyuEzgCDzD2tE8gv8tY+Yq0GOki+dDZK Ey7jTaqC vKerx6jLDLHqYjkTKi+ivDPPpYSvLodwwpQdH0r3gkFHfGkL9OzW8v2JgBiZ1pE96Bz9uaEqpE7i2iXSNOY89qQOqNGIwr74/8TnaffUmUaemlO0iD3Dp6hn3HmgMfI4+lNX7EK282LH7MpYfq0qsDFDn4Z/bghDelMxD3XHf1yI2k4qijlyv83lnQ0ozRJSkwhCHcWuGUUSzD7y9HArTh2hXvoN5bGWFYJ8P4aht3Fu+0W4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: This is the final step to enable kpkeys on arm64. We enable POE at EL1 by setting TCR2_EL1.POE, and initialise POR_EL1 so that it enables access to the default pkey/POIndex (default kpkeys level). An ISB is added so that POE restrictions are enforced immediately. Having done this, we can now select ARCH_HAS_KPKEYS if ARM64_POE is enabled. Signed-off-by: Kevin Brodsky --- arch/arm64/Kconfig | 1 + arch/arm64/kernel/cpufeature.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index fcdd0ed3eca8..34f15348ada8 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -2186,6 +2186,7 @@ config ARM64_POE def_bool y select ARCH_USES_HIGH_VMA_FLAGS select ARCH_HAS_PKEYS + select ARCH_HAS_KPKEYS help The Permission Overlay Extension is used to implement Memory Protection Keys. Memory Protection Keys provides a mechanism for diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 4eb7c6698ae4..28b8c93c60c7 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -76,6 +76,7 @@ #include #include #include +#include #include #include @@ -2385,8 +2386,10 @@ static void cpu_enable_mops(const struct arm64_cpu_capabilities *__unused) #ifdef CONFIG_ARM64_POE static void cpu_enable_poe(const struct arm64_cpu_capabilities *__unused) { - sysreg_clear_set(REG_TCR2_EL1, 0, TCR2_EL1_E0POE); + write_sysreg_s(por_set_kpkeys_level(0, KPKEYS_LVL_DEFAULT), SYS_POR_EL1); + sysreg_clear_set(REG_TCR2_EL1, 0, TCR2_EL1_E0POE | TCR2_EL1_POE); sysreg_clear_set(CPACR_EL1, 0, CPACR_EL1_E0POE); + isb(); } #endif