From: Mark Brown <broonie@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Marc Zyngier <maz@kernel.org>,
Shuah Khan <skhan@linuxfoundation.org>,
Shuah Khan <shuah@kernel.org>
Cc: Alan Hayward <alan.hayward@arm.com>,
Luis Machado <luis.machado@arm.com>,
Salil Akerkar <Salil.Akerkar@arm.com>,
Basant Kumar Dwivedi <Basant.KumarDwivedi@arm.com>,
Szabolcs Nagy <szabolcs.nagy@arm.com>,
James Morse <james.morse@arm.com>,
Alexandru Elisei <alexandru.elisei@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
linux-arm-kernel@lists.infradead.org,
linux-kselftest@vger.kernel.org, kvmarm@lists.cs.columbia.edu,
Mark Brown <broonie@kernel.org>
Subject: [PATCH v12 21/40] arm64/sme: Implement ZA signal handling
Date: Fri, 25 Feb 2022 16:59:04 +0000 [thread overview]
Message-ID: <20220225165923.1474372-22-broonie@kernel.org> (raw)
In-Reply-To: <20220225165923.1474372-1-broonie@kernel.org>
Implement support for ZA in signal handling in a very similar way to how
we implement support for SVE registers, using a signal context structure
with optional register state after it. Where present this register state
stores the ZA matrix as a series of horizontal vectors numbered from 0 to
VL/8 in the endinanness independent format used for vectors.
As with SVE we do not allow changes in the vector length during signal
return but we do allow ZA to be enabled or disabled.
Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
---
arch/arm64/include/uapi/asm/sigcontext.h | 41 +++++++
arch/arm64/kernel/fpsimd.c | 3 -
arch/arm64/kernel/signal.c | 139 +++++++++++++++++++++++
3 files changed, 180 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/include/uapi/asm/sigcontext.h b/arch/arm64/include/uapi/asm/sigcontext.h
index 3a3366d4fbc2..d45bdf2c8b26 100644
--- a/arch/arm64/include/uapi/asm/sigcontext.h
+++ b/arch/arm64/include/uapi/asm/sigcontext.h
@@ -140,6 +140,14 @@ struct sve_context {
#define SVE_SIG_FLAG_SM 0x1 /* Context describes streaming mode */
+#define ZA_MAGIC 0x54366345
+
+struct za_context {
+ struct _aarch64_ctx head;
+ __u16 vl;
+ __u16 __reserved[3];
+};
+
#endif /* !__ASSEMBLY__ */
#include <asm/sve_context.h>
@@ -259,4 +267,37 @@ struct sve_context {
#define SVE_SIG_CONTEXT_SIZE(vq) \
(SVE_SIG_REGS_OFFSET + SVE_SIG_REGS_SIZE(vq))
+/*
+ * If the ZA register is enabled for the thread at signal delivery then,
+ * za_context.head.size >= ZA_SIG_CONTEXT_SIZE(sve_vq_from_vl(za_context.vl))
+ * and the register data may be accessed using the ZA_SIG_*() macros.
+ *
+ * If za_context.head.size < ZA_SIG_CONTEXT_SIZE(sve_vq_from_vl(za_context.vl))
+ * then ZA was not enabled and no register data was included in which case
+ * ZA register was not enabled for the thread and no register data
+ * the ZA_SIG_*() macros should not be used except for this check.
+ *
+ * The same convention applies when returning from a signal: a caller
+ * will need to remove or resize the za_context block if it wants to
+ * enable the ZA register when it was previously non-live or vice-versa.
+ * This may require the caller to allocate fresh memory and/or move other
+ * context blocks in the signal frame.
+ *
+ * Changing the vector length during signal return is not permitted:
+ * za_context.vl must equal the thread's current SME vector length when
+ * doing a sigreturn.
+ */
+
+#define ZA_SIG_REGS_OFFSET \
+ ((sizeof(struct za_context) + (__SVE_VQ_BYTES - 1)) \
+ / __SVE_VQ_BYTES * __SVE_VQ_BYTES)
+
+#define ZA_SIG_REGS_SIZE(vq) ((vq * __SVE_VQ_BYTES) * (vq * __SVE_VQ_BYTES))
+
+#define ZA_SIG_ZAV_OFFSET(vq, n) (ZA_SIG_REGS_OFFSET + \
+ (SVE_SIG_ZREG_SIZE(vq) * n))
+
+#define ZA_SIG_CONTEXT_SIZE(vq) \
+ (ZA_SIG_REGS_OFFSET + ZA_SIG_REGS_SIZE(vq))
+
#endif /* _UAPI__ASM_SIGCONTEXT_H */
diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index fb6a7d97156f..487b616ce380 100644
--- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@ -1175,9 +1175,6 @@ void fpsimd_release_task(struct task_struct *dead_task)
#ifdef CONFIG_ARM64_SME
-/* This will move to uapi/asm/sigcontext.h when signals are implemented */
-#define ZA_SIG_REGS_SIZE(vq) ((vq * __SVE_VQ_BYTES) * (vq * __SVE_VQ_BYTES))
-
/*
* Ensure that task->thread.za_state is allocated and sufficiently large.
*
diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c
index 8931954e7b39..38f4ce3040dc 100644
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@ -57,6 +57,7 @@ struct rt_sigframe_user_layout {
unsigned long fpsimd_offset;
unsigned long esr_offset;
unsigned long sve_offset;
+ unsigned long za_offset;
unsigned long extra_offset;
unsigned long end_offset;
};
@@ -219,6 +220,7 @@ static int restore_fpsimd_context(struct fpsimd_context __user *ctx)
struct user_ctxs {
struct fpsimd_context __user *fpsimd;
struct sve_context __user *sve;
+ struct za_context __user *za;
};
#ifdef CONFIG_ARM64_SVE
@@ -347,6 +349,101 @@ extern int restore_sve_fpsimd_context(struct user_ctxs *user);
#endif /* ! CONFIG_ARM64_SVE */
+#ifdef CONFIG_ARM64_SME
+
+static int preserve_za_context(struct za_context __user *ctx)
+{
+ int err = 0;
+ u16 reserved[ARRAY_SIZE(ctx->__reserved)];
+ unsigned int vl = task_get_sme_vl(current);
+ unsigned int vq;
+
+ if (thread_za_enabled(¤t->thread))
+ vq = sve_vq_from_vl(vl);
+ else
+ vq = 0;
+
+ memset(reserved, 0, sizeof(reserved));
+
+ __put_user_error(ZA_MAGIC, &ctx->head.magic, err);
+ __put_user_error(round_up(ZA_SIG_CONTEXT_SIZE(vq), 16),
+ &ctx->head.size, err);
+ __put_user_error(vl, &ctx->vl, err);
+ BUILD_BUG_ON(sizeof(ctx->__reserved) != sizeof(reserved));
+ err |= __copy_to_user(&ctx->__reserved, reserved, sizeof(reserved));
+
+ if (vq) {
+ /*
+ * This assumes that the ZA state has already been saved to
+ * the task struct by calling the function
+ * fpsimd_signal_preserve_current_state().
+ */
+ err |= __copy_to_user((char __user *)ctx + ZA_SIG_REGS_OFFSET,
+ current->thread.za_state,
+ ZA_SIG_REGS_SIZE(vq));
+ }
+
+ return err ? -EFAULT : 0;
+}
+
+static int restore_za_context(struct user_ctxs __user *user)
+{
+ int err;
+ unsigned int vq;
+ struct za_context za;
+
+ if (__copy_from_user(&za, user->za, sizeof(za)))
+ return -EFAULT;
+
+ if (za.vl != task_get_sme_vl(current))
+ return -EINVAL;
+
+ if (za.head.size <= sizeof(*user->za)) {
+ current->thread.svcr &= ~SYS_SVCR_EL0_ZA_MASK;
+ return 0;
+ }
+
+ vq = sve_vq_from_vl(za.vl);
+
+ if (za.head.size < ZA_SIG_CONTEXT_SIZE(vq))
+ return -EINVAL;
+
+ /*
+ * Careful: we are about __copy_from_user() directly into
+ * thread.za_state with preemption enabled, so protection is
+ * needed to prevent a racing context switch from writing stale
+ * registers back over the new data.
+ */
+
+ fpsimd_flush_task_state(current);
+ /* From now, fpsimd_thread_switch() won't touch thread.sve_state */
+
+ sme_alloc(current);
+ if (!current->thread.za_state) {
+ current->thread.svcr &= ~SYS_SVCR_EL0_ZA_MASK;
+ clear_thread_flag(TIF_SME);
+ return -ENOMEM;
+ }
+
+ err = __copy_from_user(current->thread.za_state,
+ (char __user const *)user->za +
+ ZA_SIG_REGS_OFFSET,
+ ZA_SIG_REGS_SIZE(vq));
+ if (err)
+ return -EFAULT;
+
+ set_thread_flag(TIF_SME);
+ current->thread.svcr |= SYS_SVCR_EL0_ZA_MASK;
+
+ return 0;
+}
+#else /* ! CONFIG_ARM64_SME */
+
+/* Turn any non-optimised out attempts to use these into a link error: */
+extern int preserve_za_context(void __user *ctx);
+extern int restore_za_context(struct user_ctxs *user);
+
+#endif /* ! CONFIG_ARM64_SME */
static int parse_user_sigframe(struct user_ctxs *user,
struct rt_sigframe __user *sf)
@@ -361,6 +458,7 @@ static int parse_user_sigframe(struct user_ctxs *user,
user->fpsimd = NULL;
user->sve = NULL;
+ user->za = NULL;
if (!IS_ALIGNED((unsigned long)base, 16))
goto invalid;
@@ -426,6 +524,19 @@ static int parse_user_sigframe(struct user_ctxs *user,
user->sve = (struct sve_context __user *)head;
break;
+ case ZA_MAGIC:
+ if (!system_supports_sme())
+ goto invalid;
+
+ if (user->za)
+ goto invalid;
+
+ if (size < sizeof(*user->za))
+ goto invalid;
+
+ user->za = (struct za_context __user *)head;
+ break;
+
case EXTRA_MAGIC:
if (have_extra_context)
goto invalid;
@@ -549,6 +660,9 @@ static int restore_sigframe(struct pt_regs *regs,
}
}
+ if (err == 0 && system_supports_sme() && user.za)
+ err = restore_za_context(&user);
+
return err;
}
@@ -629,6 +743,24 @@ static int setup_sigframe_layout(struct rt_sigframe_user_layout *user,
return err;
}
+ if (system_supports_sme()) {
+ unsigned int vl;
+ unsigned int vq = 0;
+
+ if (add_all)
+ vl = sme_max_vl();
+ else
+ vl = task_get_sme_vl(current);
+
+ if (thread_za_enabled(¤t->thread))
+ vq = sve_vq_from_vl(vl);
+
+ err = sigframe_alloc(user, &user->za_offset,
+ ZA_SIG_CONTEXT_SIZE(vq));
+ if (err)
+ return err;
+ }
+
return sigframe_alloc_end(user);
}
@@ -677,6 +809,13 @@ static int setup_sigframe(struct rt_sigframe_user_layout *user,
err |= preserve_sve_context(sve_ctx);
}
+ /* ZA state if present */
+ if (system_supports_sme() && err == 0 && user->za_offset) {
+ struct za_context __user *za_ctx =
+ apply_user_offset(user, user->za_offset);
+ err |= preserve_za_context(za_ctx);
+ }
+
if (err == 0 && user->extra_offset) {
char __user *sfp = (char __user *)user->sigframe;
char __user *userp =
--
2.30.2
next prev parent reply other threads:[~2022-02-25 17:35 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-25 16:58 [PATCH v12 00/40] arm64/sme: Initial support for the Scalable Matrix Extension Mark Brown
2022-02-25 16:58 ` [PATCH v12 01/40] arm64: Define CPACR_EL1_FPEN similarly to other floating point controls Mark Brown
2022-02-25 16:58 ` [PATCH v12 02/40] arm64: Always use individual bits in CPACR floating point enables Mark Brown
2022-02-25 16:58 ` [PATCH v12 03/40] arm64: cpufeature: Always specify and use a field width for capabilities Mark Brown
2022-02-25 16:58 ` [PATCH v12 04/40] kselftest/arm64: Remove local ARRAY_SIZE() definitions Mark Brown
2022-02-25 16:58 ` [PATCH v12 05/40] kselftest/arm64: signal: Allow tests to be incompatible with features Mark Brown
2022-02-25 16:58 ` [PATCH v12 06/40] arm64/sme: Provide ABI documentation for SME Mark Brown
2022-03-02 17:23 ` Catalin Marinas
2022-03-11 17:21 ` Szabolcs Nagy
2022-03-11 18:42 ` Mark Brown
2022-03-31 16:05 ` Szabolcs Nagy
2022-04-06 18:50 ` Mark Brown
2022-04-07 15:26 ` Szabolcs Nagy
2022-06-06 10:35 ` Luis Machado
2022-02-25 16:58 ` [PATCH v12 07/40] arm64/sme: System register and exception syndrome definitions Mark Brown
2022-02-25 16:58 ` [PATCH v12 08/40] arm64/sme: Manually encode SME instructions Mark Brown
2022-03-02 14:35 ` Catalin Marinas
2022-02-25 16:58 ` [PATCH v12 09/40] arm64/sme: Early CPU setup for SME Mark Brown
2022-02-25 16:58 ` [PATCH v12 10/40] arm64/sme: Basic enumeration support Mark Brown
2022-03-02 16:29 ` Catalin Marinas
2022-02-25 16:58 ` [PATCH v12 11/40] arm64/sme: Identify supported SME vector lengths at boot Mark Brown
2022-03-02 16:41 ` Catalin Marinas
2022-03-16 21:32 ` Thiago Jung Bauermann
2022-02-25 16:58 ` [PATCH v12 12/40] arm64/sme: Implement sysctl to set the default vector length Mark Brown
2022-02-25 16:58 ` [PATCH v12 13/40] arm64/sme: Implement vector length configuration prctl()s Mark Brown
2022-02-25 16:58 ` [PATCH v12 14/40] arm64/sme: Implement support for TPIDR2 Mark Brown
2022-02-25 16:58 ` [PATCH v12 15/40] arm64/sme: Implement SVCR context switching Mark Brown
2022-02-25 16:58 ` [PATCH v12 16/40] arm64/sme: Implement streaming SVE " Mark Brown
2022-02-25 16:59 ` [PATCH v12 17/40] arm64/sme: Implement ZA " Mark Brown
2022-02-25 16:59 ` [PATCH v12 18/40] arm64/sme: Implement traps and syscall handling for SME Mark Brown
2022-03-02 17:07 ` Catalin Marinas
2022-02-25 16:59 ` [PATCH v12 19/40] arm64/sme: Disable ZA and streaming mode when handling signals Mark Brown
2022-02-25 16:59 ` [PATCH v12 20/40] arm64/sme: Implement streaming SVE signal handling Mark Brown
2022-03-02 17:09 ` Catalin Marinas
2022-03-16 22:38 ` Thiago Jung Bauermann
2022-02-25 16:59 ` Mark Brown [this message]
2022-02-25 16:59 ` [PATCH v12 22/40] arm64/sme: Implement ptrace support for streaming mode SVE registers Mark Brown
2022-03-02 17:11 ` Catalin Marinas
2022-02-25 16:59 ` [PATCH v12 23/40] arm64/sme: Add ptrace support for ZA Mark Brown
2022-03-15 21:51 ` Thiago Jung Bauermann
2022-02-25 16:59 ` [PATCH v12 24/40] arm64/sme: Disable streaming mode and ZA when flushing CPU state Mark Brown
2022-02-25 16:59 ` [PATCH v12 25/40] arm64/sme: Save and restore streaming mode over EFI runtime calls Mark Brown
2022-02-25 16:59 ` [PATCH v12 26/40] KVM: arm64: Hide SME system registers from guests Mark Brown
2022-02-25 16:59 ` [PATCH v12 27/40] KVM: arm64: Trap SME usage in guest Mark Brown
2022-02-25 16:59 ` [PATCH v12 28/40] KVM: arm64: Handle SME host state when running guests Mark Brown
2022-02-25 16:59 ` [PATCH v12 29/40] arm64/sme: Provide Kconfig for SME Mark Brown
2022-02-25 16:59 ` [PATCH v12 30/40] kselftest/arm64: Add manual encodings for SME instructions Mark Brown
2022-02-25 16:59 ` [PATCH v12 31/40] kselftest/arm64: sme: Add SME support to vlset Mark Brown
2022-02-25 16:59 ` [PATCH v12 32/40] kselftest/arm64: Add tests for TPIDR2 Mark Brown
2022-02-25 16:59 ` [PATCH v12 33/40] kselftest/arm64: Extend vector configuration API tests to cover SME Mark Brown
2022-02-25 16:59 ` [PATCH v12 34/40] kselftest/arm64: sme: Provide streaming mode SVE stress test Mark Brown
2022-02-25 16:59 ` [PATCH v12 35/40] kselftest/arm64: signal: Handle ZA signal context in core code Mark Brown
2022-02-25 16:59 ` [PATCH v12 36/40] kselftest/arm64: Add stress test for SME ZA context switching Mark Brown
2022-02-25 16:59 ` [PATCH v12 37/40] kselftest/arm64: signal: Add SME signal handling tests Mark Brown
2022-02-25 16:59 ` [PATCH v12 38/40] kselftest/arm64: Add streaming SVE to SVE ptrace tests Mark Brown
2022-02-25 16:59 ` [PATCH v12 39/40] kselftest/arm64: Add coverage for the ZA ptrace interface Mark Brown
2022-02-25 16:59 ` [PATCH v12 40/40] kselftest/arm64: Add SME support to syscall ABI test Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220225165923.1474372-22-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=Basant.KumarDwivedi@arm.com \
--cc=Salil.Akerkar@arm.com \
--cc=alan.hayward@arm.com \
--cc=alexandru.elisei@arm.com \
--cc=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=luis.machado@arm.com \
--cc=maz@kernel.org \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=suzuki.poulose@arm.com \
--cc=szabolcs.nagy@arm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).