From patchwork Fri Apr 11 09:16:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brodsky X-Patchwork-Id: 14047907 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 EE6F8C369A2 for ; Fri, 11 Apr 2025 09:17:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 952FA28019E; Fri, 11 Apr 2025 05:17:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9085B28019B; Fri, 11 Apr 2025 05:17:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7CC0D28019E; Fri, 11 Apr 2025 05:17:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 5FC8328019B for ; Fri, 11 Apr 2025 05:17:35 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 101E4C21FA for ; Fri, 11 Apr 2025 09:17:36 +0000 (UTC) X-FDA: 83321210112.09.DFC9352 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf29.hostedemail.com (Postfix) with ESMTP id 89BAC120012 for ; Fri, 11 Apr 2025 09:17:34 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf29.hostedemail.com: domain of kevin.brodsky@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=kevin.brodsky@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744363054; 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=D6OJ6eTJLaGqk3wgOaTb1V4BCC/cGWqmQ6ZcX7KPIXg=; b=N3CoScoE9cvoX53oAade0HdhjTaV7OxU/bzxSPvXUBeSs14uj4qDNWLdfBFnIAPxJjNzf0 gvUX2jN4LG+6nECte8lPbEj224Eg9gATyq3/tvgbRqD/qhn3ivNdfATHDinzOnsHHzSh5+ UuEQhg9tgpBVXXFVf+rDK6RMP8EArrY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744363054; a=rsa-sha256; cv=none; b=C4B2TAQ5xiBa0qYasXWe9WSkw4wlYM4Hbb7m94hBNMVafRzOgePoGcWbd/uktWb2y9DxfK 9oC5Rs0g49A0iazY31odaDw8kh+9i4H2UHwTeRgI32+fNWLeJBoKpBMrWFgsrl5CFpXGw4 K6A56/BEUnyhY4HIyyBX8KS757vn8iI= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf29.hostedemail.com: domain of kevin.brodsky@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=kevin.brodsky@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 A4C361713; Fri, 11 Apr 2025 02:17:33 -0700 (PDT) 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 1681D3F6A8; Fri, 11 Apr 2025 02:17:29 -0700 (PDT) From: Kevin Brodsky To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, Kevin Brodsky , Andrew Morton , Mark Brown , Catalin Marinas , Dave Hansen , David Hildenbrand , Ira Weiny , Jann Horn , Jeff Xu , Joey Gouly , Kees Cook , Linus Walleij , Andy Lutomirski , Marc Zyngier , Peter Zijlstra , Pierre Langlois , Quentin Perret , Rick Edgecombe , "Mike Rapoport (IBM)" , Ryan Roberts , Thomas Gleixner , Will Deacon , Matthew Wilcox , Qi Zheng , linux-arm-kernel@lists.infradead.org, x86@kernel.org Subject: [RFC PATCH v4 09/18] arm64: Enable kpkeys Date: Fri, 11 Apr 2025 10:16:22 +0100 Message-ID: <20250411091631.954228-10-kevin.brodsky@arm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20250411091631.954228-1-kevin.brodsky@arm.com> References: <20250411091631.954228-1-kevin.brodsky@arm.com> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 89BAC120012 X-Stat-Signature: 9mexj419ynwje88yxayoz51i6t7jkg68 X-Rspam-User: X-HE-Tag: 1744363054-749702 X-HE-Meta: U2FsdGVkX1/OvpbxKpIePwKPeL+dMb9idCSZe5miw+BZk4UriwviK7iJmcRDFvre7gYCDBd0xPt0Ypjw+shZ8lTSgGlmFZWRl+3D/iFlXZ8k9VJoIGt+eOY8s4UA/tbmE2MMkVncHTmIxRKgw8hOTmTNeyuRi1HzX39MDqRjzQCblM9StIrmfvCdXFY9V8vWcf9V/XyYXBUWEbzsPBvEaUadrwV+aW/Y8NUwwkQw4r52HeWeEJfJmQdF2L6qryHZu1jmax/ukNNE6wEIC5bL9VUUzZQWPWbdaN8o7UhAvH5GpCod1zGh2w/W9wA8ah72jb3KIgqVJprKCI88T9IUhnD2fzrkFkev3YucSbRXqf/sHGUSqN1Yua8ngzMh5HZDUnQgUW206bv9zTsKHCZQ+KM1xikvGDi20joAufJfl0Gb/iPIRV+0huthhbrnUvjGW8vblLKabNwuOWtc0eFkqZ/oAkQ+gvlRF4UX07ddSPdcBasCdeVxosh35EU3E1O6AvBcCbWKPiyjCCZMKmLku7cS7y01rnQVtik/BPMmbdoiEzXp9YaaXcjCr3OcuYWe+2ulph8SIxiQXfoXlQqtO4cBxNZBDhNHASJ287MuNVc8jkdPDs7TVhkrwBKRMYWdP0ln3ASF6tl8kzJk2AVgiKAFSLL1viO+cIpJGoHG8Ys4W5kmMe/mN9JO8d0FsaGzeluaWLlMLcA/PCB7Uxzh12FpGQdzeYIXkHh4uXdXkGJMl9KdrtdiObu7wPmdtB/q+UZpr952wTnf6jU76K25DaW/RQ0r/goJGy9cxEc6vKUIljddBcBwixbkRoGFQe43PCEdAnkXA31YGS4QHlSQwm7MZOnKlJJvWkgS88+maZyCTrR/xiiIOWv2W2cJ9ketAHYzTuNcKbBYU/oP7OKtV6x1cV3uA5xx5+LCy75787FOTk6Dy97vjC39NHuT/2A7R87/rDpKDO+Md5HnY07 urD0ruGk fShe0tY0Qbxd8S4bS18Z+W1tfgsAloTQU9s5/KfUcRC8qYnlQIyb/sDOQDrVQ9bzHUQuyKY4U2URdqWqH6u5kzSrplvCgbMNzsIZp+Jvx82GzMszh99/Rc7zdCAShxsKv1kuXRZmeGuRS2ihVK6WUatUX460XzWjOyruFq+q/bv1QPKL8UDKuwL9qKj2IqglucS/ytN9q/wGrFSPVIM/S1ZHOy4uWE19DZJMGcgyU4psrdF0= 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 to the default value, enabling access to the default pkey/POIndex (0). 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 a182295e6f08..5f81db8134da 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -2198,6 +2198,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 9c4d6d552b25..2043f04c26ef 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -76,6 +76,7 @@ #include #include #include +#include #include #include @@ -2409,8 +2410,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_EL1_INIT, 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