Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

[PATCH] s390: uml ptrace fixes

To make UML build and run on s390, I needed to do these two little
changes:

1) UML includes some of the subarch's (s390) headers. I had to
change one of them with the following one-liner, to make this
compile. AFAICS, this change doesn't break compilation of s390
itself.

2) UML needs to intercept syscalls via ptrace to invalidate the syscall,
read syscall's parameters and write the result with the result of
UML's syscall processing. Also, UML needs to make sure, that the host
does no syscall restart processing. On i386 for example, this can be
done by writing -1 to orig_eax on the 2nd syscall interception
(orig_eax is the syscall number, which after the interception is used
as a "interrupt was a syscall" flag only.
Unfortunately, s390 holds syscall number and syscall result in gpr2 and
its "interrupt was a syscall" flag (trap) is unreachable via ptrace.
So I changed the host to set trap to -1, if the syscall number is changed
to an invalid value on the first syscall interception.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Bodo Stroesser and committed by
Linus Torvalds
c5c3a6d8 778959db

+8 -1
+7
arch/s390/kernel/ptrace.c
··· 761 761 ? 0x80 : 0)); 762 762 763 763 /* 764 + * If the debuffer has set an invalid system call number, 765 + * we prepare to skip the system call restart handling. 766 + */ 767 + if (!entryexit && regs->gprs[2] >= NR_syscalls) 768 + regs->trap = -1; 769 + 770 + /* 764 771 * this isn't the same as continuing with a signal, but it will do 765 772 * for normal use. strace only continues with a signal if the 766 773 * stopping signal is not SIGTRAP. -brl
+1 -1
include/asm-s390/user.h
··· 10 10 #define _S390_USER_H 11 11 12 12 #include <asm/page.h> 13 - #include <linux/ptrace.h> 13 + #include <asm/ptrace.h> 14 14 /* Core file format: The core file is written in such a way that gdb 15 15 can understand it and provide useful information to the user (under 16 16 linux we use the 'trad-core' bfd). There are quite a number of