Skip to content

s390x: Add misaligned instruction tests

Nina Schoetterl-Glausch kvm linux-s390 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest3 patches 3 repliesIn review
  2. v43 patches 3 repliesSuperseded
  3. v33 patches 9 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v23 patches8 repliesSuperseded

Changes in v5 from the cover letter

* fix miscompile due to missing barrier (thanks Thomas & Janosch)
* fix issues with clang (thanks Thomas)

Patches in v5 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3s390x/spec_ex: Use PSW macros390x/spec_ex.c+2 -81 reply
2/3s390x/spec_ex: Add test introducing odd address into PSWs390x/spec_ex.c+49 -11 reply
3/3s390x/spec_ex: Add test of EXECUTE with odd target addresss390x/spec_ex.c+25 -01 reply

Reviews trailers per patch

All 3 patches have a Reviewed-by or Acked-by.

PatchJanosch FrankClaudio ImbrendaNico Boehr
1/3R-b R-b R-b
2/3A-b R-b R-b T-b
3/3R-b R-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v5 thread

Cover letter [kvm-unit-tests PATCH v5 0/3] s390x: Add misaligned instruction tests

Instructions on s390 must be halfword aligned.
Add two tests for that.

v4 -> v5:
* fix miscompile due to missing barrier (thanks Thomas & Janosch)
* fix issues with clang (thanks Thomas)

v3 -> v4:
* zero whole register with xgr (thanks Janosch)
* pick up tags (thanks Janosch)

v2 -> v3:
* pick up R-b (thanks Janosch)
* use br instead of bcr (thanks Claudio)
* use text section instead of rodata for ex target (thanks Claudio)
* fix label position (thanks Claudio)

v1 -> v2:
* rebase
* use PSW macros
* simplify odd psw test (thanks Claudio)
* rename some identifiers
* pick up R-b (thanks Claudio)

Nina Schoetterl-Glausch (3):
s390x/spec_ex: Use PSW macro
s390x/spec_ex: Add test introducing odd address into PSW s390x/spec_ex: Add test of EXECUTE with odd target address

 s390x/spec_ex.c | 85 +++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 76 insertions(+), 9 deletions(-)

Range-diff against v4:

1:  c00f8aa2 = 1:  cdfa2083 s390x/spec_ex: Use PSW macro
2:  d9e3f6e0 ! 2:  5bf32702 s390x/spec_ex: Add test introducing odd address into PSW
    @@ s390x/spec_ex.c: static int psw_bit_12_is_1(void)
      	return check_invalid_psw();
      }
      
    -+extern char misaligned_code[];
    ++extern char misaligned_code_pre[];
     +asm (  ".balign	2\n"
    ++"misaligned_code_pre:\n"
     +"	. = . + 1\n"
    -+"misaligned_code:\n"
     +"	larl	%r0,0\n"
     +"	br	%r1\n"
     +);
     +
     +static int psw_odd_address(void)
     +{
    -+	struct psw odd = PSW_WITH_CUR_MASK((uint64_t)&misaligned_code);
    ++	struct psw odd = PSW_WITH_CUR_MASK(((uint64_t)&misaligned_code_pre) + 1);
     +	uint64_t executed_addr;
     +
     +	expect_invalid_psw(odd);
    @@ s390x/spec_ex.c: static int psw_bit_12_is_1(void)
     +	: [fixup_addr] "=&T" (fixup_psw.addr),
     +	  [executed_addr] "=d" (executed_addr)
     +	: [odd_psw] "Q" (odd)
    -+	: "cc", "%r0", "%r1"
    ++	: "cc", "%r0", "%r1", "memory" /* Compiler barrier like in load_psw */
     +	);
     +
     +	if (!executed_addr) {
3:  7ea75611 ! 3:  14af5979 s390x/spec_ex: Add test of EXECUTE with odd target address
    @@ s390x/spec_ex.c: static int short_psw_bit_12_is_0(void)
     +
     +	asm volatile ( ".pushsection .text.ex_odd\n"
     +		"	.balign	2\n"
    -+		"pre_odd_ex_target:\n"
    ++		"pre_odd_ex_target%=:\n"
     +		"	. = . + 1\n"
     +		"	lr	%[to],%[from]\n"
     +		"	.popsection\n"
     +
    -+		"	larl	%[pre_target_addr],pre_odd_ex_target\n"
    ++		"	larl	%[pre_target_addr],pre_odd_ex_target%=\n"
     +		"	ex	0,1(%[pre_target_addr])\n"
     +		: [pre_target_addr] "=&a" (pre_target_addr),
     +		  [to] "+d" (to)

base-commit: 5b5d27da2973b20ec29b18df4d749fb2190458af

Signature · 1 line
2.37.2