target/s390x: Fix SIGILL and SIGFPE psw.addr reporting
v6 cover target/s390x: Fix SIGILL and SIGFPE psw.addr reporting
qemu-s390x puts a wrong value into SIGILL's siginfo_t's psw.addr: it should be a pointer to the instruction following the illegal instruction, but at the moment it is a pointer to the illegal instruction itself. This breaks OpenJDK, which relies on this value. A similar problem exists for SIGFPE.
Patch 1 fixes the issue, patch 2 adds a test.
v1: https://lists.nongnu.org/archive/html/qemu-devel/2021-05/msg06592.html
v1 -> v2: Use a better buglink (Cornelia), simplify the inline asm
magic in the test and add an explanation (David).
v2: https://lists.nongnu.org/archive/html/qemu-devel/2021-05/msg06649.html
v2 -> v3: Fix SIGSEGV handling (found when trying to run valgrind under
qemu-user).
v3: https://lists.nongnu.org/archive/html/qemu-devel/2021-06/msg00299.html
v3 -> v4: Fix compiling the test on Ubuntu 20.04 (Jonathan).
v4: https://lists.nongnu.org/archive/html/qemu-devel/2021-06/msg05848.html
v4 -> v5: Greatly simplify the fix (Ulrich).
v5: https://lists.nongnu.org/archive/html/qemu-devel/2021-06/msg06244.html
v5 -> v6: Fix breakpoints (David). Add gdbstub test.
Note: the compare-and-trap SIGFPE issue is being fixed separately.
https://lists.nongnu.org/archive/html/qemu-devel/2021-06/msg05690.html
Ilya Leoshkevich (2):
target/s390x: Fix SIGILL and SIGFPE psw.addr reporting tests/tcg/s390x: Test SIGILL and SIGSEGV handling
linux-user/s390x/cpu_loop.c | 12 +- tests/tcg/s390x/Makefile.target | 18 +- tests/tcg/s390x/gdbstub/test-signals-s390x.py | 76 ++++++++ tests/tcg/s390x/signals-s390x.c | 165 ++++++++++++++++++ 4 files changed, 269 insertions(+), 2 deletions(-) create mode 100644 tests/tcg/s390x/gdbstub/test-signals-s390x.py create mode 100644 tests/tcg/s390x/signals-s390x.c
Signature · 1 line
2.31.1
PATCH v6 1/2 target/s390x: Fix SIGILL and SIGFPE psw.addr reporting
For SIGILL, SIGFPE and SIGTRAP the PSW must point after the instruction, and at the instruction for other signals. Currently under qemu-user for SIGFILL and SIGFPE it points at the instruction.
Fix by advancing psw.addr for these signals.
--- linux-user/s390x/cpu_loop.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
linux-user/s390x/cpu_loop.c +11 -1
@@ -64,7 +64,13 @@ void cpu_loop(CPUS390XState *env)case EXCP_DEBUG : sig =TARGET_SIGTRAP ; n =TARGET_TRAP_BRKPT ; - goto do_signal_pc; +/* +* For SIGTRAP the PSW must point after the instruction, which it +* already does thanks to s390x_tr_tb_stop(). si_addr doesn't need +* to be filled. +*/ + addr =0 ; + goto do_signal;case EXCP_PGM : n = env->int_pgm_code;switch (n) {
@@ -133,6 +139,10 @@ void cpu_loop(CPUS390XState *env) do_signal_pc: addr = env->psw.addr; +/* +* For SIGILL and SIGFPE the PSW must point after the instruction. +*/ + env->psw.addr += env->int_pgm_ilen; do_signal: info.si_signo = sig; info.si_errno =0 ;
Signature · 1 line
2.31.1
Quoted 34 lines · Ilya Leoshkevich
For SIGILL, SIGFPE and SIGTRAP the PSW must point after the instruction, and at the instruction for other signals. Currently under qemu-user for SIGFILL and SIGFPE it points at the instruction.
Fix by advancing psw.addr for these signals.
Signed-off-by Ilya Leoshkevich <[email protected]>Co-developed-by Ulrich Weigand <[email protected]>--- linux-user/s390x/cpu_loop.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)linux-user/s390x/cpu_loop.c +7
-1@@ -64,7 +64,13 @@ void cpu_loop(CPUS390XState *env)case EXCP_DEBUG : sig =TARGET_SIGTRAP ; n =TARGET_TRAP_BRKPT ; - goto do_signal_pc; +/* +* For SIGTRAP the PSW must point after the instruction, which it +* already does thanks to s390x_tr_tb_stop(). si_addr doesn't need +* to be filled. +*/ + addr =0 ; + goto do_signal;case EXCP_PGM : n = env->int_pgm_code;switch (n) {
linux-user/s390x/cpu_loop.c void cpu_loop(CPUS390XState *env) · line 148
Quoted 10 lines
linux-user/s390x/cpu_loop.c +4
-0@@ -133,6 +139,10 @@ void cpu_loop(CPUS390XState *env) do_signal_pc: addr = env->psw.addr; +/* +* For SIGILL and SIGFPE the PSW must point after the instruction. +*/ + env->psw.addr += env->int_pgm_ilen; do_signal: info.si_signo = sig; info.si_errno =0 ;
Signature · 3 lines
Thanks, David / dhildenb
PATCH v6 2/2 tests/tcg/s390x: Test SIGILL and SIGSEGV handling
In reply to Ilya LeoshkevichVerify that s390x-specific uc_mcontext.psw.addr is reported correctly and that signal handling interacts properly with debugging.
--- tests/tcg/s390x/Makefile.target | 18 +- tests/tcg/s390x/gdbstub/test-signals-s390x.py | 76 ++++++++ tests/tcg/s390x/signals-s390x.c | 165 ++++++++++++++++++ 3 files changed, 258 insertions(+), 1 deletion(-) create mode 100644 tests/tcg/s390x/gdbstub/test-signals-s390x.py create mode 100644 tests/tcg/s390x/signals-s390x.c
tests/tcg/s390x/Makefile.target +17 -1
@@ -1,4 +1,5 @@ -VPATH+=$(SRC_PATH)/tests/tcg/s390x +S390X_SRC=$(SRC_PATH)/tests/tcg/s390x +VPATH+=$(S390X_SRC) CFLAGS+=-march=zEC12 -m64 TESTS+=hello-s390x TESTS+=csst
@@ -12,3 +13,18 @@ TESTS+=mvc # This triggers failures on s390x hosts about 4% of the time run-signals: signals $(call skip-test, $<, "BROKEN awaiting sigframe clean-ups") + +TESTS+=signals-s390x + +ifneq ($(HAVE_GDB_BIN),) +GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py + +run-gdbstub-signals-s390x: signals-s390x + $(call run-test, $@, $(GDB_SCRIPT) \ + --gdb $(HAVE_GDB_BIN) \ + --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ + --bin $< --test $(S390X_SRC)/gdbstub/test-signals-s390x.py, \ + "mixing signals and debugging on s390x") + +EXTRA_RUNS += run-gdbstub-signals-s390x +endif
tests/tcg/s390x/gdbstub/test-signals-s390x.py new file +76 -0
76 lines not on this page · raw message
tests/tcg/s390x/signals-s390x.c new file +165 -0
165 lines not on this page · raw message
Signature · 1 line
2.31.1
Re: [PATCH v6 2/2] tests/tcg/s390x: Test SIGILL and SIGSEGV handling
Ping. Could this patch be reviewed? The other code fix patch in this series has been reviewed so if these tests can be reviewed then both this series:
https://lore.kernel.org/qemu-devel/[email protected]/
and the dependent series:
https://lore.kernel.org/qemu-devel/[email protected]/
will be reviewed and ready to go.
Thanks,
Jon
Quoted 299 lines · Ilya Leoshkevich
Verify that s390x-specific uc_mcontext.psw.addr is reported correctly and that signal handling interacts properly with debugging.
Signed-off-by Ilya Leoshkevich <[email protected]>--- tests/tcg/s390x/Makefile.target | 18 +- tests/tcg/s390x/gdbstub/test-signals-s390x.py | 76 ++++++++ tests/tcg/s390x/signals-s390x.c | 165 ++++++++++++++++++ 3 files changed, 258 insertions(+), 1 deletion(-) create mode 100644 tests/tcg/s390x/gdbstub/test-signals-s390x.py create mode 100644 tests/tcg/s390x/signals-s390x.ctests/tcg/s390x/Makefile.target +17
-1@@ -1,4 +1,5 @@ -VPATH+=$(SRC_PATH)/tests/tcg/s390x +S390X_SRC=$(SRC_PATH)/tests/tcg/s390x +VPATH+=$(S390X_SRC) CFLAGS+=-march=zEC12 -m64 TESTS+=hello-s390x TESTS+=csst@@ -12,3 +13,18 @@ TESTS+=mvc # This triggers failures on s390x hosts about 4% of the time run-signals: signals $(call skip-test, $<, "BROKEN awaiting sigframe clean-ups") + +TESTS+=signals-s390x + +ifneq ($(HAVE_GDB_BIN),) +GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py + +run-gdbstub-signals-s390x: signals-s390x + $(call run-test, $@, $(GDB_SCRIPT) \ + --gdb $(HAVE_GDB_BIN) \ + --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ + --bin $< --test $(S390X_SRC)/gdbstub/test-signals-s390x.py, \ + "mixing signals and debugging on s390x") + +EXTRA_RUNS += run-gdbstub-signals-s390x +endiftests/tcg/s390x/gdbstub/test-signals-s390x.py new file +76
-0@@ -0,0 +1,76 @@ +from __future__ import print_function + +# +# Test that signals and debugging mix well together on s390x. +# +# This is launched via tests/guest-debug/run-test.py +# + +import gdb +import sys + +failcount = 0 + + +def report(cond, msg): + """Report success/fail of test""" + if cond: + print("PASS: %s" % (msg)) + else: + print("FAIL: %s" % (msg)) + global failcount + failcount += 1 + + +def run_test(): + """Run through the tests one by one""" + illegal_op = gdb.Breakpoint("illegal_op") + stg = gdb.Breakpoint("stg") + mvc_8 = gdb.Breakpoint("mvc_8") + + # Expect the following events: + # 1x illegal_op breakpoint + # 2x stg breakpoint, segv, breakpoint + # 2x mvc_8 breakpoint, segv, breakpoint + for _ in range(14): + gdb.execute("c") + report(illegal_op.hit_count == 1, "illegal_op.hit_count == 1") + report(stg.hit_count == 4, "stg.hit_count == 4") + report(mvc_8.hit_count == 4, "mvc_8.hit_count == 4") + + # The test must succeed. + gdb.Breakpoint("_exit") + gdb.execute("c") + status = int(gdb.parse_and_eval("$r2")) + report(status == 0, "status == 0"); + + +# +# This runs as the script it sourced (via -x, via run-test.py) +# +try: + inferior = gdb.selected_inferior() + arch = inferior.architecture() + print("ATTACHED: %s" % arch.name()) +except (gdb.error, AttributeError): + print("SKIPPING (not connected)", file=sys.stderr) + exit(0) + +if gdb.parse_and_eval("$pc") == 0: + print("SKIP: PC not set") + exit(0) + +try: + # These are not very useful in scripts + gdb.execute("set pagination off") + gdb.execute("set confirm off") + + # Run the actual tests + run_test() +except (gdb.error): + print("GDB Exception: %s" % (sys.exc_info()[0])) + failcount += 1 + pass + +print("All tests complete: %d failures" % failcount) +exit(failcount)tests/tcg/s390x/signals-s390x.c new file +9
-0@@ -0,0 +1,165 @@ +#include <assert.h> +#include <signal.h> +#include <string.h> +#include <sys/mman.h> +#include <ucontext.h> +#include <unistd.h> + +/* +* Various instructions that generate SIGILL and SIGSEGV. They could have been
+ * defined in a separate .s file, but this would complicate the build, so the
+ * inline asm is used instead.
+ */tests/tcg/s390x/signals-s390x.c new file +53
-0+ +void illegal_op (void ); +void after_illegal_op (void ); +asm(".globl\tillegal_op\n" +"illegal_op:\t.byte\t0x00,0x00\n" +"\t.globl\tafter_illegal_op\n" +"after_illegal_op:\tbr\t%r14" ); + +void stg (void *dst,unsigned long src); +asm(".globl\tstg\n" +"stg:\tstg\t%r3,0(%r2)\n" +"\tbr\t%r14" ); + +void mvc_8 (void *dst,void *src); +asm(".globl\tmvc_8\n" +"mvc_8:\tmvc\t0(8,%r2),0(%r3)\n" +"\tbr\t%r14" ); + +static void safe_puts (const char *s) +{ +write (0 , s,strlen (s)); +write (0 ,"\n" ,1 ); +} + +enum exception { + exception_operation, + exception_translation, + exception_protection, +}; + +static struct { +int sig; +void *addr; +unsigned long psw_addr; +enum exception exception; +} expected; + +static void handle_signal (int sig,siginfo_t *info,void *ucontext) +{ +void *page; +int err; + +if (sig != expected.sig) { +safe_puts ("[ FAILED ] wrong signal" ); +_exit (1 ); + } + +if (info->si_addr != expected.addr) { +safe_puts ("[ FAILED ] wrong si_addr" ); +_exit (1 ); + } + + if (((ucontext_t *)ucontext)->uc_mcontext.psw.addr !=expected.psw_addr) {
tests/tcg/s390x/signals-s390x.c new file +100
-0+safe_puts ("[ FAILED ] wrong psw.addr" ); +_exit (1 ); + } + +switch (expected.exception) { +case exception_translation: + page =mmap (expected.addr,4096 ,PROT_READ |PROT_WRITE , +MAP_PRIVATE |MAP_ANONYMOUS |MAP_FIXED ,-1 ,0 ); +if (page != expected.addr) { +safe_puts ("[ FAILED ] mmap() failed" ); +_exit (1 ); + } +break ; +case exception_protection: + err =mprotect (expected.addr,4096 ,PROT_READ |PROT_WRITE ); +if (err !=0 ) { +safe_puts ("[ FAILED ] mprotect() failed" ); +_exit (1 ); + } +break ; +default : +break ; + } +} + +static void check_sigsegv (void *func,enum exception exception, +unsigned long val) +{ +int prot; +unsigned long *page; +unsigned long *addr; +int err; + + prot = exception == exception_translation ?PROT_NONE :PROT_READ ; + page =mmap (NULL ,4096 , prot,MAP_PRIVATE |MAP_ANONYMOUS ,-1 ,0 ); +assert (page !=MAP_FAILED ); +if (exception == exception_translation) { +/* Hopefully nothing will be mapped at this address. */ + err =munmap (page,4096 ); +assert (err ==0 ); + } + addr = page + (val &0x1ff ); + + expected.sig =SIGSEGV ; + expected.addr = page; + expected.psw_addr = (unsigned long )func; + expected.exception = exception; +if (func == stg) { +stg (addr, val); + }else { +assert (func == mvc_8); +mvc_8 (addr, &val); + } +assert (*addr == val); + + err =munmap (page,4096 ); +assert (err ==0 ); +} + +int main (void ) +{ +struct sigaction act; +int err; + +memset (&act,0 ,sizeof (act)); + act.sa_sigaction = handle_signal; + act.sa_flags =SA_SIGINFO ; + err =sigaction (SIGILL , &act,NULL ); +assert (err ==0 ); + err =sigaction (SIGSEGV , &act,NULL ); +assert (err ==0 ); + +safe_puts ("[ RUN ] Operation exception" ); + expected.sig =SIGILL ; + expected.addr = illegal_op; + expected.psw_addr = (unsigned long )after_illegal_op; + expected.exception = exception_operation; +illegal_op (); +safe_puts ("[ OK ]" ); + +safe_puts ("[ RUN ] Translation exception from stg" ); +check_sigsegv (stg, exception_translation,42 ); +safe_puts ("[ OK ]" ); + +safe_puts ("[ RUN ] Translation exception from mvc" ); +check_sigsegv (mvc_8, exception_translation,4242 ); +safe_puts ("[ OK ]" ); + +safe_puts ("[ RUN ] Protection exception from stg" ); +check_sigsegv (stg, exception_protection,424242 ); +safe_puts ("[ OK ]" ); + +safe_puts ("[ RUN ] Protection exception from mvc" ); +check_sigsegv (mvc_8, exception_protection,42424242 ); +safe_puts ("[ OK ]" ); + +safe_puts ("[ PASSED ]" ); + +_exit (0 ); +}
Re: [PATCH v6 2/2] tests/tcg/s390x: Test SIGILL and SIGSEGV handling
In reply to Ilya LeoshkevichQuoted 295 lines · Ilya Leoshkevich
Verify that s390x-specific uc_mcontext.psw.addr is reported correctly and that signal handling interacts properly with debugging.
Signed-off-by Ilya Leoshkevich <[email protected]>---
tests/tcg/s390x/Makefile.target | 18 +-tests/tcg/s390x/gdbstub/test-signals-s390x.py| 76 ++++++++ tests/tcg/s390x/signals-s390x.c | 165
++++++++++++++++++3 files changed, 258 insertions(+), 1 deletion(-)create mode 100644
tests/tcg/s390x/gdbstub/test-signals-s390x.pycreate mode 100644tests/tcg/s390x/signals-s390x.ctests/tcg/s390x/Makefile.target +2
-1@@ -1,4 +1,5 @@ -VPATH+=$(SRC_PATH)/tests/tcg/s390x +S390X_SRC=$(SRC_PATH)/tests/tcg/s390x +VPATH+=$(S390X_SRC)CFLAGS+=-march=zEC12 -m64
TESTS+=hello-s390x
TESTS+=cssttests/tcg/s390x/Makefile.target +0
-0@@ -12,3 +13,18 @@ TESTS+=mvc # This triggers failures on s390x hosts about 4% of the timerun-signals: signals
$(call skip-test, $<, "BROKEN awaiting sigframe clean-ups")tests/tcg/s390x/Makefile.target +11
-0+ +TESTS+=signals-s390x + +ifneq ($(HAVE_GDB_BIN),) +GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py + +run-gdbstub-signals-s390x: signals-s390x + $(call run-test, $@, $(GDB_SCRIPT) \ + --gdb $(HAVE_GDB_BIN) \ + --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ + --bin $< --test $(S390X_SRC)/gdbstub/test-signals-
s390x.py, \
+ "mixing signals and debugging on s390x")tests/tcg/s390x/Makefile.target +3
-0+ +EXTRA_RUNS += run-gdbstub-signals-s390x +endiftests/tcg/s390x/gdbstub/test-signals-s390x.py new file +76
-0@@ -0,0 +1,76 @@ +from __future__ import print_function + +# +# Test that signals and debugging mix well together on s390x. +# +# This is launched via tests/guest-debug/run-test.py +# + +import gdb +import sys + +failcount = 0 + + +def report(cond, msg): + """Report success/fail of test""" + if cond: + print("PASS: %s" % (msg)) + else: + print("FAIL: %s" % (msg)) + global failcount + failcount += 1 + + +def run_test(): + """Run through the tests one by one""" + illegal_op = gdb.Breakpoint("illegal_op") + stg = gdb.Breakpoint("stg") + mvc_8 = gdb.Breakpoint("mvc_8") + + # Expect the following events: + # 1x illegal_op breakpoint + # 2x stg breakpoint, segv, breakpoint + # 2x mvc_8 breakpoint, segv, breakpoint + for _ in range(14): + gdb.execute("c") + report(illegal_op.hit_count == 1, "illegal_op.hit_count == 1") + report(stg.hit_count == 4, "stg.hit_count == 4") + report(mvc_8.hit_count == 4, "mvc_8.hit_count == 4") + + # The test must succeed. + gdb.Breakpoint("_exit") + gdb.execute("c") + status = int(gdb.parse_and_eval("$r2")) + report(status == 0, "status == 0"); + + +# +# This runs as the script it sourced (via -x, via run-test.py) +# +try: + inferior = gdb.selected_inferior() + arch = inferior.architecture() + print("ATTACHED: %s" % arch.name()) +except (gdb.error, AttributeError): + print("SKIPPING (not connected)", file=sys.stderr) + exit(0) + +if gdb.parse_and_eval("$pc") == 0: + print("SKIP: PC not set") + exit(0) + +try: + # These are not very useful in scripts + gdb.execute("set pagination off") + gdb.execute("set confirm off") + + # Run the actual tests + run_test() +except (gdb.error): + print("GDB Exception: %s" % (sys.exc_info()[0])) + failcount += 1 + pass + +print("All tests complete: %d failures" % failcount) +exit(failcount)tests/tcg/s390x/signals-s390x.c new file +9
-0@@ -0,0 +1,165 @@ +#include <assert.h> +#include <signal.h> +#include <string.h> +#include <sys/mman.h> +#include <ucontext.h> +#include <unistd.h> + +/* +* Various instructions that generate SIGILL and SIGSEGV. They could have been
+ * defined in a separate .s file, but this would complicate the build, so the
+ * inline asm is used instead.
+ */tests/tcg/s390x/signals-s390x.c new file +53
-0+ +void illegal_op (void ); +void after_illegal_op (void ); +asm(".globl\tillegal_op\n" + "illegal_op:\t.byte\t0x00,0x00\n" + "\t.globl\tafter_illegal_op\n" + "after_illegal_op:\tbr\t%r14"); + +void stg (void *dst,unsigned long src); +asm(".globl\tstg\n" + "stg:\tstg\t%r3,0(%r2)\n" + "\tbr\t%r14"); + +void mvc_8 (void *dst,void *src); +asm(".globl\tmvc_8\n" + "mvc_8:\tmvc\t0(8,%r2),0(%r3)\n" + "\tbr\t%r14"); + +static void safe_puts (const char *s) +{ + write(0, s, strlen(s)); + write(0, "\n", 1); +} + +enum exception { + exception_operation, + exception_translation, + exception_protection, +}; + +static struct { + int sig; + void *addr; + unsigned long psw_addr; + enum exception exception; +} expected; + +static void handle_signal (int sig,siginfo_t *info,void *ucontext) +{ + void *page; + int err; + + if (sig != expected.sig) { + safe_puts("[ FAILED ] wrong signal"); + _exit(1); + } + + if (info->si_addr != expected.addr) { + safe_puts("[ FAILED ] wrong si_addr"); + _exit(1); + } + + if (((ucontext_t *)ucontext)->uc_mcontext.psw.addr !=expected.psw_addr) {
+safe_puts("[ FAILED ] wrong psw.addr"); +_exit(1);
+ }tests/tcg/s390x/signals-s390x.c new file +31
-0+ + switch (expected.exception) { + case exception_translation: + page = mmap(expected.addr, 4096, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0); + if (page != expected.addr) { + safe_puts("[ FAILED ] mmap() failed"); + _exit(1); + } + break; + case exception_protection: + err = mprotect(expected.addr, 4096, PROT_READ | PROT_WRITE); + if (err != 0) { + safe_puts("[ FAILED ] mprotect() failed"); + _exit(1); + } + break; + default: + break; + } +} + +static void check_sigsegv (void *func,enum exception exception, + unsigned long val) +{ + int prot; + unsigned long *page; + unsigned long *addr; + int err; + + prot = exception == exception_translation ? PROT_NONE :
PROT_READ;
+ page =mmap(NULL, 4096, prot, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+assert(page != MAP_FAILED);
+ if (exception ==exception_translation) {
+ /* Hopefully nothing will be mapped at this address. */ + err =munmap(page, 4096);
+ assert(err == 0);
+ }
+ addr = page + (val &0x1ff);tests/tcg/s390x/signals-s390x.c new file +48
-0+ + expected.sig = SIGSEGV; + expected.addr = page; + expected.psw_addr = (unsigned long)func; + expected.exception = exception; + if (func == stg) { + stg(addr, val); + } else { + assert(func == mvc_8); + mvc_8(addr, &val); + } + assert(*addr == val); + + err = munmap(page, 4096); + assert(err == 0); +} + +int main (void ) +{ + struct sigaction act; + int err; + + memset(&act, 0, sizeof(act)); + act.sa_sigaction = handle_signal; + act.sa_flags = SA_SIGINFO; + err = sigaction(SIGILL, &act, NULL); + assert(err == 0); + err = sigaction(SIGSEGV, &act, NULL); + assert(err == 0); + + safe_puts("[ RUN ] Operation exception"); + expected.sig = SIGILL; + expected.addr = illegal_op; + expected.psw_addr = (unsigned long)after_illegal_op; + expected.exception = exception_operation; + illegal_op(); + safe_puts("[ OK ]"); + + safe_puts("[ RUN ] Translation exception from stg"); + check_sigsegv(stg, exception_translation, 42); + safe_puts("[ OK ]"); + + safe_puts("[ RUN ] Translation exception from mvc"); + check_sigsegv(mvc_8, exception_translation, 4242); + safe_puts("[ OK ]"); + + safe_puts("[ RUN ] Protection exception from stg"); + check_sigsegv(stg, exception_protection, 424242);
tests/tcg/s390x/signals-s390x.c line 165
Quoted 10 lines
tests/tcg/s390x/signals-s390x.c new file +10
-0+ safe_puts("[ OK ]"); + + safe_puts("[ RUN ] Protection exception from mvc"); + check_sigsegv(mvc_8, exception_protection, 42424242); + safe_puts("[ OK ]"); + + safe_puts("[ PASSED ]"); + + _exit(0); +}
Another ping - could somebody please have a look at this patch?
Also, could the fix patch be picked separately? David has already reviewed it a while ago.
Best regards,
Ilya
Re: [PATCH v6 2/2] tests/tcg/s390x: Test SIGILL and SIGSEGV handling
In reply to Ilya LeoshkevichQuoted 32 lines · Ilya Leoshkevich
Verify that s390x-specific uc_mcontext.psw.addr is reported correctly and that signal handling interacts properly with debugging.
Signed-off-by Ilya Leoshkevich <[email protected]>--- tests/tcg/s390x/Makefile.target | 18 +- tests/tcg/s390x/gdbstub/test-signals-s390x.py | 76 ++++++++ tests/tcg/s390x/signals-s390x.c | 165 ++++++++++++++++++ 3 files changed, 258 insertions(+), 1 deletion(-)create mode 100644
tests/tcg/s390x/gdbstub/test-signals-s390x.pycreate mode 100644tests/tcg/s390x/signals-s390x.ctests/tcg/s390x/Makefile.target +7
-1@@ -1,4 +1,5 @@ -VPATH+=$(SRC_PATH)/tests/tcg/s390x +S390X_SRC=$(SRC_PATH)/tests/tcg/s390x +VPATH+=$(S390X_SRC) CFLAGS+=-march=zEC12 -m64 TESTS+=hello-s390x TESTS+=csst@@ -12,3 +13,18 @@ TESTS+=mvc # This triggers failures on s390x hosts about 4% of the time run-signals: signals $(call skip-test, $<, "BROKEN awaiting sigframe clean-ups") + +TESTS+=signals-s390x + +ifneq ($(HAVE_GDB_BIN),) +GDB_SCRIPT=$(SRC_PATH)/tests/guest-debug/run-test.py
tests/tcg/s390x/Makefile.target TESTS+=mvc · line 30
Quoted 10 lines
tests/tcg/s390x/Makefile.target +10
-0+ +run-gdbstub-signals-s390x: signals-s390x + $(call run-test, $@, $(GDB_SCRIPT) \ + --gdb $(HAVE_GDB_BIN) \ + --qemu $(QEMU) --qargs "$(QEMU_OPTS)" \ + --bin $< --test $(S390X_SRC)/gdbstub/test-signals-s390x.py, \ + "mixing signals and debugging on s390x") + +EXTRA_RUNS += run-gdbstub-signals-s390x +endif
Hi Ilya,
FYI, I've put patch 1/2 into a pull request today, but this testing patch has a non-trivial conflict with commit eba61056e4cc ... could you please check how to get this enabled properly again and then respin this patch 2/2 here? Thanks!
Thomas
Quoted 32 lines · Ilya Leoshkevich
qemu-s390x puts a wrong value into SIGILL's siginfo_t's psw.addr: it should be a pointer to the instruction following the illegal instruction, but at the moment it is a pointer to the illegal instruction itself. This breaks OpenJDK, which relies on this value. A similar problem exists for SIGFPE.
Patch 1 fixes the issue, patch 2 adds a test.
v1: https://lists.nongnu.org/archive/html/qemu-devel/2021-05/msg06592.html
v1 -> v2: Use a better buglink (Cornelia), simplify the inline asm
magic in the test and add an explanation (David).v2: https://lists.nongnu.org/archive/html/qemu-devel/2021-05/msg06649.html
v2 -> v3: Fix SIGSEGV handling (found when trying to run valgrind underqemu-user).v3: https://lists.nongnu.org/archive/html/qemu-devel/2021-06/msg00299.html
v3 -> v4: Fix compiling the test on Ubuntu 20.04 (Jonathan).v4: https://lists.nongnu.org/archive/html/qemu-devel/2021-06/msg05848.html
v4 -> v5: Greatly simplify the fix (Ulrich).v5: https://lists.nongnu.org/archive/html/qemu-devel/2021-06/msg06244.html
v5 -> v6: Fix breakpoints (David). Add gdbstub test.Note: the compare-and-trap SIGFPE issue is being fixed separately.
https://lists.nongnu.org/archive/html/qemu-devel/2021-06/msg05690.htmlIlya Leoshkevich (2):
target/s390x: Fix SIGILL and SIGFPE psw.addr reporting tests/tcg/s390x: Test SIGILL and SIGSEGV handling
Quoted 7 lines
linux-user/s390x/cpu_loop.c | 12 +- tests/tcg/s390x/Makefile.target | 18 +- tests/tcg/s390x/gdbstub/test-signals-s390x.py | 76 ++++++++ tests/tcg/s390x/signals-s390x.c | 165 ++++++++++++++++++ 4 files changed, 269 insertions(+), 2 deletions(-) create mode 100644 tests/tcg/s390x/gdbstub/test-signals-s390x.py create mode 100644 tests/tcg/s390x/signals-s390x.c
So, I'd like to see this merged, but I'm unsure on what we agreed -- I thought this would go via linux-user. Do I misremember?
Le 03/08/2021 à 10:13, Cornelia Huck a écrit :
Quoted 42 lines · Ilya Leoshkevich
Quoted 33 lines
qemu-s390x puts a wrong value into SIGILL's siginfo_t's psw.addr: it should be a pointer to the instruction following the illegal instruction, but at the moment it is a pointer to the illegal instruction itself. This breaks OpenJDK, which relies on this value. A similar problem exists for SIGFPE.
Patch 1 fixes the issue, patch 2 adds a test.
v1: https://lists.nongnu.org/archive/html/qemu-devel/2021-05/msg06592.html
v1 -> v2: Use a better buglink (Cornelia), simplify the inline asm
magic in the test and add an explanation (David).v2: https://lists.nongnu.org/archive/html/qemu-devel/2021-05/msg06649.html
v2 -> v3: Fix SIGSEGV handling (found when trying to run valgrind underqemu-user).v3: https://lists.nongnu.org/archive/html/qemu-devel/2021-06/msg00299.html
v3 -> v4: Fix compiling the test on Ubuntu 20.04 (Jonathan).v4: https://lists.nongnu.org/archive/html/qemu-devel/2021-06/msg05848.html
v4 -> v5: Greatly simplify the fix (Ulrich).v5: https://lists.nongnu.org/archive/html/qemu-devel/2021-06/msg06244.html
v5 -> v6: Fix breakpoints (David). Add gdbstub test.Note: the compare-and-trap SIGFPE issue is being fixed separately.
https://lists.nongnu.org/archive/html/qemu-devel/2021-06/msg05690.htmlIlya Leoshkevich (2):
target/s390x: Fix SIGILL and SIGFPE psw.addr reporting tests/tcg/s390x: Test SIGILL and SIGSEGV handlingQuoted 7 lines
linux-user/s390x/cpu_loop.c | 12 +- tests/tcg/s390x/Makefile.target | 18 +- tests/tcg/s390x/gdbstub/test-signals-s390x.py | 76 ++++++++ tests/tcg/s390x/signals-s390x.c | 165 ++++++++++++++++++ 4 files changed, 269 insertions(+), 2 deletions(-) create mode 100644 tests/tcg/s390x/gdbstub/test-signals-s390x.py create mode 100644 tests/tcg/s390x/signals-s390x.c
Quoted 3 lines
So, I'd like to see this merged, but I'm unsure on what we agreed -- I thought this would go via linux-user. Do I misremember?
Please, take them via the s390x branch.
Thanks,
Laurent