From patchwork Mon Feb 3 10:18:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brodsky X-Patchwork-Id: 13957198 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 580DCC02192 for ; Mon, 3 Feb 2025 10:22:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E828A280016; Mon, 3 Feb 2025 05:22:12 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E09AD280015; Mon, 3 Feb 2025 05:22:12 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C849A280016; Mon, 3 Feb 2025 05:22:12 -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 9B5F2280015 for ; Mon, 3 Feb 2025 05:22:12 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 47CFA82572 for ; Mon, 3 Feb 2025 10:20:07 +0000 (UTC) X-FDA: 83078238054.08.E8C1736 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf19.hostedemail.com (Postfix) with ESMTP id A54C71A0004 for ; Mon, 3 Feb 2025 10:20:05 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; spf=pass (imf19.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=1738578005; 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=oHokXrrIxgFozOdPdKGv7pm7boYyoVv2BPENAFW6e/0=; b=JSTNNFOMZYk5krifUTB5mrek8+MfTHWKqiR/CXU6kBSt2QRH7WF3c85UK1qvwQRVTF4SDV t8giKzCuAvrt1JN79TpcrffXdTFYcmUDCHmFRSqwHs8YJonmcSFPTbuDxN8UQgZH4TvUC5 zr7EID7I59ZxOEmbOOLwf0QyuSaM5X0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738578005; a=rsa-sha256; cv=none; b=jbocxVqDas5oOVUAZZmmgLtHl6Q5efc4TdyMWK1DsoskoknqdQXY3LXk7WOLN8cneFnwEc 6qCMGAIGSClKuocUmIqE8ruzhhx9XA8LLszEWTbzqQSo4xnLNAFE9onHnV6cjIqKi2OEox vZBt8q6kbHPwhHp5ch9ieUHJyZEI62M= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; spf=pass (imf19.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 66BB711FB; Mon, 3 Feb 2025 02:20:29 -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 74BCD3F63F; Mon, 3 Feb 2025 02:20:01 -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 06/15] arm64: set_memory: Implement set_memory_pkey() Date: Mon, 3 Feb 2025 10:18:30 +0000 Message-ID: <20250203101839.1223008-7-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: k4uajsgm5nxzzj84qiwbpzu1c5kttxrj X-Rspamd-Queue-Id: A54C71A0004 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1738578005-468914 X-HE-Meta: U2FsdGVkX1+3vzfQp5whxWA63f/Bb2wNJA1qahpzDYdYoJAcAR7NpudL/NLwXzhwdgDSOqLa/4XO3y0RSYx0ugCuBZHPAKTzqnNkEUUvWD7gJQRBm5aJZNyeh4jS2FRset64nD99pFFAbR1wVGXf1OM/YGsXIgIFN6w2SIHRhnz6MZkrq38JVSc0Nx8EY7j0qjPHHg6ldx3YRJ+Qa7wquVMNCmin3xqcnRn0QTD1Xe6R5ejg5dd6rmN5zzoPKWHRt4so5xNVZCkZ9kWIkTkhXkK54Z35Pkkdl3cVhR68dNCs49QyGLx1ObDXmDlDOKTmEkd4rET2XHBc1njfieaAzjSRaAutpsrBujjkdQUZyRM8ZLE34X4i3LOdKrdKt6rFK1lgqyxKTXIJjCattnriAs1SqWFW//FDEg+toWzA5R/O2KEILPKn7dyuFkOXMm0Tm5YCq5VlBqJpsca10PypU6I0vaZAEJH2mIWfe9bbBANWNSBzC5csYFcjdfVJduOILHwv1g7nNFXBeBaOxDl8fznQMMldxMlCiXs3iTrGkbyjD96p0/C90DGomN4hfobYa+qb82VEItYI1dbO9WkxW4xCy6TqgegDSbIc3fNL1ynb1Q01vVa/m/HloGatch8sRaTsliEFVmLNHeEkH/4FJz3PBp5MSHo46c3QjijgCszwBqEKL9Tmd38lFdPxh9SPuSox6dm6Ho2nrnNr7HAQlOQvIVX5Y1u7Vz02ymh0FEO6kHyzser3/svbSLdZoi6yuSX4erD1psTcrRdti2TH0mp09u6kcak7HhuxgC5hH1Z57JD4Enq78jaqoSMllqwiD26IwNvs4ARRgYzw+bMdZgrvqnSa9NZBl2LFReuUIfepe3tt0Ze9kNZln1HH6MZPwIcIYc1cersFoJCfphulcNJ0sJWpidFYKdYgkGBvi5S+FOu/lhubfSiMZQ+LFBvEiV3gc1KrVJL4dPT6Fph phV1ZXD+ gBl71PJsdts+oVOtihTw/ZFyurU2GLQ1QyB08dE4U5Hx0FVgCRHiBZ5JwnZmchD3Md8CBzW+gyHcSmZZXUkSsREJuLBXoa+7iWY9Dz2nnKotdWpXz3gFw9lygYGN6paAmCh8/XaHuymXfCUPhjqes959Osi4Xc4rm00kX2uR/U/VCRLYbBKXo09KYDbItDoVMjTmfqNF16tgjbmlB7SKj7QUcrahhQGhRNsDxPOnNCw47FHA= 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: Implement set_memory_pkey() using POE if supported. Signed-off-by: Kevin Brodsky --- arch/arm64/include/asm/set_memory.h | 4 ++++ arch/arm64/mm/pageattr.c | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/arch/arm64/include/asm/set_memory.h b/arch/arm64/include/asm/set_memory.h index 90f61b17275e..b6cd6de34abf 100644 --- a/arch/arm64/include/asm/set_memory.h +++ b/arch/arm64/include/asm/set_memory.h @@ -19,4 +19,8 @@ bool kernel_page_present(struct page *page); int set_memory_encrypted(unsigned long addr, int numpages); int set_memory_decrypted(unsigned long addr, int numpages); +#ifdef CONFIG_ARCH_HAS_KPKEYS +int set_memory_pkey(unsigned long addr, int numpages, int pkey); +#endif + #endif /* _ASM_ARM64_SET_MEMORY_H */ diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c index 39fd1f7ff02a..9721a74adbe2 100644 --- a/arch/arm64/mm/pageattr.c +++ b/arch/arm64/mm/pageattr.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -292,6 +293,30 @@ int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid) return set_memory_valid(addr, nr, valid); } +#ifdef CONFIG_ARCH_HAS_KPKEYS +int set_memory_pkey(unsigned long addr, int numpages, int pkey) +{ + unsigned long set_prot = 0; + + if (!system_supports_poe()) + return 0; + + if (!__is_lm_address(addr)) + return -EINVAL; + + if (pkey >= arch_max_pkey()) + return -EINVAL; + + set_prot |= pkey & BIT(0) ? PTE_PO_IDX_0 : 0; + set_prot |= pkey & BIT(1) ? PTE_PO_IDX_1 : 0; + set_prot |= pkey & BIT(2) ? PTE_PO_IDX_2 : 0; + + return __change_memory_common(addr, PAGE_SIZE * numpages, + __pgprot(set_prot), + __pgprot(PTE_PO_IDX_MASK)); +} +#endif + #ifdef CONFIG_DEBUG_PAGEALLOC /* * This is - apart from the return value - doing the same