Description of problem: On RHEL-4 s390 and s390x ptrace(PTRACE_SINGLESTEP,SIGALRM) will report a SIGTRAP from the _second_ instruction of the SIGALRM handler. All the other platforms stop the the _first_ signal handler instruction. Version-Release number of selected component (if applicable): kernel-2.6.9-67.EL.s390x How reproducible: Always. Steps to Reproduce: 1. wget -q -O step-into-handler.c 'http://sources.redhat.com/cgi-bin/cvsweb.cgi/~checkout~/tests/ptrace-tests/tests/step-into-handler.c?cvsroot=systemtap';for bit in 31 64;do gcc -m$bit -D_GNU_SOURCE -o step-into-handler step-into-handler.c -Wall -ggdb2;./step-into-handler;echo $?;done Actual results: 1 1 Expected results: 0 0 Additional info: s390x RHEL-5 (due to utrace?) is not affected by this bug. Other platforms (non-s390/non-s390x) are also not affected by this bug. Also it may not be much serious, in fact it fortunately discovered a GDB regression otherwise not caught by any platform/test. Not sure if it should be fixed at all, probably not worth it for RHEL-4.7/4.8.
RHEL-5 kernel under the test was: kernel-2.6.18-58.el5.utrace2.s390x
This was indeed fixed in RHEL5 as part of the utrace port for s390. The upstream code for this is being cleaned up right now, it so happens. This is probably the right fix for RHEL4: --- linux-2.6.9/arch/s390/kernel/signal.c +++ linux-2.6.9/arch/s390/kernel/signal.c @@ -514,6 +514,8 @@ int do_signal(struct pt_regs *regs, sigs } #endif handle_signal(signr, &ka, &info, oldset, regs); + if (current->thread.per_info.single_step) + set_thread_flag(TIF_SINGLE_STEP); return 1; }
Created attachment 303601 [details] Restore single_step flag after signal Resore current->thread.per_info.single_step before returning from do_signal() and jump to sysc_singlestep after do_signal() returned in system_call().
With the patch above applied, the reproducer returns zero on both s390 and s390x (31 et 64 bits).
Patch posted: http://post-office.corp.redhat.com/archives/rhkernel-list/2008-May/msg00108.html
Committed in 71.EL . RPMS are available at http://people.redhat.com/vgoyal/rhel4/
An advisory has been issued which should help the problem described in this bug report. This report is therefore being closed with a resolution of ERRATA. For more information on therefore solution and/or where to find the updated files, please follow the link below. You may reopen this bug report if the solution does not work for you. http://rhn.redhat.com/errata/RHSA-2008-0665.html