From patchwork Fri May 3 13:01:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 13652797 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 95EF9C4345F for ; Fri, 3 May 2024 13:02:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 53C2A6B0085; Fri, 3 May 2024 09:02:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 479706B00B0; Fri, 3 May 2024 09:02:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C9916B00AF; Fri, 3 May 2024 09:02:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0590A6B0082 for ; Fri, 3 May 2024 09:02:57 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id ABDA54100B for ; Fri, 3 May 2024 13:02:57 +0000 (UTC) X-FDA: 82077099594.14.FA95906 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf09.hostedemail.com (Postfix) with ESMTP id 0EDB014002E for ; Fri, 3 May 2024 13:02:55 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf09.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714741376; 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=lSYtiCmX6V74+mnj2qi0sxuLVyv7igCTfD+EW0872oI=; b=qQcuTlQm8J5Eq/xXKjoxB34S5o/4VBMMXdp1JvOwDvw+fBjFTwm/Dd3g3jo7if+IJfBQyF 6aJ62/7JDIKjPEjdsmet2ATmT9OTs4GJN7kV0wAMkXwffF/7ZXkIK4Qv9QadzFulOcsETD bGDL78L6TBD/dbBsVkVpXTOQmoFWYJM= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf09.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714741376; a=rsa-sha256; cv=none; b=Z9cM4r6tiDiim6f4ZZPGq5ToiJwBaamXlTJji2SidVgwCgijZnrHjZOoH+Q/rPkdLd1WOu 2qfEMdxJa9StnVbWCcpRlwdYdV1EGpslVXxl11Q3hrKQbuMkUc/QX6knv0W+xWoOv38ceP If4Hg0YCZFYTGmeyPeTq9rMcIGvjADI= 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 7DEFA1756; Fri, 3 May 2024 06:03:20 -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 2BCEA3F73F; Fri, 3 May 2024 06:02:52 -0700 (PDT) From: Joey Gouly To: linux-arm-kernel@lists.infradead.org Cc: akpm@linux-foundation.org, aneesh.kumar@kernel.org, aneesh.kumar@linux.ibm.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, szabolcs.nagy@arm.com, tglx@linutronix.de, will@kernel.org, x86@kernel.org, kvmarm@lists.linux.dev Subject: [PATCH v4 18/29] arm64: add POE signal support Date: Fri, 3 May 2024 14:01:36 +0100 Message-Id: <20240503130147.1154804-19-joey.gouly@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240503130147.1154804-1-joey.gouly@arm.com> References: <20240503130147.1154804-1-joey.gouly@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 0EDB014002E X-Stat-Signature: jerogkrtmftyc8uo5etyi7zz63iu4sw1 X-HE-Tag: 1714741375-965671 X-HE-Meta: U2FsdGVkX18lfu6FOCohQIb5pjKwC1TG2gAcThgZCi5U89eWDtFXGY9wxfC4M4N/jUHfAyvqkdDRG/OEFcMSXiSyMuS/ZozR1AQMbuXcyaOHXfxkGG3gtSYe5QW44bjFXtzZTUqPUWzEo/nbypH94eJf+kmoyk/hzdGNpzMRrLYt/txshSlXsTCaEIVN1/ED9myLozYA4643yT87rB7/KOYZNr+kPk1dyvseDnKdkPjuV/KL56ezGfAzRPHr1u35Mc/YkHDwMeaM8RzIbPT68zWVTdCZoQcAzSSvXgIevWn1n8MFJ8+O0Wgf+iVu4/G7yIvyN2+JVQp+utCU4CS3FRK1chTH1Wi1MUmndTvpHbWhjVZk1RKMFvNIywCyCnWaTxpThYFqT8bHfUZRlX0MAOJ7QnxZvodiV2a8dsNPLd8yNnCqlqVzA0hhuOdCQPFZbB0EewzwIJE0wwMlWhkKROCcHFtWSaIWLl76PujKx+plOYIvRDSR3AGNhGCNdII6RaBWBvGwul1GvISI277UQm+HtuKgq/mOcsRT3yeQj/rARcDEfSGZUWH4X9MfLojKL2K598JiiOSNr2itYhhm08E382eUkkKb0zUJa4q5r/bnMg6nA9L8pc47IA7XUcI7q30ubzV5ZvsQrVFT8YzYrGJC59UxEcgwnHvo/XINzg5/2l3jGCGxRaCbOqgXrkyXX7iOIU34okt6dVNbasgEMc3vOFadjSoPM/FyKP5SLA0gO+8B0Am+19XhkPAyOnR3d3Qrqkej9ZA/4ZVAPtTsZVG+zGwRO0jJgOgOAy50cIkDRXRYyL0iiuC7i5dZdPuPxL65IPy8ob/51QlYfS+cw+c2c0AK7brl134QVrdeYJAI0/wIL+/5mdiTcfbvCUAprhkJ6SAUAuddEmQGXkDp8NSqrn5yYvPs/JXFNP6EbKH3jLu35X38cU7pb8o522CAvn5KMv4aQA4WLRIlBVq LWH8V/DF apkrZ85QVgmCtKz4tD+Q2BBRU8ZBWfMQeY9w84t9QbTGUqHEp3z8TCvPheXR0+GCx/GVjfozGzQPdZwRQ+kb0FbgT9+1LTOqv6Rgk6mGxNaIRy34iPmM9TIYENK4FItPxxDXcVJgo5bwANw+krHDe/wfiJncvnbqxaFQnRlvD4alMUcWBEei69TNW94PEKsCW19IqO4oeLsdWkcM0J0w0MnTbnA== 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 --- arch/arm64/include/uapi/asm/sigcontext.h | 7 ++++ arch/arm64/kernel/signal.c | 52 ++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/arch/arm64/include/uapi/asm/sigcontext.h b/arch/arm64/include/uapi/asm/sigcontext.h index 8a45b7a411e0..e4cba8a6c9a2 100644 --- a/arch/arm64/include/uapi/asm/sigcontext.h +++ b/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 a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c index 4a77f4976e11..077436a8bc10 100644 --- a/arch/arm64/kernel/signal.c +++ b/arch/arm64/kernel/signal.c @@ -63,6 +63,7 @@ struct rt_sigframe_user_layout { unsigned long fpmr_offset; unsigned long extra_offset; unsigned long end_offset; + unsigned long poe_offset; }; #define BASE_SIGFRAME_SIZE round_up(sizeof(struct rt_sigframe), 16) @@ -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,21 @@ static int restore_fpmr_context(struct user_ctxs *user) 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 +639,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 +690,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 +887,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 +1013,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); } @@ -1020,6 +1060,15 @@ static int setup_sigframe(struct rt_sigframe_user_layout *user, __put_user_error(current->thread.fault_code, &esr_ctx->esr, err); } + if (system_supports_poe() && err == 0 && user->poe_offset) { + struct poe_context __user *poe_ctx = + apply_user_offset(user, user->poe_offset); + + __put_user_error(POE_MAGIC, &poe_ctx->head.magic, err); + __put_user_error(sizeof(*poe_ctx), &poe_ctx->head.size, err); + __put_user_error(read_sysreg_s(SYS_POR_EL0), &poe_ctx->por_el0, err); + } + /* Scalable Vector Extension state (including streaming), if present */ if ((system_supports_sve() || system_supports_sme()) && err == 0 && user->sve_offset) { @@ -1178,6 +1227,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