From: Mark Brown <broonie@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@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>,
Szabolcs Nagy <szabolcs.nagy@arm.com>,
linux-arm-kernel@lists.infradead.org,
linux-kselftest@vger.kernel.org, Mark Brown <broonie@kernel.org>
Subject: [PATCH v2 17/21] kselftest/arm64: Teach the generic signal context validation about ZT
Date: Tue, 1 Nov 2022 14:33:32 +0000 [thread overview]
Message-ID: <20221101143336.254445-18-broonie@kernel.org> (raw)
In-Reply-To: <20221101143336.254445-1-broonie@kernel.org>
Add ZT to the set of signal contexts that the shared code understands and
validates the form of.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
.../arm64/signal/testcases/testcases.c | 36 +++++++++++++++++++
.../arm64/signal/testcases/testcases.h | 1 +
2 files changed, 37 insertions(+)
diff --git a/tools/testing/selftests/arm64/signal/testcases/testcases.c b/tools/testing/selftests/arm64/signal/testcases/testcases.c
index e1c625b20ac4..9bee976aff55 100644
--- a/tools/testing/selftests/arm64/signal/testcases/testcases.c
+++ b/tools/testing/selftests/arm64/signal/testcases/testcases.c
@@ -104,6 +104,26 @@ bool validate_za_context(struct za_context *za, char **err)
return true;
}
+bool validate_zt_context(struct zt_context *zt, char **err)
+{
+ if (!zt || !err)
+ return false;
+
+ /* If the context is present there should be at least one register */
+ if (zt->nregs == 0) {
+ *err = "no registers";
+ return false;
+ }
+
+ /* Size should agree with the number of registers */
+ if (zt->head.size != ZT_SIG_CONTEXT_SIZE(zt->nregs)) {
+ *err = "register count does not match size";
+ return false;
+ }
+
+ return true;
+}
+
bool validate_reserved(ucontext_t *uc, size_t resv_sz, char **err)
{
bool terminated = false;
@@ -113,6 +133,7 @@ bool validate_reserved(ucontext_t *uc, size_t resv_sz, char **err)
struct extra_context *extra = NULL;
struct sve_context *sve = NULL;
struct za_context *za = NULL;
+ struct zt_context *zt = NULL;
struct _aarch64_ctx *head =
(struct _aarch64_ctx *)uc->uc_mcontext.__reserved;
void *extra_data = NULL;
@@ -172,6 +193,13 @@ bool validate_reserved(ucontext_t *uc, size_t resv_sz, char **err)
za = (struct za_context *)head;
new_flags |= ZA_CTX;
break;
+ case ZT_MAGIC:
+ if (flags & ZT_CTX)
+ *err = "Multiple ZT_MAGIC";
+ /* Size is validated in validate_za_context() */
+ zt = (struct zt_context *)head;
+ new_flags |= ZT_CTX;
+ break;
case EXTRA_MAGIC:
if (flags & EXTRA_CTX)
*err = "Multiple EXTRA_MAGIC";
@@ -221,6 +249,9 @@ bool validate_reserved(ucontext_t *uc, size_t resv_sz, char **err)
if (new_flags & ZA_CTX)
if (!validate_za_context(za, err))
return false;
+ if (new_flags & ZT_CTX)
+ if (!validate_zt_context(zt, err))
+ return false;
flags |= new_flags;
@@ -232,6 +263,11 @@ bool validate_reserved(ucontext_t *uc, size_t resv_sz, char **err)
return false;
}
+ if (terminated && (flags & ZT_CTX) && !(flags & ZA_CTX)) {
+ *err = "ZT context but no ZA context";
+ return false;
+ }
+
return true;
}
diff --git a/tools/testing/selftests/arm64/signal/testcases/testcases.h b/tools/testing/selftests/arm64/signal/testcases/testcases.h
index 040afded0b76..a08ab0d6207a 100644
--- a/tools/testing/selftests/arm64/signal/testcases/testcases.h
+++ b/tools/testing/selftests/arm64/signal/testcases/testcases.h
@@ -18,6 +18,7 @@
#define SVE_CTX (1 << 1)
#define ZA_CTX (1 << 2)
#define EXTRA_CTX (1 << 3)
+#define ZT_CTX (1 << 4)
#define KSFT_BAD_MAGIC 0xdeadbeef
--
2.30.2
next prev parent reply other threads:[~2022-11-01 14:40 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-01 14:33 [PATCH v2 00/21] arm64/sme: Support SME 2 and SME 2.1 Mark Brown
2022-11-01 14:33 ` [PATCH v2 01/21] arm64/sme: Rename za_state to sme_state Mark Brown
2022-11-01 14:33 ` [PATCH v2 02/21] arm64: Document boot requirements for SME 2 Mark Brown
2022-11-01 14:33 ` [PATCH v2 03/21] arm64/sysreg: Update system registers for SME 2 and 2.1 Mark Brown
2022-11-01 14:33 ` [PATCH v2 04/21] arm64/sme: Document SME 2 and SME 2.1 ABI Mark Brown
2022-11-11 10:17 ` Luis Machado
2022-11-11 10:38 ` Luis Machado
2022-11-11 11:20 ` Mark Brown
2022-11-01 14:33 ` [PATCH v2 05/21] arm64/esr: Document ISS for ZT0 being disabled Mark Brown
2022-11-01 14:33 ` [PATCH v2 06/21] arm64/sme: Manually encode ZT0 load and store instructions Mark Brown
2022-11-01 14:33 ` [PATCH v2 07/21] arm64/sme: Enable host kernel to access ZT0 Mark Brown
2022-11-01 14:33 ` [PATCH v2 08/21] arm64/sme: Add basic enumeration for SME2 Mark Brown
2022-11-01 14:33 ` [PATCH v2 09/21] arm64/sme: Provide storage for ZT0 Mark Brown
2022-11-01 14:33 ` [PATCH v2 10/21] arm64/sme: Implement context switching " Mark Brown
2022-11-01 14:33 ` [PATCH v2 11/21] arm64/sme: Implement signal handling for ZT Mark Brown
2022-11-01 14:33 ` [PATCH v2 12/21] arm64/sme: Implement ZT0 ptrace support Mark Brown
2022-11-11 10:31 ` Luis Machado
2022-11-11 11:25 ` Mark Brown
2022-11-01 14:33 ` [PATCH v2 13/21] arm64/sme: Add hwcaps for SME 2 and 2.1 features Mark Brown
2022-11-01 14:33 ` [PATCH v2 14/21] kselftest/arm64: Add a stress test program for ZT0 Mark Brown
2022-11-01 14:33 ` [PATCH v2 15/21] kselftest/arm64: Cover ZT in the FP stress test Mark Brown
2022-11-01 14:33 ` [PATCH v2 16/21] kselftest/arm64: Enumerate SME2 in the signal test utility code Mark Brown
2022-11-01 14:33 ` Mark Brown [this message]
2022-11-01 14:33 ` [PATCH v2 18/21] kselftest/arm64: Add test coverage for ZT register signal frames Mark Brown
2022-11-01 14:33 ` [PATCH v2 19/21] kselftest/arm64: Add SME2 coverage to syscall-abi Mark Brown
2022-11-01 14:33 ` [PATCH v2 20/21] kselftest/arm64: Add coverage of the ZT ptrace regset Mark Brown
2022-11-01 14:33 ` [PATCH v2 21/21] kselftest/arm64: Add coverage of SME 2 and 2.1 hwcaps 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=20221101143336.254445-18-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=alan.hayward@arm.com \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=luis.machado@arm.com \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.org \
--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