From patchwork Thu Aug 22 15:11:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 13773689 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 2AA9CC3DA4A for ; Thu, 22 Aug 2024 15:12:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A0C1B6B031A; Thu, 22 Aug 2024 11:12:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9BB8E6B031B; Thu, 22 Aug 2024 11:12:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 80E586B031C; Thu, 22 Aug 2024 11:12:49 -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 5C1C26B031A for ; Thu, 22 Aug 2024 11:12:49 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 178A881474 for ; Thu, 22 Aug 2024 15:12:49 +0000 (UTC) X-FDA: 82480223658.21.D8C9F14 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf17.hostedemail.com (Postfix) with ESMTP id 49FE040015 for ; Thu, 22 Aug 2024 15:12:47 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@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=1724339486; 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=yS/wr3Kaj/+ao73MTWL/k678y347e9kidUJfkehZp8w=; b=XZRu+GsJSkxnzXyAPYKujmWQirhHM4FKC303GlmnUYVI4rJ/aHoURR7wZSAnIw5zU/wU1/ uUD4bAEGsJRnB97uTDaah55kMhJiWg40+5s+4+hlDBPo1Neqi6TcuHJeVTQgJrb/LeBhgt Txc9ex1X6pD2MX6ox38YKEjfECFAlYw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724339486; a=rsa-sha256; cv=none; b=qIIn2ujPRMd3G0cGqHBdqG4w8DYULfgJ0Ew3sV2xpuqnpC5pYKJknFV0TbL50/8Rd05ViG yWy+zmIJI1no+XREmthS2QRF3cbeNZL1ybkyT/BS2vo8u6oydl/F4bgjfNkcqMdo5VkBBj yTvQwwH5hLa2sj0mXAmJ0oAWVX+As3Q= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@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 915F41576; Thu, 22 Aug 2024 08:13:12 -0700 (PDT) Received: from e124191.cambridge.arm.com (e124191.cambridge.arm.com [10.1.197.45]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 722AE3F58B; Thu, 22 Aug 2024 08:12:42 -0700 (PDT) From: Joey Gouly To: linux-arm-kernel@lists.infradead.org Cc: nd@arm.com, akpm@linux-foundation.org, aneesh.kumar@kernel.org, aneesh.kumar@linux.ibm.com, anshuman.khandual@arm.com, bp@alien8.de, broonie@kernel.org, catalin.marinas@arm.com, christophe.leroy@csgroup.eu, dave.hansen@linux.intel.com, hpa@zytor.com, joey.gouly@arm.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, maz@kernel.org, mingo@redhat.com, mpe@ellerman.id.au, naveen.n.rao@linux.ibm.com, npiggin@gmail.com, oliver.upton@linux.dev, shuah@kernel.org, skhan@linuxfoundation.org, szabolcs.nagy@arm.com, tglx@linutronix.de, will@kernel.org, x86@kernel.org, kvmarm@lists.linux.dev, linux-kselftest@vger.kernel.org Subject: [PATCH v5 19/30] arm64: add POE signal support Date: Thu, 22 Aug 2024 16:11:02 +0100 Message-Id: <20240822151113.1479789-20-joey.gouly@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240822151113.1479789-1-joey.gouly@arm.com> References: <20240822151113.1479789-1-joey.gouly@arm.com> MIME-Version: 1.0 X-Stat-Signature: 43f7qn1c5em8qzpew91n5cmymihjzejg X-Rspamd-Queue-Id: 49FE040015 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1724339567-687306 X-HE-Meta: U2FsdGVkX19nKNe1JEBBAYgTef6VjbgqTd6VRY58OqTKM7cH4vTlEG7G3hMj3EClM1XmAcuQJce2eLoYzFN5rJYHGWb8N745wWSgZZxUsKAUIouhFAWMkCdHHgI160Fxjrp6s1wmNsqd3LasEXOh/3YvqrBrPQMCtGc43X7Kyh72HOZKliA0VdSGIstlP3T8lAvsWiNWaM4RvTxm+y1TLbJtPjbg96imIryw3W681MLVsIogl9n9BF0KWRIVgU/NMku4vQTlWynmn2obf2on8jdNKDfGQkm/VbBBOPULpBtxyPbnhZXCWc3mEGueq30eejsNU9/mYDLmgtevVme29Ow1w4fCwiLmmhjrQzTri9FlXlOSW8h8w/Ri47/0I2IuLgnZ98QtBzGbQ5djS9tJ+mTLN2ttfjds15WC/zgTMHO2Ub4IPnCtHeINgB+PmXmwDzwugNps07j+djSQNLdWMYV0QuSkQFUZvN/geVoX4714EOy46pOBEu8CcS1Rbf+gQIQijWgzcB5xirbvok3c1sQVe5RAOmfFYWvLX0ktJTvFhIVvZ+kIJn+uwAS9BDc99NUZmXCMBmAPJiAfXqY7Xasjeg7+R+3mlRB96BWdmnlPoeTP8KFW+7gnSkONqp6Ug4vbiKcGfCD4GkuQahA8YS9MdPOGcCGWwflXhQNGTX0X6GJcA8ypyPMxYdvDZw4+Vjpb3MLQccwxElp+ExXybjUNfJrrvRCans9o4ePTpFjfJz9sdN6Z+ufxID+yZRD9Z3G1c7SJ5H9G2hg3Ovljznb0K5IYdfAH32mKbfTVZKNa0b4kQD71TgnBPszVHqLjmDoiw2aKSZrPamCDur919AFZltugJDW++KoTNBHCwcO4Xyg7e2TVlr9XyNu3OBRYreX6jWjfYdQoNCmYWRF4pgp657CoRMlGTUIry6wzJuhghX7iTxhbNjtNTYEje7secHJGho//SEIDqasp5Xz pLKskDPu lF8mZA7/tyQnovCMdZCpkce8uI0FpUiw5umX9K7Ljw5WafRvgJrsvaIuVy4OUy945OmI85gK4esgIn9YwC1fb6hL6CuVCEKvUBpNgP5b7Y5IqdSCOO9Jmq9ubuLdKWUMLhJpY7J2YJpZvDU+UPnwpoPBczPl1wYUedAyPfG3t9ram8gSzGHMIbwNtr1kNVRgNAvjNzzLb5EOebMpqLjClFYi6nw== 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: Add PKEY support to signals, by saving and restoring POR_EL0 from the stackframe. Signed-off-by: Joey Gouly Cc: Catalin Marinas Cc: Will Deacon Reviewed-by: Mark Brown Acked-by: Szabolcs Nagy Reviewed-by: Catalin Marinas Reviewed-by: Anshuman Khandual --- arch/arm64/include/uapi/asm/sigcontext.h | 7 +++ arch/arm64/kernel/signal.c | 62 ++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git arch/arm64/include/uapi/asm/sigcontext.h arch/arm64/include/uapi/asm/sigcontext.h index 8a45b7a411e0..e4cba8a6c9a2 100644 --- arch/arm64/include/uapi/asm/sigcontext.h +++ arch/arm64/include/uapi/asm/sigcontext.h @@ -98,6 +98,13 @@ struct esr_context { __u64 esr; }; +#define POE_MAGIC 0x504f4530 + +struct poe_context { + struct _aarch64_ctx head; + __u64 por_el0; +}; + /* * extra_context: describes extra space in the signal frame for * additional structures that don't fit in sigcontext.__reserved[]. diff --git arch/arm64/kernel/signal.c arch/arm64/kernel/signal.c index 4a77f4976e11..561986947530 100644 --- arch/arm64/kernel/signal.c +++ arch/arm64/kernel/signal.c @@ -61,6 +61,7 @@ struct rt_sigframe_user_layout { unsigned long za_offset; unsigned long zt_offset; unsigned long fpmr_offset; + unsigned long poe_offset; unsigned long extra_offset; unsigned long end_offset; }; @@ -185,6 +186,8 @@ struct user_ctxs { u32 zt_size; struct fpmr_context __user *fpmr; u32 fpmr_size; + struct poe_context __user *poe; + u32 poe_size; }; static int preserve_fpsimd_context(struct fpsimd_context __user *ctx) @@ -258,6 +261,32 @@ static int restore_fpmr_context(struct user_ctxs *user) return err; } +static int preserve_poe_context(struct poe_context __user *ctx) +{ + int err = 0; + + __put_user_error(POE_MAGIC, &ctx->head.magic, err); + __put_user_error(sizeof(*ctx), &ctx->head.size, err); + __put_user_error(read_sysreg_s(SYS_POR_EL0), &ctx->por_el0, err); + + return err; +} + +static int restore_poe_context(struct user_ctxs *user) +{ + u64 por_el0; + int err = 0; + + if (user->poe_size != sizeof(*user->poe)) + return -EINVAL; + + __get_user_error(por_el0, &(user->poe->por_el0), err); + if (!err) + write_sysreg_s(por_el0, SYS_POR_EL0); + + return err; +} + #ifdef CONFIG_ARM64_SVE static int preserve_sve_context(struct sve_context __user *ctx) @@ -621,6 +650,7 @@ static int parse_user_sigframe(struct user_ctxs *user, user->za = NULL; user->zt = NULL; user->fpmr = NULL; + user->poe = NULL; if (!IS_ALIGNED((unsigned long)base, 16)) goto invalid; @@ -671,6 +701,17 @@ static int parse_user_sigframe(struct user_ctxs *user, /* ignore */ break; + case POE_MAGIC: + if (!system_supports_poe()) + goto invalid; + + if (user->poe) + goto invalid; + + user->poe = (struct poe_context __user *)head; + user->poe_size = size; + break; + case SVE_MAGIC: if (!system_supports_sve() && !system_supports_sme()) goto invalid; @@ -857,6 +898,9 @@ static int restore_sigframe(struct pt_regs *regs, if (err == 0 && system_supports_sme2() && user.zt) err = restore_zt_context(&user); + if (err == 0 && system_supports_poe() && user.poe) + err = restore_poe_context(&user); + return err; } @@ -980,6 +1024,13 @@ static int setup_sigframe_layout(struct rt_sigframe_user_layout *user, return err; } + if (system_supports_poe()) { + err = sigframe_alloc(user, &user->poe_offset, + sizeof(struct poe_context)); + if (err) + return err; + } + return sigframe_alloc_end(user); } @@ -1042,6 +1093,14 @@ static int setup_sigframe(struct rt_sigframe_user_layout *user, err |= preserve_fpmr_context(fpmr_ctx); } + if (system_supports_poe() && err == 0 && user->poe_offset) { + struct poe_context __user *poe_ctx = + apply_user_offset(user, user->poe_offset); + + err |= preserve_poe_context(poe_ctx); + } + + /* ZA state if present */ if (system_supports_sme() && err == 0 && user->za_offset) { struct za_context __user *za_ctx = @@ -1178,6 +1237,9 @@ static void setup_return(struct pt_regs *regs, struct k_sigaction *ka, sme_smstop(); } + if (system_supports_poe()) + write_sysreg_s(POR_EL0_INIT, SYS_POR_EL0); + if (ka->sa.sa_flags & SA_RESTORER) sigtramp = ka->sa.sa_restorer; else