From patchwork Fri Apr 11 09:16:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Brodsky X-Patchwork-Id: 14047902 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 EA8A0C36010 for ; Fri, 11 Apr 2025 09:17:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9E611280199; Fri, 11 Apr 2025 05:17:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9BA2B280190; Fri, 11 Apr 2025 05:17:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8D220280199; Fri, 11 Apr 2025 05:17:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 6FCBF280190 for ; Fri, 11 Apr 2025 05:17:15 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D5E1EC21F1 for ; Fri, 11 Apr 2025 09:17:15 +0000 (UTC) X-FDA: 83321209230.12.CCC840B Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf21.hostedemail.com (Postfix) with ESMTP id 36DCB1C0007 for ; Fri, 11 Apr 2025 09:17:14 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf21.hostedemail.com: domain of kevin.brodsky@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=kevin.brodsky@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744363034; a=rsa-sha256; cv=none; b=L2eEG+CkGPo3k0jrTJ5hF6T3G3AK/GVAiwY1gImuyanwo6LIlU7b6hGMFYNi1jtB/1mU6g aJnNMBmSqbdkmDSEtbPbl9TI0yJPgjsZYHfmnf1f66GzVCNrJg93gA6KkmxhumE9DS8Qb1 CfSsBXnSBJL7lMAg2zTvAuNuuUZUyXE= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf21.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=1744363034; 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=AUz8ih9TJh8rve7uDxN9yr0bb8Udhpj9bSc6wxAckKg=; b=3AKp/0qR7mFPwx0t02UzNDZrRfzfXnlrB07VjaYtqRlF7updCyu+QLK4SfLTJFaFDUST0S 3eEFgXOEAl1bnsbeRCHXln+j9zfGAsDiP7xL/ZSuDHBBsfCEqZwSISz9dWhdoN2KePCfsT 3hGNhag2/cy7CK7YYMdPY8TpyGwEK+I= 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 3F8CD1596; Fri, 11 Apr 2025 02:17:13 -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 AC79A3F6A8; Fri, 11 Apr 2025 02:17:09 -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 04/18] arm64: Introduce por_elx_set_pkey_perms() helper Date: Fri, 11 Apr 2025 10:16:17 +0100 Message-ID: <20250411091631.954228-5-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-Queue-Id: 36DCB1C0007 X-Stat-Signature: ya5ttfuu3fxkieers8icdy33hw86a346 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1744363034-506582 X-HE-Meta: U2FsdGVkX18WCrJnppFFBCVsCb+gS14SaEJN4T5Td7I+jn8lTXYHirofiDzl7GRZ29bNhj6bxB7FDT6KVuEvcPfD5TM3is+M6z8C0Q9bTwgaWsUMHvZaJBJdm+y/VyJ8uhr2zu4YOJY7xbT+50+83xElOd7L48PL0+dVAt0nHTfMOMPyLAxWE9vlM0t/QV1ABvRSgq9NAe2nGyyNWx90+RAyopXcjwKFMVKcGa056eg3sKzuE+SqUe0vgFzMJSFCO+2rjg62KLGdNRU4ujN0sIZbWmGHM55umYOv6pPrrvNNpdAuNj2+mBqzBbfS7NafrlutO+kVb8orSDcxFiCm3FvSozIJrBdJIfCWRyi1QwUbeDl/lw8rAFQjqltZbLrwk+pGMCfScuFv5XXtTsWJ7jbWQi9x2Ry3jN9C8NE9cjA4oAJTInePxI1KypFhq8ADcVHjUBl9V5JsN5eN0Fd1zvH5+hWiTMPeO1AFsPeuMDyO5nTvZDORevmLa1XZDygLrC5UGARfjiK5SBYuzxOgFrCZP/lNg0DQRUVQ46iWtEMheuXUJ9nBncYBUXEFDW8hau426LslPaDHaNPjdFbdQPDsx+1M+kT7Vzo+QEbFAIrqpNBca4YlmKNOHEOhze/UckSsSLZBykKVDeI19HwafzDJIvMS5UNARV1tSne1rboMT+94c7NrTRkuaWtfgOduCs7lHaY20WlD5z46jlhmMKqKTDTfYRlagF0NA8260Xal525dUESG9OmBM6t1bSohVJxwxGEPB01D1Z3CoUrrSv87d1F4P4ERtjbdjAQQ0TrYAdIzRyomuoVtEPf8uLn5T41dvnE26gyzoq4ZCqr+MhBadtRg3pE5L/lt5g3cdXV/gxBqP5AyY84ymAvFezYoFooH1gFbO5wgtdRZNTNLzcsTYuOgI4/4BBk/dFUu+ZpHgGcOMtdJ9gJhr9CHkkZMjQ91mG26DV55w3MX5nB Qma/oSkt fQfKScCAhMrG+v5oOlx/q62GB6raItv7/TUYk4lRF/haPq1wcvLbS6RkqO+W3Dg72paf9HnvxIfqJ/kUggEOgmTvpSfToaonTehkacvqwK2yf3x1daeAV//nWoC6sdeIGVxAPLuXti8CHLSVZ3J5hkAMV/cn63dWrbZPjEKrxceKqF5sFxsVcQnHZmlNcxcwPKaGQvLkbVTl3g4k= 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: Introduce a helper that sets the permissions of a given pkey (POIndex) in the POR_ELx format, and make use of it in arch_set_user_pkey_access(). Signed-off-by: Kevin Brodsky --- arch/arm64/include/asm/por.h | 7 +++++++ arch/arm64/mm/mmu.c | 26 ++++++++++---------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/arch/arm64/include/asm/por.h b/arch/arm64/include/asm/por.h index d913d5b529e4..bffb4d2b1246 100644 --- a/arch/arm64/include/asm/por.h +++ b/arch/arm64/include/asm/por.h @@ -31,4 +31,11 @@ static inline bool por_elx_allows_exec(u64 por, u8 pkey) return perm & POE_X; } +static inline u64 por_elx_set_pkey_perms(u64 por, u8 pkey, u64 perms) +{ + u64 shift = POR_ELx_PERM_SHIFT(pkey); + + return (por & ~(POE_MASK << shift)) | (perms << shift); +} + #endif /* _ASM_ARM64_POR_H */ diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 8fcf59ba39db..89a331e699d2 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -1578,8 +1578,8 @@ void __cpu_replace_ttbr1(pgd_t *pgdp, bool cnp) #ifdef CONFIG_ARCH_HAS_PKEYS int arch_set_user_pkey_access(struct task_struct *tsk, int pkey, unsigned long init_val) { - u64 new_por; - u64 old_por; + u64 new_perms; + u64 por; if (!system_supports_poe()) return -ENOSPC; @@ -1593,25 +1593,19 @@ int arch_set_user_pkey_access(struct task_struct *tsk, int pkey, unsigned long i return -EINVAL; /* Set the bits we need in POR: */ - new_por = POE_RWX; + new_perms = POE_RWX; if (init_val & PKEY_DISABLE_WRITE) - new_por &= ~POE_W; + new_perms &= ~POE_W; if (init_val & PKEY_DISABLE_ACCESS) - new_por &= ~POE_RW; + new_perms &= ~POE_RW; if (init_val & PKEY_DISABLE_READ) - new_por &= ~POE_R; + new_perms &= ~POE_R; if (init_val & PKEY_DISABLE_EXECUTE) - new_por &= ~POE_X; + new_perms &= ~POE_X; - /* Shift the bits in to the correct place in POR for pkey: */ - new_por = POR_ELx_PERM_PREP(pkey, new_por); - - /* Get old POR and mask off any old bits in place: */ - old_por = read_sysreg_s(SYS_POR_EL0); - old_por &= ~(POE_MASK << POR_ELx_PERM_SHIFT(pkey)); - - /* Write old part along with new part: */ - write_sysreg_s(old_por | new_por, SYS_POR_EL0); + por = read_sysreg_s(SYS_POR_EL0); + por = por_elx_set_pkey_perms(por, pkey, new_perms); + write_sysreg_s(por, SYS_POR_EL0); return 0; }