Skip to contentSkip to conversation

s390x: Add tests for execute-type instructions

PATCH Superseded Nina Schoetterl-Glausch 2 participants 3 messages Feb 28, 2023 – Mar 3, 2023

Subsystems (2)

v3 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 s390x: Add tests for execute-type instructions

Test the instruction address used by targets of an execute instruction. When the target instruction calculates a relative address, the result is relative to the target instruction, not the execute instruction.

---

v2 -> v3:
* add some comments (thanks Janosch)
* add two new tests (drop Nico's R-b)
* push prefix

v1 -> v2:
* add test to unittests.cfg and .gitlab-ci.yml
* pick up R-b (thanks Nico)

TCG does the address calculation relative to the execute instruction. Everything that has an operand that is relative to the instruction given by the immediate in the instruction and goes through in2_ri2 in TCG has this problem, because in2_ri2 does the calculation relative to pc_next which is the address of the EX(RL).
That should make fixing it easier tho.

Range-diff against v2:
1: 08bae04a ! 1: 136eb2a2 s390x: Add tests for execute-type instructions

    @@ Commit message
         relative to the target instruction, not the execute instruction.
     
         Signed-off-by: Nina Schoetterl-Glausch <[email protected]>
    -    Reviewed-by: Nico Boehr <[email protected]>
     
      ## s390x/Makefile ##
     @@ s390x/Makefile: tests += $(TEST_DIR)/panic-loop-extint.elf
    @@ s390x/ex.c (new)
     + * Copyright IBM Corp. 2023
     + *
     + * Test EXECUTE (RELATIVE LONG).
    ++ * These instruction execute a target instruction. The target instruction is formed
    ++ * by reading an instruction from memory and optionally modifying some of its bits.
    ++ * The execution of the target instruction is the same as if it was executed
    ++ * normally as part of the instruction sequence, except for the instruction
    ++ * address and the instruction-length code.
     + */
     +
     +#include <libcflat.h>
     +
    ++/*
    ++ * BRANCH AND SAVE, register register variant.
    ++ * Saves the next instruction address (address from PSW + length of instruction)
    ++ * to the first register. No branch is taken in this test, because 0 is
    ++ * specified as target.
    ++ * BASR does *not* perform a relative address calculation with an intermediate.
    ++ */
     +static void test_basr(void)
     +{
     +	uint64_t ret_addr, after_ex;
    @@ s390x/ex.c (new)
     +}
     +
     +/*
    -+ * According to PoP (Branch-Address Generation), the address is relative to
    -+ * BRAS when it is the target of an execute-type instruction.
    ++ * BRANCH RELATIVE AND SAVE.
    ++ * According to PoP (Branch-Address Generation), the address calculated relative
    ++ * to the instruction address is relative to BRAS when it is the target of an
    ++ * execute-type instruction, not relative to the execute-type instruction.
     + */
     +static void test_bras(void)
     +{
    @@ s390x/ex.c (new)
     +	report_prefix_pop();
     +}
     +
    ++/*
    ++ * LOAD ADDRESS RELATIVE LONG.
    ++ * If it is the target of an execute-type instruction, the address is relative
    ++ * to the LARL.
    ++ */
     +static void test_larl(void)
     +{
     +	uint64_t target, addr;
    @@ s390x/ex.c (new)
     +	report_prefix_pop();
     +}
     +
    ++/* LOAD LOGICAL RELATIVE LONG.
    ++ * If it is the target of an execute-type instruction, the address is relative
    ++ * to the LLGFRL.
    ++ */
    ++static void test_llgfrl(void)
    ++{
    ++	uint64_t target, value;
    ++
    ++	report_prefix_push("LLGFRL");
    ++	asm volatile ( ".pushsection .rodata\n"
    ++		"	.balign	4\n"
    ++		"0:	llgfrl	%[value],0\n"
    ++		"	.popsection\n"
    ++
    ++		"	llgfrl	%[target],0b\n"
    ++		"	exrl	0,0b\n"
    ++		: [target] "=d" (target),
    ++		  [value] "=d" (value)
    ++	);
    ++
    ++	report(target == value, "loaded correct value");
    ++	report_prefix_pop();
    ++}
    ++
    ++/*
    ++ * COMPARE RELATIVE LONG
    ++ * If it is the target of an execute-type instruction, the address is relative
    ++ * to the CRL.
    ++ */
    ++static void test_crl(void)
    ++{
    ++	uint32_t program_mask, cc, crl_word;
    ++
    ++	report_prefix_push("CRL");
    ++	asm volatile ( ".pushsection .rodata\n"
    ++		"	.balign	4\n" //operand of crl must be word aligned
    ++		"0:	crl	%[crl_word],0\n"
    ++		"	.popsection\n"
    ++
    ++		"	lrl	%[crl_word],0b\n"
    ++		//align (pad with nop), in case the wrong bad operand is used
    ++		"	.balignw 4,0x0707\n"
    ++		"	exrl	0,0b\n"
    ++		"	ipm	%[program_mask]\n"
    ++		: [program_mask] "=d" (program_mask),
    ++		  [crl_word] "=d" (crl_word)
    ++		:: "cc"
    ++	);
    ++
    ++	cc = program_mask >> 28;
    ++	report(!cc, "operand compared to is relative to CRL");
    ++	report_prefix_pop();
    ++}
    ++
     +int main(int argc, char **argv)
     +{
    ++	report_prefix_push("ex");
     +	test_basr();
     +	test_bras();
     +	test_larl();
    ++	test_llgfrl();
    ++	test_crl();
    ++	report_prefix_pop();
     +
     +	return report_summary();
     +}
 s390x/Makefile      |   1 +
 s390x/ex.c          | 169 ++++++++++++++++++++++++++++++++++++++++++++
 s390x/unittests.cfg |   3 +
 .gitlab-ci.yml      |   1 +
 4 files changed, 174 insertions(+)
 create mode 100644 s390x/ex.c
s390x/Makefile +1 -0
index 97a61611..6cf8018b 100644
@@ -39,6 +39,7 @@ tests += $(TEST_DIR)/panic-loop-extint.elf
 tests += $(TEST_DIR)/panic-loop-pgm.elf
 tests += $(TEST_DIR)/migration-sck.elf
 tests += $(TEST_DIR)/exittime.elf
+tests += $(TEST_DIR)/ex.elf
 
 pv-tests += $(TEST_DIR)/pv-diags.elf
 
s390x/ex.c new file +169 -0

169 lines not on this page · raw message

s390x/unittests.cfg +3 -0
index d97eb5e9..b61faf07 100644
@@ -215,3 +215,6 @@ file = migration-skey.elf
 smp = 2
 groups = migration
 extra_params = -append '--parallel'
+
+[execute]
+file = ex.elf
.gitlab-ci.yml +1 -0
index ad7949c9..a999f64a 100644
@@ -275,6 +275,7 @@ s390x-kvm:
   - ACCEL=kvm ./run_tests.sh
       selftest-setup intercept emulator sieve sthyi diag10 diag308 pfmf
       cmm vector gs iep cpumodel diag288 stsi sclp-1g sclp-3g css skrf sie
+      execute
       | tee results.txt
   - grep -q PASS results.txt && ! grep -q FAIL results.txt
  only:

base-commit: e3c5c3ef2524c58023073c0fadde2e8ae3c04ec6

Signature · 1 line
2.36.1
Reviewed-by on v3 1/1
#1 lore raw
Quoted 5 lines · Nina Schoetterl-Glausch

Test the instruction address used by targets of an execute instruction. When the target instruction calculates a relative address, the result is relative to the target instruction, not the execute instruction.

Some small nits below, I can fix that up when picking.

Quoted 3 lines

---

[...]

Quoted 25 lines
  s390x/Makefile      |   1 +
  s390x/ex.c          | 169 ++++++++++++++++++++++++++++++++++++++++++++
  s390x/unittests.cfg |   3 +
  .gitlab-ci.yml      |   1 +
  4 files changed, 174 insertions(+)

create mode 100644 s390x/ex.c

s390x/Makefile +1 -0
index 97a61611..6cf8018b 100644
@@ -39,6 +39,7 @@ tests += $(TEST_DIR)/panic-loop-extint.elf
  tests += $(TEST_DIR)/panic-loop-pgm.elf
  tests += $(TEST_DIR)/migration-sck.elf
  tests += $(TEST_DIR)/exittime.elf
+tests += $(TEST_DIR)/ex.elf
 
  pv-tests += $(TEST_DIR)/pv-diags.elf
 
s390x/ex.c new file +0 -0
new file mode 100644
index 00000000..3a22e496

s390x/ex.c line 6

Quoted 6 lines
s390x/ex.c new file +6 -0
@@ -0,0 +1,169 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright IBM Corp. 2023
+ *
+ * Test EXECUTE (RELATIVE LONG).
+ * These instruction execute a target instruction. The target instruction is formed

s/instruction/instructions/ ?

Quoted 8 lines
s390x/ex.c new file +8 -0
+ * by reading an instruction from memory and optionally modifying some of its bits.
+ * The execution of the target instruction is the same as if it was executed
+ * normally as part of the instruction sequence, except for the instruction
+ * address and the instruction-length code.
+ */
+
+#include <libcflat.h>
+

[...]

Quoted 13 lines
s390x/ex.c new file +13 -0
+static void test_larl(void)
+{
+	uint64_t target, addr;
+
+	report_prefix_push("LARL");
+	asm volatile ( ".pushsection .rodata\n"
+		"0:	larl	%[addr],0\n"
+		"	.popsection\n"
+
+		"	larl	%[target],0b\n"
+		"	exrl	0,0b\n"
+		: [target] "=d" (target),
+		  [addr] "=d" (addr)

s390x/ex.c line 107

Quoted 10 lines
s390x/ex.c new file +10 -0
+	);
+
+	report(target == addr, "address calculated relative to LARL");
+	report_prefix_pop();
+}
+
+/* LOAD LOGICAL RELATIVE LONG.
+ * If it is the target of an execute-type instruction, the address is relative
+ * to the LLGFRL.
+ */

This is the only instruction where there's no comment about the execute behavior but it would only make sense that it follows the same address generation rules.

Quoted 22 lines
s390x/ex.c new file +22 -0
+static void test_llgfrl(void)
+{
+	uint64_t target, value;
+
+	report_prefix_push("LLGFRL");
+	asm volatile ( ".pushsection .rodata\n"
+		"	.balign	4\n"
+		"0:	llgfrl	%[value],0\n"
+		"	.popsection\n"
+
+		"	llgfrl	%[target],0b\n"
+		"	exrl	0,0b\n"
+		: [target] "=d" (target),
+		  [value] "=d" (value)
+	);
+
+	report(target == value, "loaded correct value");
+	report_prefix_pop();
+}
+
+/*
+ * COMPARE RELATIVE LONG

s390x/ex.c line 139

Quoted 10 lines
s390x/ex.c new file +10 -0
+ * If it is the target of an execute-type instruction, the address is relative
+ * to the CRL.
+ */
+static void test_crl(void)
+{
+	uint32_t program_mask, cc, crl_word;
+
+	report_prefix_push("CRL");
+	asm volatile ( ".pushsection .rodata\n"
+		"	.balign	4\n" //operand of crl must be word aligned

Just put it on a new line so we don't mix commenting stiles. Inline assembly is already hardly readable anyway.

Quoted 55 lines
s390x/ex.c new file +30 -0
+		"0:	crl	%[crl_word],0\n"
+		"	.popsection\n"
+
+		"	lrl	%[crl_word],0b\n"
+		//align (pad with nop), in case the wrong bad operand is used
+		"	.balignw 4,0x0707\n"
+		"	exrl	0,0b\n"
+		"	ipm	%[program_mask]\n"
+		: [program_mask] "=d" (program_mask),
+		  [crl_word] "=d" (crl_word)
+		:: "cc"
+	);
+
+	cc = program_mask >> 28;
+	report(!cc, "operand compared to is relative to CRL");
+	report_prefix_pop();
+}
+
+int main(int argc, char **argv)
+{
+	report_prefix_push("ex");
+	test_basr();
+	test_bras();
+	test_larl();
+	test_llgfrl();
+	test_crl();
+	report_prefix_pop();
+
+	return report_summary();
+}
s390x/unittests.cfg +3 -0
index d97eb5e9..b61faf07 100644
@@ -215,3 +215,6 @@ file = migration-skey.elf
  smp = 2
  groups = migration
  extra_params = -append '--parallel'
+
+[execute]
+file = ex.elf
.gitlab-ci.yml +1 -0
index ad7949c9..a999f64a 100644
@@ -275,6 +275,7 @@ s390x-kvm:
    - ACCEL=kvm ./run_tests.sh
        selftest-setup intercept emulator sieve sthyi diag10 diag308 pfmf
        cmm vector gs iep cpumodel diag288 stsi sclp-1g sclp-3g css skrf sie
+      execute
        | tee results.txt
    - grep -q PASS results.txt && ! grep -q FAIL results.txt
   only:

base-commit: e3c5c3ef2524c58023073c0fadde2e8ae3c04ec6

#2 lore raw
Quoted 10 lines · Janosch Frank
Quoted 5 lines · Nina Schoetterl-Glausch

Test the instruction address used by targets of an execute instruction. When the target instruction calculates a relative address, the result is relative to the target instruction, not the execute instruction.

Some small nits below, I can fix that up when picking.

Thanks.

Quoted 24 lines
Quoted 4 lines

---

[...]

Quoted 19 lines
  s390x/Makefile      |   1 +
  s390x/ex.c          | 169 ++++++++++++++++++++++++++++++++++++++++++++
  s390x/unittests.cfg |   3 +
  .gitlab-ci.yml      |   1 +
  4 files changed, 174 insertions(+)

create mode 100644 s390x/ex.c

s390x/Makefile +1 -0
index 97a61611..6cf8018b 100644
@@ -39,6 +39,7 @@ tests += $(TEST_DIR)/panic-loop-extint.elf
  tests += $(TEST_DIR)/panic-loop-pgm.elf
  tests += $(TEST_DIR)/migration-sck.elf
  tests += $(TEST_DIR)/exittime.elf
+tests += $(TEST_DIR)/ex.elf
 
  pv-tests += $(TEST_DIR)/pv-diags.elf
 
Quoted 14 lines

s390x/ex.c line 6

Quoted 12 lines
s390x/ex.c new file +6 -0
new file mode 100644
index 00000000..3a22e496
@@ -0,0 +1,169 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright IBM Corp. 2023
+ *
+ * Test EXECUTE (RELATIVE LONG).
+ * These instruction execute a target instruction. The target instruction is formed

s/instruction/instructions/ ?

Yes.

Quoted 31 lines
Quoted 9 lines
s390x/ex.c new file +8 -0
+ * by reading an instruction from memory and optionally modifying some of its bits.
+ * The execution of the target instruction is the same as if it was executed
+ * normally as part of the instruction sequence, except for the instruction
+ * address and the instruction-length code.
+ */
+
+#include <libcflat.h>
+

[...]

Quoted 19 lines
s390x/ex.c new file +19 -0
+static void test_larl(void)
+{
+	uint64_t target, addr;
+
+	report_prefix_push("LARL");
+	asm volatile ( ".pushsection .rodata\n"
+		"0:	larl	%[addr],0\n"
+		"	.popsection\n"
+
+		"	larl	%[target],0b\n"
+		"	exrl	0,0b\n"
+		: [target] "=d" (target),
+		  [addr] "=d" (addr)
+	);
+
+	report(target == addr, "address calculated relative to LARL");
+	report_prefix_pop();
+}
+
Quoted 8 lines
Quoted 4 lines

+/* LOAD LOGICAL RELATIVE LONG.
+ * If it is the target of an execute-type instruction, the address is relative
+ * to the LLGFRL.
+ */

This is the only instruction where there's no comment about the execute behavior but it would only make sense that it follows the same address generation rules.

I added CRL first because I overlooked that it *does* specify it's behavior and decided to keep it in, because why not.
Then checked all the other instructions.
It's a bit wonky, the PoP says:

Operand-Address Generation
...

The signed binary inte-
ger specifies the number of halfwords that is added to the address of the current instruction (or the address of the execute-type instruction if the instruc- tion having the RI2 field is the target of an execute- type instruction) to form the intermediate value.

So it says *address* not *target* of the execute-type insn.

then:

Branch-Address Generation
...
The branch address is the number of half- words designated by the RI2 field added to the address of the relative-branch instruction.
...
In all formats, the sec-
ond addend is the 64-bit address of the branch instruction. The address of the branch instruction is the instruction address in the PSW before that address is updated to address the next sequential instruction, or it is the address of the target of the execute-type instruction (EXECUTE or EXECUTE RELATIVE LONG) if an execute-type instruction is used.

And everything but LLGFRL explicitly mentions that it is relative to the target. We could mention in the comment that the PoP doesn't explicitly state that, but the realty is that that's what the machine does.

Quoted 28 lines
Quoted 28 lines
s390x/ex.c new file +27 -0
+static void test_llgfrl(void)
+{
+	uint64_t target, value;
+
+	report_prefix_push("LLGFRL");
+	asm volatile ( ".pushsection .rodata\n"
+		"	.balign	4\n"
+		"0:	llgfrl	%[value],0\n"
+		"	.popsection\n"
+
+		"	llgfrl	%[target],0b\n"
+		"	exrl	0,0b\n"
+		: [target] "=d" (target),
+		  [value] "=d" (value)
+	);
+
+	report(target == value, "loaded correct value");
+	report_prefix_pop();
+}
+
+/*
+ * COMPARE RELATIVE LONG
+ * If it is the target of an execute-type instruction, the address is relative
+ * to the CRL.
+ */
+static void test_crl(void)
+{
Quoted 8 lines

s390x/ex.c line 139

Quoted 5 lines
s390x/ex.c new file +5 -0
+	uint32_t program_mask, cc, crl_word;
+
+	report_prefix_push("CRL");
+	asm volatile ( ".pushsection .rodata\n"
+		"	.balign	4\n" //operand of crl must be word aligned

Just put it on a new line so we don't mix commenting stiles. Inline assembly is already hardly readable anyway.

Could also put it in the asm "#operand of crl must be word aligned" but I haven't seen that anywhere else, and the benefit is negligible.

Quoted 57 lines
Quoted 56 lines
s390x/ex.c new file +30 -0
+		"0:	crl	%[crl_word],0\n"
+		"	.popsection\n"
+
+		"	lrl	%[crl_word],0b\n"
+		//align (pad with nop), in case the wrong bad operand is used
+		"	.balignw 4,0x0707\n"
+		"	exrl	0,0b\n"
+		"	ipm	%[program_mask]\n"
+		: [program_mask] "=d" (program_mask),
+		  [crl_word] "=d" (crl_word)
+		:: "cc"
+	);
+
+	cc = program_mask >> 28;
+	report(!cc, "operand compared to is relative to CRL");
+	report_prefix_pop();
+}
+
+int main(int argc, char **argv)
+{
+	report_prefix_push("ex");
+	test_basr();
+	test_bras();
+	test_larl();
+	test_llgfrl();
+	test_crl();
+	report_prefix_pop();
+
+	return report_summary();
+}
s390x/unittests.cfg +3 -0
index d97eb5e9..b61faf07 100644
@@ -215,3 +215,6 @@ file = migration-skey.elf
  smp = 2
  groups = migration
  extra_params = -append '--parallel'
+
+[execute]
+file = ex.elf
.gitlab-ci.yml +1 -0
index ad7949c9..a999f64a 100644
@@ -275,6 +275,7 @@ s390x-kvm:
    - ACCEL=kvm ./run_tests.sh
        selftest-setup intercept emulator sieve sthyi diag10 diag308 pfmf
        cmm vector gs iep cpumodel diag288 stsi sclp-1g sclp-3g css skrf sie
+      execute
        | tee results.txt
    - grep -q PASS results.txt && ! grep -q FAIL results.txt
   only:

base-commit: e3c5c3ef2524c58023073c0fadde2e8ae3c04ec6