28e6103665
So, forever, we've had this ptrace_signal_deliver implementation
which tries to handle all of the nasties that can occur when the
debugger looks at a process about to take a signal. It's meant
to address all of these issues inside of the kernel so that the
debugger need not be mindful of such things.
Problem is, this doesn't work.
The idea was that we should do the syscall restart business first, so
that the debugger captures that state. Otherwise, if the debugger for
example saves the child's state, makes the child execute something
else, then restores the saved state, we won't handle the syscall
restart properly because we lose the "we're in a syscall" state.
The code here worked for most cases, but if the debugger actually
passes the signal through to the child unaltered, it's possible that
we would do a syscall restart when we shouldn't have.
In particular this breaks the case of debugging a process under a gdb
which is being debugged by yet another gdb. gdb uses sigsuspend
to wait for SIGCHLD of the inferior, but if gdb itself is being
debugged by a top-level gdb we get a ptrace_stop(). The top-level gdb
does a PTRACE_CONT with SIGCHLD to let the inferior gdb see the
signal. But ptrace_signal_deliver() assumed the debugger would cancel
out the signal and therefore did a syscall restart, because the return
error was ERESTARTNOHAND.
Fix this by simply making ptrace_signal_deliver() a nop, and providing
a way for the debugger to control system call restarting properly:
1) Report a "in syscall" software bit in regs->{tstate,psr}.
It is set early on in trap entry to a system call and is fully
visible to the debugger via ptrace() and regsets.
2) Test this bit right before doing a syscall restart. We have
to do a final recheck right after get_signal_to_deliver() in
case the debugger cleared the bit during ptrace_stop().
3) Clear the bit in trap return so we don't accidently try to set
that bit in the real register.
As a result we also get a ptrace_{is,clear}_syscall() for sparc32 just
like sparc64 has.
M68K has this same exact bug, and is now the only other user of the
ptrace_signal_deliver hook. It needs to be fixed in the same exact
way as sparc.
Signed-off-by: David S. Miller <davem@davemloft.net>
47 lines
2.0 KiB
C
47 lines
2.0 KiB
C
/* $Id: psrcompat.h,v 1.5 1998/10/06 09:28:39 jj Exp $ */
|
|
#ifndef _SPARC64_PSRCOMPAT_H
|
|
#define _SPARC64_PSRCOMPAT_H
|
|
|
|
#include <asm/pstate.h>
|
|
|
|
/* Old 32-bit PSR fields for the compatibility conversion code. */
|
|
#define PSR_CWP 0x0000001f /* current window pointer */
|
|
#define PSR_ET 0x00000020 /* enable traps field */
|
|
#define PSR_PS 0x00000040 /* previous privilege level */
|
|
#define PSR_S 0x00000080 /* current privilege level */
|
|
#define PSR_PIL 0x00000f00 /* processor interrupt level */
|
|
#define PSR_EF 0x00001000 /* enable floating point */
|
|
#define PSR_EC 0x00002000 /* enable co-processor */
|
|
#define PSR_SYSCALL 0x00004000 /* inside of a syscall */
|
|
#define PSR_LE 0x00008000 /* SuperSparcII little-endian */
|
|
#define PSR_ICC 0x00f00000 /* integer condition codes */
|
|
#define PSR_C 0x00100000 /* carry bit */
|
|
#define PSR_V 0x00200000 /* overflow bit */
|
|
#define PSR_Z 0x00400000 /* zero bit */
|
|
#define PSR_N 0x00800000 /* negative bit */
|
|
#define PSR_VERS 0x0f000000 /* cpu-version field */
|
|
#define PSR_IMPL 0xf0000000 /* cpu-implementation field */
|
|
|
|
#define PSR_V8PLUS 0xff000000 /* fake impl/ver, meaning a 64bit CPU is present */
|
|
#define PSR_XCC 0x000f0000 /* if PSR_V8PLUS, this is %xcc */
|
|
|
|
static inline unsigned int tstate_to_psr(unsigned long tstate)
|
|
{
|
|
return ((tstate & TSTATE_CWP) |
|
|
PSR_S |
|
|
((tstate & TSTATE_ICC) >> 12) |
|
|
((tstate & TSTATE_XCC) >> 20) |
|
|
((tstate & TSTATE_SYSCALL) ? PSR_SYSCALL : 0) |
|
|
PSR_V8PLUS);
|
|
}
|
|
|
|
static inline unsigned long psr_to_tstate_icc(unsigned int psr)
|
|
{
|
|
unsigned long tstate = ((unsigned long)(psr & PSR_ICC)) << 12;
|
|
if ((psr & (PSR_VERS|PSR_IMPL)) == PSR_V8PLUS)
|
|
tstate |= ((unsigned long)(psr & PSR_XCC)) << 20;
|
|
return tstate;
|
|
}
|
|
|
|
#endif /* !(_SPARC64_PSRCOMPAT_H) */
|