From patchwork Mon Feb 3 10:18:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brodsky X-Patchwork-Id: 13957192 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 D3B17C02192 for ; Mon, 3 Feb 2025 10:20:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 64459280016; Mon, 3 Feb 2025 05:20:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5CDBE280002; Mon, 3 Feb 2025 05:20:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3F7B6280016; Mon, 3 Feb 2025 05:20:42 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 1AC8A280002 for ; Mon, 3 Feb 2025 05:20:42 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BEC631A265A for ; Mon, 3 Feb 2025 10:20:37 +0000 (UTC) X-FDA: 83078239314.29.F9C7725 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf29.hostedemail.com (Postfix) with ESMTP id 38CC1120007 for ; Mon, 3 Feb 2025 10:20:36 +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=1738578036; 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=4DSfztf+YFHh7lJoCiiO7DeGAKOV5B4L4xTaMeERC30=; b=vX2uXWS4op5ebt/3UdF7bkJAM1FGhpfmHX+xPLX2n9viXjHYV0lBUihsBnUbUZQdhUO1Ej Cis/uwEsS0vmyC2bXlPheS04YfdxW8PawLBQ2GbBVBobd8Q1oeArXD/C0ubsBJnfrFckow obmeXbKVFkaMQyejT9ZilbJ/Gq49AU4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738578036; a=rsa-sha256; cv=none; b=PULE+462ISbOcQ/V4UBpv88PmLVadxHyUFjPhwUM9zfeubAWpFU1vzseHEJXV84Qalx68M c+i9OUZo7b6fyBaToNoUjEgsqx2zDDPVObf9vyRGGPyhHZ7fPJCzMOtC/GJ+UBng3Dyvtk HzsMPwpNnvlX95/u3Ta+Nq6qsNEpnYA= 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 EDDA811FB; Mon, 3 Feb 2025 02:20:59 -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 086153F63F; Mon, 3 Feb 2025 02:20:31 -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 14/15] arm64: Enable kpkeys_hardened_pgtables support Date: Mon, 3 Feb 2025 10:18:38 +0000 Message-ID: <20250203101839.1223008-15-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: m6f9p7syu4wg9ahwmixx39qt3fhochsj X-Rspam-User: X-Rspamd-Queue-Id: 38CC1120007 X-Rspamd-Server: rspam03 X-HE-Tag: 1738578036-686802 X-HE-Meta: U2FsdGVkX19gE8F8rX4C2IFycJ1Z50vAoauCvpenjfPMLsC9jCbLvGd4YQa2NqPwMjPKcTQhQfuMAJpBdE/eKUu2yULUtK7lS02QccHc+Aq58pbUFIEq5UI0LoXmr+6n5JHJ7hDwTfaa6XHKHkwcH+NtZZdybRYUud9KdOyotckv8Vh6NfeAtUyWESlP9Mwtax9l1FEWclEsb0xjdCK/aPbB2w2NaIPGz/2c/tNBVtRw99ZE9DbwalCRmVzh9t4YkOKRAKfo6keUQChJOAi1RNWKaWMi8LG390d8Ilv6NcQLDEdD4sKBdPJDpOzfzagToD78zbpwyTUFz8fZvZkFzDbOCpUiO5fTQbhdb/0n6bdlThQ3CqkQ1siRKX4tO4D34XrPceO2nK2tGqYQ10omf+hGo6haAcH74ltTExuLBcAzKcDVU/4H/FSiKHPCU3/T6awAVA56NdQCRPtglyyKcCHQKOo/ejnc5bgSVzQI1Z0YgcBeS/Tz7y1xzQFneX7hYoYSShobhuaGmVSr66E4/MNIC/BN+PbZbYFA66H5b3BfUHmQt7AUszQcIPYCSt3qjnZp40/ru1jgWs/Oo91D6DtwBsHxCBUmcgVlAVUSRVR4Pokxtgedocn4iciYjVqpjB9J5OxGyXV0Zk17coaipN2rRrxn7Svfvs7lYvIe70l6MohD0+XdOT8D5OOZiyRLbQO6HvFi4ra+t1OT+eU8UM8Zi/xt+jyxnhX6UnYGLIbtPcFg8E15NCpYFMEruNccfvm+0fghgK7rW0oIWUk6iMmv350LixOnmUfFvOtFGT+tMVIJz1fObD7yDbcww8xILtWmZ03F7OkWkwHdOgkqXyeKPmBkMPLAWzTj4/XUQJW9pqVgVvLyj7X1GG9M9pNYQt82xhcDHmEygmwuHk2jQDUWJ8bQhAB+azmsbu1zajoKyMNRxiRHXr7/Fx5qEanj/2FJ7PByvWFNMPIgNNj D9Nd5Wd2 JppOQF81ZQVYm6wFZ7+pZ594/kEgAXPO//0rmxl643Fnils1CcWSpbYO7D40cFRGfOV2VIsUN+li+A1V9DmDVKRXV890tAiQ4ZQ8lIK+WEkIBc8vwqBt6m65zS5Q5qScghllsCP3W0oOT8YGk4CpC/rTTwZxwuf0pYidNdoRfv7gKsU9zXKcvPgW+HUNhdAv2lWj7+ora0OojB5JJdUWuM9G2rg1l1AwMiWb2QFQum3QhlS2+O8qBMLTREvWrYAQZY/2xO5utuRPvakGEwFrNjqCB4LRc7uG2HqMy 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: kpkeys_hardened_pgtables should be enabled as early as possible (if selected). It does however require kpkeys being available, which means on arm64 POE being detected and enabled. POE is a boot feature, so calling kpkeys_hardened_pgtables_enable() just after setup_boot_cpu_features() in smp_prepare_boot_cpu() is the best we can do. With that done, all the bits are in place and we can advertise support for kpkeys_hardened_pgtables by selecting ARCH_HAS_KPKEYS_HARDENED_PGTABLES if ARM64_POE is enabled. Signed-off-by: Kevin Brodsky --- arch/arm64/Kconfig | 1 + arch/arm64/kernel/smp.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 34f15348ada8..df26902d385c 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -2187,6 +2187,7 @@ config ARM64_POE select ARCH_USES_HIGH_VMA_FLAGS select ARCH_HAS_PKEYS select ARCH_HAS_KPKEYS + select ARCH_HAS_KPKEYS_HARDENED_PGTABLES 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/smp.c b/arch/arm64/kernel/smp.c index 3b3f6b56e733..074cab55f9db 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -468,6 +469,7 @@ void __init smp_prepare_boot_cpu(void) if (system_uses_irq_prio_masking()) init_gic_priority_masking(); + kpkeys_hardened_pgtables_enable(); kasan_init_hw_tags(); /* Init percpu seeds for random tags after cpus are set up. */ kasan_init_sw_tags();