Skip to contentSkip to conversation

Add specification exception tests

PATCH Superseded Janis Schoetterl-Glausch 3 participants 10 messages Aug 26, 2022 – Sep 26, 2022

Subsystems (2)

v6 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

v6 cover Add specification exception tests

Test that specification exceptions cause the correct interruption code during both normal and transactional execution.

TCG fails the tests setting an invalid PSW bit.
I had a look at how best to fix it, but where best to check for early PSW exceptions was not immediately clear to me. Ideas welcome.

v5 -> b6
rebased onto master
comments and style changes

v4 -> v5
add lpsw with invalid bit 12 test
TCG fails as with lpswe but must also invert bit 12
update copyright statement
add comments
cleanups and style fixes

v3 -> v4
remove iterations argument in order to simplify the code
for manual performance testing adding a for loop is easy
move report out of fixup_invalid_psw simplify/improve readability of triggers
use positive error values

v2 -> v3
remove non-ascii symbol
clean up load_psw
fix nits

v1 -> v2
Add license and test description
Split test patch into normal test and transactional execution test Add comments to
invalid PSW fixup function
with_transaction
Rename some variables/functions
Pass mask as single parameter to asm
Get rid of report_info_if macro
Introduce report_pass/fail and use them

Janis Schoetterl-Glausch (2):
s390x: Add specification exception test
s390x: Test specification exceptions during transaction

 s390x/Makefile           |   1 +
 lib/s390x/asm/arch_def.h |   6 +
 s390x/spec_ex.c          | 383 +++++++++++++++++++++++++++++++++++++++
 s390x/unittests.cfg      |   3 +
 4 files changed, 393 insertions(+)
 create mode 100644 s390x/spec_ex.c

Range-diff against v5:
1: fd9780d8 ! 1: bbfb5d40 s390x: Add specification exception test

    @@ lib/s390x/asm/arch_def.h: struct psw {
     +	uint32_t	addr;
     +};
     +
    - #define AS_PRIM				0
    - #define AS_ACCR				1
    - #define AS_SECN				2
    + struct cpu {
    + 	struct lowcore *lowcore;
    + 	uint64_t *stack;
     
      ## s390x/spec_ex.c (new) ##
     @@
    @@ s390x/spec_ex.c (new)
     + */
     +#include <stdlib.h>
     +#include <libcflat.h>
    ++#include <bitops.h>
     +#include <asm/interrupt.h>
     +
    ++/* toggled to signal occurrence of invalid psw fixup */
     +static bool invalid_psw_expected;
     +static struct psw expected_psw;
     +static struct psw invalid_psw;
    @@ s390x/spec_ex.c (new)
     + * find the instruction following the faulting one from the old PSW.
     + * The PSW to return to is set by load_psw.
     + */
    -+static void fixup_invalid_psw(void)
    ++static void fixup_invalid_psw(struct stack_frame_int *stack)
     +{
     +	/* signal occurrence of invalid psw fixup */
     +	invalid_psw_expected = false;
    @@ s390x/spec_ex.c (new)
     +{
     +	uint64_t scratch;
     +
    ++	/*
    ++	 * The fixup psw is current psw with the instruction address replaced by
    ++	 * the address of the nop following the instruction loading the new psw.
    ++	 */
     +	fixup_psw.mask = extract_psw_mask();
     +	asm volatile ( "larl	%[scratch],0f\n"
    -+		"	stg	%[scratch],%[addr]\n"
    ++		"	stg	%[scratch],%[fixup_addr]\n"
     +		"	lpswe	%[psw]\n"
     +		"0:	nop\n"
    -+		: [scratch] "=&d"(scratch),
    -+		  [addr] "=&T"(fixup_psw.addr)
    -+		: [psw] "Q"(psw)
    ++		: [scratch] "=&d" (scratch),
    ++		  [fixup_addr] "=&T" (fixup_psw.addr)
    ++		: [psw] "Q" (psw)
     +		: "cc", "memory"
     +	);
     +}
    @@ s390x/spec_ex.c (new)
     +
     +	fixup_psw.mask = extract_psw_mask();
     +	asm volatile ( "larl	%[scratch],0f\n"
    -+		"	stg	%[scratch],%[addr]\n"
    ++		"	stg	%[scratch],%[fixup_addr]\n"
     +		"	lpsw	%[psw]\n"
     +		"0:	nop\n"
    -+		: [scratch] "=&d"(scratch),
    -+		  [addr] "=&T"(fixup_psw.addr)
    -+		: [psw] "Q"(psw)
    ++		: [scratch] "=&d" (scratch),
    ++		  [fixup_addr] "=&T" (fixup_psw.addr)
    ++		: [psw] "Q" (psw)
     +		: "cc", "memory"
     +	);
     +}
    @@ s390x/spec_ex.c (new)
     +
     +static int check_invalid_psw(void)
     +{
    -+	/* toggled to signal occurrence of invalid psw fixup */
     +	if (!invalid_psw_expected) {
     +		if (expected_psw.mask == invalid_psw.mask &&
     +		    expected_psw.addr == invalid_psw.addr)
    @@ s390x/spec_ex.c (new)
     +	return 1;
     +}
     +
    ++/* For normal PSWs bit 12 has to be 0 to be a valid PSW*/
     +static int psw_bit_12_is_1(void)
     +{
    -+	struct psw invalid = { .mask = 0x0008000000000000, .addr = 0x00000000deadbeee};
    ++	struct psw invalid = {
    ++		.mask = BIT(63 - 12),
    ++		.addr = 0x00000000deadbeee
    ++	};
     +
     +	expect_invalid_psw(invalid);
     +	load_psw(invalid);
     +	return check_invalid_psw();
     +}
     +
    ++/* A short PSW needs to have bit 12 set to be valid. */
     +static int short_psw_bit_12_is_0(void)
     +{
    -+	struct short_psw short_invalid = { .mask = 0x00000000, .addr = 0xdeadbeee};
    ++	struct short_psw short_invalid = {
    ++		.mask = 0x0,
    ++		.addr = 0xdeadbeee
    ++	};
     +
     +	/*
     +	 * lpsw may optionally check bit 12 before loading the new psw
    @@ s390x/spec_ex.c (new)
     +	uint32_t words[5] __attribute__((aligned(16)));
     +	uint32_t (*bad_aligned)[4] = (uint32_t (*)[4])&words[1];
     +
    ++	/* LOAD PAIR FROM QUADWORD (LPQ) requires quadword alignment */
     +	asm volatile ("lpq %%r6,%[bad]"
    -+		      : : [bad] "T"(*bad_aligned)
    ++		      : : [bad] "T" (*bad_aligned)
     +		      : "%r6", "%r7"
     +	);
     +	return 0;
    @@ s390x/spec_ex.c (new)
     +	uint64_t quad[2] __attribute__((aligned(16))) = {0};
     +
     +	asm volatile (".insn	rxy,0xe3000000008f,%%r7,%[quad]" /* lpq %%r7,%[quad] */
    -+		      : : [quad] "T"(quad)
    ++		      : : [quad] "T" (quad)
     +		      : "%r7", "%r8"
     +	);
     +	return 0;
    @@ s390x/spec_ex.c (new)
     +struct spec_ex_trigger {
     +	const char *name;
     +	int (*func)(void);
    -+	void (*fixup)(void);
    ++	void (*fixup)(struct stack_frame_int *stack);
     +};
     +
     +/* List of all tests to execute */
2:  c14092a3 ! 2:  0f19be7d s390x: Test specification exceptions during transaction
    @@ Commit message
         Signed-off-by: Janis Schoetterl-Glausch <[email protected]>
     
      ## lib/s390x/asm/arch_def.h ##
    -@@ lib/s390x/asm/arch_def.h: struct short_psw {
    +@@ lib/s390x/asm/arch_def.h: struct cpu {
      #define PSW_MASK_BA			0x0000000080000000UL
      #define PSW_MASK_64			(PSW_MASK_BA | PSW_MASK_EA)
      
    @@ s390x/spec_ex.c
      #include <stdlib.h>
     +#include <htmintrin.h>
      #include <libcflat.h>
    + #include <bitops.h>
     +#include <asm/barrier.h>
      #include <asm/interrupt.h>
     +#include <asm/facility.h>
      
    + /* toggled to signal occurrence of invalid psw fixup */
      static bool invalid_psw_expected;
    - static struct psw expected_psw;
     @@ s390x/spec_ex.c: static int not_even(void)
      /*
       * Harness for specification exception testing.
    @@ s390x/spec_ex.c: static int not_even(void)
      	const char *name;
      	int (*func)(void);
     +	bool transactable;
    - 	void (*fixup)(void);
    + 	void (*fixup)(struct stack_frame_int *stack);
      };
      
      /* List of all tests to execute */

base-commit: 7362976db651a2142ec64b5cea2029ab77a5b157

Signature · 1 line
2.36.1
#1 lore raw

PATCH v6 1/2 s390x: Add specification exception test

Generate specification exceptions and check that they occur.

---
 s390x/Makefile           |   1 +
 lib/s390x/asm/arch_def.h |   5 +
 s390x/spec_ex.c          | 194 +++++++++++++++++++++++++++++++++++++++
 s390x/unittests.cfg      |   3 +
 4 files changed, 203 insertions(+)
 create mode 100644 s390x/spec_ex.c
s390x/Makefile +1 -0
index efd5e0c1..58b1bf54 100644
@@ -27,6 +27,7 @@ tests += $(TEST_DIR)/uv-host.elf
 tests += $(TEST_DIR)/edat.elf
 tests += $(TEST_DIR)/mvpg-sie.elf
 tests += $(TEST_DIR)/spec_ex-sie.elf
+tests += $(TEST_DIR)/spec_ex.elf
 tests += $(TEST_DIR)/firq.elf
 tests += $(TEST_DIR)/epsw.elf
 tests += $(TEST_DIR)/adtl-status.elf
lib/s390x/asm/arch_def.h +5 -0
index e7ae454b..b6e60fb0 100644
@@ -41,6 +41,11 @@ struct psw {
 	uint64_t	addr;
 };
 
+struct short_psw {
+	uint32_t	mask;
+	uint32_t	addr;
+};
+
 struct cpu {
 	struct lowcore *lowcore;
 	uint64_t *stack;
s390x/spec_ex.c new file +194 -0

194 lines not on this page · raw message

s390x/unittests.cfg +3 -0
index f7b1fc3d..2ecaee1f 100644
@@ -114,6 +114,9 @@ file = mvpg-sie.elf
 [spec_ex-sie]
 file = spec_ex-sie.elf
 
+[spec_ex]
+file = spec_ex.elf
+
 [firq-linear-cpu-ids-kvm]
 file = firq.elf
 timeout = 20
Signature · 1 line
2.36.1
Reviewed-by on v6 1/2
#2 lore raw

Re: [kvm-unit-tests PATCH v6 1/2] s390x: Add specification exception test

Quoting Janis Schoetterl-Glausch (2022-08-26 18:11:11)

Quoted 3 lines

Generate specification exceptions and check that they occur.

with minor nits below you may want to consider

Quoted 2 lines
s390x/spec_ex.c new file +0 -0
new file mode 100644

[...]

s390x/spec_ex.c line 127

Quoted 4 lines
s390x/spec_ex.c new file +4 -0
+static int bad_alignment(void)
+{
+       uint32_t words[5] __attribute__((aligned(16)));
+       uint32_t (*bad_aligned)[4] = (uint32_t (*)[4])&words[1];

Why not simply:

uint32_t *bad_aligned = &words[1];

Quoted 4 lines
s390x/spec_ex.c new file +4 -0
+
+       /* LOAD PAIR FROM QUADWORD (LPQ) requires quadword alignment */
+       asm volatile ("lpq %%r6,%[bad]"
+                     : : [bad] "T" (*bad_aligned)

s390x/spec_ex.c line 141

Quoted 10 lines
s390x/spec_ex.c new file +10 -0
+                     : "%r6", "%r7"
+       );
+       return 0;
+}
+
+static int not_even(void)
+{
+       uint64_t quad[2] __attribute__((aligned(16))) = {0};
+
+       asm volatile (".insn    rxy,0xe3000000008f,%%r7,%[quad]" /* lpq %%r7,%[quad] */

Here you use .insn above you use lpq - why?

#3 lore raw

Re: [kvm-unit-tests PATCH v6 1/2] s390x: Add specification exception test

Quoted 6 lines · Nico Boehr

Quoting Janis Schoetterl-Glausch (2022-08-26 18:11:11)

Quoted 3 lines

Generate specification exceptions and check that they occur.

Thanks

Quoted 6 lines

with minor nits below you may want to consider

Quoted 2 lines
s390x/spec_ex.c new file +0 -0
new file mode 100644

[...]

Quoted 8 lines

s390x/spec_ex.c line 127

Quoted 4 lines
s390x/spec_ex.c new file +4 -0
+static int bad_alignment(void)
+{
+       uint32_t words[5] __attribute__((aligned(16)));
+       uint32_t (*bad_aligned)[4] = (uint32_t (*)[4])&words[1];

Why not simply:

uint32_t *bad_aligned = &words[1];

This is a pointer to a word, the argument to lpq is a quadword. Your way would probably work, especially since we don't actually want the asm to do anything, but no harm in doing it the correct way.

Quoted 17 lines
Quoted 5 lines
s390x/spec_ex.c new file +4 -0
+
+       /* LOAD PAIR FROM QUADWORD (LPQ) requires quadword alignment */
+       asm volatile ("lpq %%r6,%[bad]"
+                     : : [bad] "T" (*bad_aligned)

s390x/spec_ex.c line 141

Quoted 10 lines
s390x/spec_ex.c new file +10 -0
+                     : "%r6", "%r7"
+       );
+       return 0;
+}
+
+static int not_even(void)
+{
+       uint64_t quad[2] __attribute__((aligned(16))) = {0};
+
+       asm volatile (".insn    rxy,0xe3000000008f,%%r7,%[quad]" /* lpq %%r7,%[quad] */

Here you use .insn above you use lpq - why?

The assembler will complain about the odd register number, but that is intentional.

Reviewed-by on v6 1/2
#4 lore raw

Re: [kvm-unit-tests PATCH v6 1/2] s390x: Add specification exception test

In reply to Janis Schoetterl-Glausch
Quoted 3 lines · Janis Schoetterl-Glausch

Generate specification exceptions and check that they occur.

Minor issues below, apart from that:

Quoted 62 lines
---
  s390x/Makefile           |   1 +
  lib/s390x/asm/arch_def.h |   5 +
  s390x/spec_ex.c          | 194 +++++++++++++++++++++++++++++++++++++++
  s390x/unittests.cfg      |   3 +
  4 files changed, 203 insertions(+)

create mode 100644 s390x/spec_ex.c

s390x/Makefile +1 -0
index efd5e0c1..58b1bf54 100644
@@ -27,6 +27,7 @@ tests += $(TEST_DIR)/uv-host.elf
  tests += $(TEST_DIR)/edat.elf
  tests += $(TEST_DIR)/mvpg-sie.elf
  tests += $(TEST_DIR)/spec_ex-sie.elf
+tests += $(TEST_DIR)/spec_ex.elf
  tests += $(TEST_DIR)/firq.elf
  tests += $(TEST_DIR)/epsw.elf
  tests += $(TEST_DIR)/adtl-status.elf
lib/s390x/asm/arch_def.h +5 -0
index e7ae454b..b6e60fb0 100644
@@ -41,6 +41,11 @@ struct psw {
  	uint64_t	addr;
  };
 
+struct short_psw {
+	uint32_t	mask;
+	uint32_t	addr;
+};
+
  struct cpu {
  	struct lowcore *lowcore;
  	uint64_t *stack;
s390x/spec_ex.c new file +20 -0
new file mode 100644
index 00000000..68469e4b
@@ -0,0 +1,194 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright IBM Corp. 2021, 2022
+ *
+ * Specification exception test.
+ * Tests that specification exceptions occur when expected.
+ *
+ * Can be extended by adding triggers to spec_ex_triggers, see comments below.
+ */
+#include <stdlib.h>
+#include <libcflat.h>
+#include <bitops.h>
+#include <asm/interrupt.h>
+
+/* toggled to signal occurrence of invalid psw fixup */
+static bool invalid_psw_expected;
+static struct psw expected_psw;
+static struct psw invalid_psw;
+static struct psw fixup_psw;
+

s390x/spec_ex.c line 30

Quoted 10 lines
s390x/spec_ex.c new file +10 -0
+/*
+ * The standard program exception handler cannot deal with invalid old PSWs,
+ * especially not invalid instruction addresses, as in that case one cannot
+ * find the instruction following the faulting one from the old PSW.
+ * The PSW to return to is set by load_psw.
+ */
+static void fixup_invalid_psw(struct stack_frame_int *stack)
+{
+	/* signal occurrence of invalid psw fixup */
+	invalid_psw_expected = false;

Hmmmm (TM), assert(invalid_psw_expected) ?

Quoted 5 lines
s390x/spec_ex.c new file +5 -0
+	invalid_psw = lowcore.pgm_old_psw;
+	lowcore.pgm_old_psw = fixup_psw;
+}
+
+/*

s390x/spec_ex.c line 45

Quoted 10 lines
s390x/spec_ex.c new file +10 -0
+ * Load possibly invalid psw, but setup fixup_psw before,
+ * so that fixup_invalid_psw() can bring us back onto the right track.
+ * Also acts as compiler barrier, -> none required in expect/check_invalid_psw
+ */
+static void load_psw(struct psw psw)
+{
+	uint64_t scratch;
+
+	/*
+	 * The fixup psw is current psw with the instruction address replaced by

is the current psw

Quoted 27 lines
s390x/spec_ex.c new file +27 -0
+	 * the address of the nop following the instruction loading the new psw. > +	 */
+	fixup_psw.mask = extract_psw_mask();
+	asm volatile ( "larl	%[scratch],0f\n"
+		"	stg	%[scratch],%[fixup_addr]\n"
+		"	lpswe	%[psw]\n"
+		"0:	nop\n"
+		: [scratch] "=&d" (scratch),
+		  [fixup_addr] "=&T" (fixup_psw.addr)
+		: [psw] "Q" (psw)
+		: "cc", "memory"
+	);
+}
+
+static void load_short_psw(struct short_psw psw)
+{
+	uint64_t scratch;
+
+	fixup_psw.mask = extract_psw_mask();
+	asm volatile ( "larl	%[scratch],0f\n"
+		"	stg	%[scratch],%[fixup_addr]\n"
+		"	lpsw	%[psw]\n"
+		"0:	nop\n"
+		: [scratch] "=&d" (scratch),
+		  [fixup_addr] "=&T" (fixup_psw.addr)
+		: [psw] "Q" (psw)
+		: "cc", "memory"
+	);

s390x/spec_ex.c line 83

Quoted 10 lines
s390x/spec_ex.c new file +10 -0
+}
+
+static void expect_invalid_psw(struct psw psw)
+{
+	expected_psw = psw;
+	invalid_psw_expected = true;
+}
+
+static int check_invalid_psw(void)
+{

/* Since the fixup sets this to false we check for false here. */

Quoted 11 lines
s390x/spec_ex.c new file +11 -0
+	if (!invalid_psw_expected) {
+		if (expected_psw.mask == invalid_psw.mask &&
+		    expected_psw.addr == invalid_psw.addr)
+			return 0;
+		report_fail("Wrong invalid PSW");
+	} else {
+		report_fail("Expected exception due to invalid PSW");
+	}
+	return 1;
+}
+
#5 lore raw

PATCH v6 2/2 s390x: Test specification exceptions during transaction

In reply to Janis Schoetterl-Glausch

Program interruptions during transactional execution cause other interruption codes.
Check that we see the expected code for (some) specification exceptions.

---
 lib/s390x/asm/arch_def.h |   1 +
 s390x/spec_ex.c          | 199 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 195 insertions(+), 5 deletions(-)
lib/s390x/asm/arch_def.h +1 -0
index b6e60fb0..c841871c 100644
@@ -73,6 +73,7 @@ struct cpu {
 #define PSW_MASK_BA			0x0000000080000000UL
 #define PSW_MASK_64			(PSW_MASK_BA | PSW_MASK_EA)
 
+#define CTL0_TRANSACT_EX_CTL			(63 -  8)
 #define CTL0_LOW_ADDR_PROT			(63 - 35)
 #define CTL0_EDAT				(63 - 40)
 #define CTL0_FETCH_PROTECTION_OVERRIDE		(63 - 38)
s390x/spec_ex.c +194 -5

242 lines not on this page · raw message

Signature · 1 line
2.36.1
#6 lore raw

Re: [kvm-unit-tests PATCH v6 2/2] s390x: Test specification exceptions during transaction

Quoting Janis Schoetterl-Glausch (2022-08-26 18:11:12)

Quoted 2 lines
s390x/spec_ex.c +0 -0
index 68469e4b..56f26564 100644

[...]

s390x/spec_ex.c static void test_spec_ex(const struct spec_ex_trigger *trigger) · line 195

Quoted 7 lines
s390x/spec_ex.c +7 -0
+#define TRANSACTION_COMPLETED 4
+#define TRANSACTION_MAX_RETRIES 5
+
+/*
+ * NULL must be passed to __builtin_tbegin via constant, forbid diagnose from
+ * being NULL to keep things simple
+ */

For some reason, it took me a while to get this, because the context was not clear to me. Maybe rephrase it a tiny bit:

If diagnose should be NULL, it must be passed to __builtin_tbegin via constant, so forbid NULL to keep things simple

[...]

Quoted 2 lines
s390x/spec_ex.c +2 -0
+static void test_spec_ex_trans(struct args *args, const struct spec_ex_trigger *trigger)
+{

[...]

s390x/spec_ex.c static void test_spec_ex(const struct spec_ex_trigger *trigger) · line 295

Quoted 3 lines
s390x/spec_ex.c +3 -0
+       case TRANSACTION_MAX_RETRIES:
+               report_skip("Transaction retried %lu times with transient failures, giving up",
+                           args->max_retries);

Hmhm, I am unsure whether a skip is the right thing here. On one hand, it might hide bugs, on the other hand, it might cause spurious failures. Why did you decide for the skip?

#7 lore raw

Re: [kvm-unit-tests PATCH v6 2/2] s390x: Test specification exceptions during transaction

Quoted 17 lines · Nico Boehr

Quoting Janis Schoetterl-Glausch (2022-08-26 18:11:12)

Quoted 2 lines
s390x/spec_ex.c +0 -0
index 68469e4b..56f26564 100644

[...]

s390x/spec_ex.c static void test_spec_ex(const struct spec_ex_trigger *trigger) · line 195

Quoted 7 lines
s390x/spec_ex.c +7 -0
+#define TRANSACTION_COMPLETED 4
+#define TRANSACTION_MAX_RETRIES 5
+
+/*
+ * NULL must be passed to __builtin_tbegin via constant, forbid diagnose from
+ * being NULL to keep things simple
+ */

For some reason, it took me a while to get this, because the context was not clear to me. Maybe rephrase it a tiny bit:

If diagnose should be NULL, it must be passed to __builtin_tbegin via constant, so forbid NULL to keep things simple

[...]

Quoted 8 lines
Quoted 2 lines
s390x/spec_ex.c +2 -0
+static void test_spec_ex_trans(struct args *args, const struct spec_ex_trigger *trigger)
+{

[...]

s390x/spec_ex.c static void test_spec_ex(const struct spec_ex_trigger *trigger) · line 295

Quoted 3 lines
s390x/spec_ex.c +3 -0
+       case TRANSACTION_MAX_RETRIES:
+               report_skip("Transaction retried %lu times with transient failures, giving up",
+                           args->max_retries);

Hmhm, I am unsure whether a skip is the right thing here. On one hand, it might hide bugs, on the other hand, it might cause spurious failures. Why did you decide for the skip?

Yeah, it's a toss-up. Claudio asked me to change it in v4.

Reviewed-by
#8 lore raw

Re: [kvm-unit-tests PATCH v6 2/2] s390x: Test specification exceptions during transaction

Quoting Janis Schoetterl-Glausch (2022-09-01 18:08:17) [...]

Quoted 3 lines
Quoted 1 line

Hmhm, I am unsure whether a skip is the right thing here. On one hand, it might hide bugs, on the other hand, it might cause spurious failures. Why did you decide for the skip?

Yeah, it's a toss-up. Claudio asked me to change it in v4.

Allright, then:

Acked-by on v6 2/2
#9 lore raw

Re: [kvm-unit-tests PATCH v6 2/2] s390x: Test specification exceptions during transaction

In reply to Janis Schoetterl-Glausch
Quoted 5 lines · Janis Schoetterl-Glausch

Program interruptions during transactional execution cause other interruption codes.
Check that we see the expected code for (some) specification exceptions.

First off a disclaimer stating that I don't know anything about our TB facility and I'm currently lacking the time to read the documentation.

But the code looks good to me and I don't see a reason that keeps me from picking this.

Minor nits below

Quoted 42 lines
---
  lib/s390x/asm/arch_def.h |   1 +
  s390x/spec_ex.c          | 199 ++++++++++++++++++++++++++++++++++++++-
  2 files changed, 195 insertions(+), 5 deletions(-)
lib/s390x/asm/arch_def.h +1 -0
index b6e60fb0..c841871c 100644
@@ -73,6 +73,7 @@ struct cpu {
  #define PSW_MASK_BA			0x0000000080000000UL
  #define PSW_MASK_64			(PSW_MASK_BA | PSW_MASK_EA)
 
+#define CTL0_TRANSACT_EX_CTL			(63 -  8)
  #define CTL0_LOW_ADDR_PROT			(63 - 35)
  #define CTL0_EDAT				(63 - 40)
  #define CTL0_FETCH_PROTECTION_OVERRIDE		(63 - 38)
s390x/spec_ex.c +6 -0
index 68469e4b..56f26564 100644
@@ -4,13 +4,19 @@
   *
   * Specification exception test.
   * Tests that specification exceptions occur when expected.
+ * This includes specification exceptions occurring during transactional execution
+ * as these result in another interruption code (the transactional-execution-aborted
+ * bit is set).
   *
   * Can be extended by adding triggers to spec_ex_triggers, see comments below.
   */
  #include <stdlib.h>
+#include <htmintrin.h>
  #include <libcflat.h>
  #include <bitops.h>
+#include <asm/barrier.h>
  #include <asm/interrupt.h>
+#include <asm/facility.h>
 
  /* toggled to signal occurrence of invalid psw fixup */
  static bool invalid_psw_expected;

s390x/spec_ex.c static int not_even(void) · line 157

Quoted 4 lines
s390x/spec_ex.c +1 -0
@@ -148,20 +154,22 @@ static int not_even(void)
  /*
   * Harness for specification exception testing.
   * func only triggers exception, reporting is taken care of automatically.
+ * If a trigger is transactable it will also  be executed during a transaction.

Double space

s390x/spec_ex.c static void test_spec_ex(const struct spec_ex_trigger *trigger) · line 256

Quoted 5 lines
s390x/spec_ex.c +5 -0
+
+static void test_spec_ex_trans(struct args *args, const struct spec_ex_trigger *trigger)
+{
+	const uint16_t expected_pgm = PGM_INT_CODE_SPECIFICATION
+				      | PGM_INT_CODE_TX_ABORTED_EVENT;

I usually prefer having | and & at the end so it's easier to read.

Quoted 7 lines
s390x/spec_ex.c +7 -0
+	union {
+		struct __htm_tdb tdb;
+		uint64_t dwords[sizeof(struct __htm_tdb) / sizeof(uint64_t)];
+	} diag;
+	unsigned int i;
+	int trans_result;
+