1999-02-19 03:21:36 +03:00
/*
* Copyright ( c ) 1991 , 1992 Paul Kranenburg < pk @ cs . few . eur . nl >
* Copyright ( c ) 1993 Branko Lankester < branko @ hacktic . nl >
* Copyright ( c ) 1993 , 1994 , 1995 , 1996 Rick Sladkey < jrs @ world . std . com >
1999-12-23 17:20:14 +03:00
* Copyright ( c ) 1996 - 1999 Wichert Akkerman < wichert @ cistron . nl >
* Copyright ( c ) 1999 IBM Deutschland Entwicklung GmbH , IBM Corporation
* Linux for s390 port by D . J . Barrow
* < barrow_dj @ mail . yahoo . com , djbarrow @ de . ibm . com >
1999-02-19 03:21:36 +03:00
* All rights reserved .
*
* Redistribution and use in source and binary forms , with or without
* modification , are permitted provided that the following conditions
* are met :
* 1. Redistributions of source code must retain the above copyright
* notice , this list of conditions and the following disclaimer .
* 2. Redistributions in binary form must reproduce the above copyright
* notice , this list of conditions and the following disclaimer in the
* documentation and / or other materials provided with the distribution .
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission .
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ` ` AS IS ' ' AND ANY EXPRESS OR
* IMPLIED WARRANTIES , INCLUDING , BUT NOT LIMITED TO , THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED .
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT , INDIRECT ,
* INCIDENTAL , SPECIAL , EXEMPLARY , OR CONSEQUENTIAL DAMAGES ( INCLUDING , BUT
* NOT LIMITED TO , PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES ; LOSS OF USE ,
* DATA , OR PROFITS ; OR BUSINESS INTERRUPTION ) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY , WHETHER IN CONTRACT , STRICT LIABILITY , OR TORT
* ( INCLUDING NEGLIGENCE OR OTHERWISE ) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE , EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE .
*/
# include "defs.h"
# include <sys/param.h>
1999-06-24 17:55:29 +04:00
2015-02-13 05:12:14 +03:00
/* for struct iovec */
# include <sys/uio.h>
2014-10-20 03:02:48 +04:00
2015-02-28 15:20:21 +03:00
# include "regs.h"
2015-02-13 03:26:38 +03:00
# include "ptrace.h"
1999-07-14 02:20:16 +04:00
2012-02-25 05:38:52 +04:00
# if defined(SPARC64)
2004-07-07 David S. Miller <davem@nuts.davemloft.net>
* linux/sparc/syscallent.h: Sync with reality.
* linux/sparc/syscall.h (sys_sendfile64, sys_futex, sys_gettid,
sys_sched_setaffinity, sys_sched_getaffinity, sys_setxattr,
sys_lsetxattr, sys_fsetxattr, sys_getxattr, sys_lgetxattr,
sys_fgetxattr, sys_listxattr, sys_llistxattr, sys_flistxattr,
sys_removexattr, sys_lremovexattr, sys_fremovexattr,
sys_remap_file_pages, sys_readahead, sys_tgkill, sys_statfs64,
sys_fstatfs64, sys_clock_settime, sys_clock_gettime,
sys_clock_getres, sys_clock_nanosleep, sys_timer_create,
sys_timer_settime, sys_timer_gettime): New declarations.
* linux/sparc64/dummy2.h, linux/sparc64/syscallent2.h,
linux/sparc64/syscall.h, linux/sparc64/errnoent.h,
linux/sparc64/errnoent1.h, linux/sparc64/errnoent2.h,
linux/sparc64/ioctlent.h, linux/sparc64/ioctlent1.h,
linux/sparc64/ioctlent2.h, linux/sparc64/signalent.h,
linux/sparc64/signalent.h, linux/sparc64/signalent.h,
linux/sparc64/signalent1.h, linux/sparc64/signalent2.h,
linux/sparc64/syscall1.h, linux/sparc64/syscallent.h,
linux/sparc64/syscallent1.h: New files.
* defs.h (LINUXSPARC): Define also when SPARC64.
(LINUX && SPARC64): Set SUPPORTED_PERSONALITIES to 3.
Ignore SIGTRAP after execve by defining TCB_WAITEXECVE.
Define possibly missing __NR_exit_group. Declare getrval2.
* configure.ac (sparc64): New architecture case.
* config.h.in (SPARC64): New define.
* file.c (stat_sparc64): New structure.
(printstat_sparc64): New output routine for that.
(printstat): Call it, if personality is 2.
(printstat64): Likewise.
* util.c: Conditionalize ptrace defines on LINUXSPARC
not LINUX && SPARC.
(SPARC64 && LINUX): Define r_pc to r_tpc, and PTRACE_FOOREGS
to PTRACE_FOOREGS64 so that more sparc code can be shared
between 64-bit and 32-bit.
(_hack_syscall5): Correct trap number when SPARC64.
(PTRACE_WRITE{TEXT,DATA}): Add SPARC64 to ifdef guard.
(getpc): Handle SPARC64 && LINUX.
(printcall): Likewise.
(arg fetching/setting): Use same code for SPARC64 LINUX
as for SPARC.
(setbpt): Handle SPARC64 && LINUX.
(clearbpt): Likewise.
* signal.c: Conditionalize ptrace defines on SPARC and
SPARC64.
(SPARC64 && LINUX): Define r_pc to r_tpc, and PTRACE_FOOREGS
to PTRACE_FOOREGS64 so that more sparc code can be shared
between 64-bit and 32-bit.
(m_siginfo): Use same definition on SPARC64 as SPARC.
(sys_sigreturn): Handle LINUX && SPARC64.
* syscall.c: Conditionalize ptrace defines on SPARC and
SPARC64.
(SPARC64 && LINUX): Define r_pc to r_tpc, and PTRACE_FOOREGS
to PTRACE_FOOREGS64 so that more sparc code can be shared
between 64-bit and 32-bit.
(getscno): Use same static state on SPARC64 as SPARC,
and add SPARC64 handling.
(get_error): Handle LINUX && SPARC64.
(force_result): Likewise.
(syscall_enter): Likewise.
(trace_syscall): Handle sys_socketcall and sys_ipc on SPARC64
just like SPARC.
(getrval2): Handle LINUX && SPARC64.
* process.c: Conditionalize ptrace defines on SPARC and
SPARC64.
(SPARC64 && LINUX): Define r_pc to r_tpc, and PTRACE_FOOREGS
to PTRACE_FOOREGS64 so that more sparc code can be shared
between 64-bit and 32-bit.
(change_syscall): Handle LINUX && SPARC64.
(struct_user_offsets): Ifdef out those which do not exist
on SPARC64.
* net.c (sys_pipe): Handle LINUX && SPARC64.
* ioctl.c: Fix initializer typo for nioctlents2, was
nioctlents1 by accident.
2004-07-12 11:44:08 +04:00
# undef PTRACE_GETREGS
# define PTRACE_GETREGS PTRACE_GETREGS64
# undef PTRACE_SETREGS
# define PTRACE_SETREGS PTRACE_SETREGS64
2012-02-25 05:38:52 +04:00
# endif
2004-07-07 David S. Miller <davem@nuts.davemloft.net>
* linux/sparc/syscallent.h: Sync with reality.
* linux/sparc/syscall.h (sys_sendfile64, sys_futex, sys_gettid,
sys_sched_setaffinity, sys_sched_getaffinity, sys_setxattr,
sys_lsetxattr, sys_fsetxattr, sys_getxattr, sys_lgetxattr,
sys_fgetxattr, sys_listxattr, sys_llistxattr, sys_flistxattr,
sys_removexattr, sys_lremovexattr, sys_fremovexattr,
sys_remap_file_pages, sys_readahead, sys_tgkill, sys_statfs64,
sys_fstatfs64, sys_clock_settime, sys_clock_gettime,
sys_clock_getres, sys_clock_nanosleep, sys_timer_create,
sys_timer_settime, sys_timer_gettime): New declarations.
* linux/sparc64/dummy2.h, linux/sparc64/syscallent2.h,
linux/sparc64/syscall.h, linux/sparc64/errnoent.h,
linux/sparc64/errnoent1.h, linux/sparc64/errnoent2.h,
linux/sparc64/ioctlent.h, linux/sparc64/ioctlent1.h,
linux/sparc64/ioctlent2.h, linux/sparc64/signalent.h,
linux/sparc64/signalent.h, linux/sparc64/signalent.h,
linux/sparc64/signalent1.h, linux/sparc64/signalent2.h,
linux/sparc64/syscall1.h, linux/sparc64/syscallent.h,
linux/sparc64/syscallent1.h: New files.
* defs.h (LINUXSPARC): Define also when SPARC64.
(LINUX && SPARC64): Set SUPPORTED_PERSONALITIES to 3.
Ignore SIGTRAP after execve by defining TCB_WAITEXECVE.
Define possibly missing __NR_exit_group. Declare getrval2.
* configure.ac (sparc64): New architecture case.
* config.h.in (SPARC64): New define.
* file.c (stat_sparc64): New structure.
(printstat_sparc64): New output routine for that.
(printstat): Call it, if personality is 2.
(printstat64): Likewise.
* util.c: Conditionalize ptrace defines on LINUXSPARC
not LINUX && SPARC.
(SPARC64 && LINUX): Define r_pc to r_tpc, and PTRACE_FOOREGS
to PTRACE_FOOREGS64 so that more sparc code can be shared
between 64-bit and 32-bit.
(_hack_syscall5): Correct trap number when SPARC64.
(PTRACE_WRITE{TEXT,DATA}): Add SPARC64 to ifdef guard.
(getpc): Handle SPARC64 && LINUX.
(printcall): Likewise.
(arg fetching/setting): Use same code for SPARC64 LINUX
as for SPARC.
(setbpt): Handle SPARC64 && LINUX.
(clearbpt): Likewise.
* signal.c: Conditionalize ptrace defines on SPARC and
SPARC64.
(SPARC64 && LINUX): Define r_pc to r_tpc, and PTRACE_FOOREGS
to PTRACE_FOOREGS64 so that more sparc code can be shared
between 64-bit and 32-bit.
(m_siginfo): Use same definition on SPARC64 as SPARC.
(sys_sigreturn): Handle LINUX && SPARC64.
* syscall.c: Conditionalize ptrace defines on SPARC and
SPARC64.
(SPARC64 && LINUX): Define r_pc to r_tpc, and PTRACE_FOOREGS
to PTRACE_FOOREGS64 so that more sparc code can be shared
between 64-bit and 32-bit.
(getscno): Use same static state on SPARC64 as SPARC,
and add SPARC64 handling.
(get_error): Handle LINUX && SPARC64.
(force_result): Likewise.
(syscall_enter): Likewise.
(trace_syscall): Handle sys_socketcall and sys_ipc on SPARC64
just like SPARC.
(getrval2): Handle LINUX && SPARC64.
* process.c: Conditionalize ptrace defines on SPARC and
SPARC64.
(SPARC64 && LINUX): Define r_pc to r_tpc, and PTRACE_FOOREGS
to PTRACE_FOOREGS64 so that more sparc code can be shared
between 64-bit and 32-bit.
(change_syscall): Handle LINUX && SPARC64.
(struct_user_offsets): Ifdef out those which do not exist
on SPARC64.
* net.c (sys_pipe): Handle LINUX && SPARC64.
* ioctl.c: Fix initializer typo for nioctlents2, was
nioctlents1 by accident.
2004-07-12 11:44:08 +04:00
2015-02-13 05:12:14 +03:00
# if defined SPARC64
# include <asm / psrcompat.h>
# elif defined SPARC
# include <asm / psr.h>
2013-02-14 06:29:48 +04:00
# endif
2015-03-06 02:30:02 +03:00
# ifdef IA64
# include <asm / rse.h>
# endif
2015-02-14 01:53:00 +03:00
# ifndef NT_PRSTATUS
# define NT_PRSTATUS 1
# endif
1999-02-19 03:21:36 +03:00
# ifndef NSIG
2012-02-25 05:44:25 +04:00
# warning: NSIG is not defined, using 32
# define NSIG 32
1999-02-19 03:21:36 +03:00
# endif
# include "syscall.h"
/* Define these shorthand notations to simplify the syscallent files. */
2005-07-05 07:25:35 +04:00
# define TD TRACE_DESC
1999-02-19 03:21:36 +03:00
# define TF TRACE_FILE
# define TI TRACE_IPC
# define TN TRACE_NETWORK
# define TP TRACE_PROCESS
# define TS TRACE_SIGNAL
Add -e trace=memory option
Add a new 'memory' category for tracing memory mapping related syscalls.
Affected syscalls are: break, brk, get_mempolicy, madvise, mbind,
migrate_pages, mincore, mlock, mlockall, mmap, move_pages, mprotect,
mremap, msync, munlock, munlockall, munmap, remap_file_pages, and
set_mempolicy.
* defs.h (TRACE_MEMORY): New macro.
* syscall.c (lookup_class): Handle trace=memory option.
* strace.1: Document it.
* linux/alpha/syscallent.h: Add TM flag to memory mapping related syscalls.
* linux/arm/syscallent.h: Likewise.
* linux/avr32/syscallent.h: Likewise.
* linux/bfin/syscallent.h: Likewise.
* linux/hppa/syscallent.h: Likewise.
* linux/i386/syscallent.h: Likewise.
* linux/ia64/syscallent.h: Likewise.
* linux/m68k/syscallent.h: Likewise.
* linux/microblaze/syscallent.h: Likewise.
* linux/mips/syscallent.h: Likewise.
* linux/powerpc/syscallent.h: Likewise.
* linux/s390/syscallent.h: Likewise.
* linux/s390x/syscallent.h: Likewise.
* linux/sh/syscallent.h: Likewise.
* linux/sh64/syscallent.h: Likewise.
* linux/sparc/syscallent.h: Likewise.
* linux/tile/syscallent.h: Likewise.
* linux/x32/syscallent.h: Likewise.
* linux/x86_64/syscallent.h: Likewise.
Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
2012-10-24 06:41:57 +04:00
# define TM TRACE_MEMORY
2011-01-18 20:36:20 +03:00
# define NF SYSCALL_NEVER_FAILS
2011-08-23 15:24:17 +04:00
# define MA MAX_ARGS
2014-04-16 10:33:11 +04:00
# define SI STACKTRACE_INVALIDATE_CACHE
# define SE STACKTRACE_CAPTURE_ON_ENTER
1999-02-19 03:21:36 +03:00
2013-02-22 16:37:36 +04:00
const struct_sysent sysent0 [ ] = {
1999-02-19 03:21:36 +03:00
# include "syscallent.h"
} ;
2013-02-22 16:26:10 +04:00
# if SUPPORTED_PERSONALITIES > 1
static const struct_sysent sysent1 [ ] = {
2012-02-25 05:44:25 +04:00
# include "syscallent1.h"
1999-02-19 03:21:36 +03:00
} ;
Small optimization in signal and ioctl tables
Trivial shuffling of data tables puts them all in one file,
allowing gcc to see their sizes and eliminate variables
which store these sizes.
Surprisingly, in C mode gcc does not optimize out static const int
variables. Help it by using enums instead.
* defs.h: Stop exporting ioctlent{0,1,2}, nioctlents{0,1,2},
signalent{0,1,2}, nsignals{0,1,2}.
* ioctl.c: Remove definitions of ioctlent{,0,1,2} and nioctlents{,0,1,2}.
* signal.c: Remove definitions of signalent{,0,1,2} and nsignals{,0,1,2}.
* syscall.c: Move above definitions to this file. Make them static const
or enums if suitable.
2011-08-20 04:12:33 +04:00
# endif
1999-02-19 03:21:36 +03:00
2013-02-22 16:26:10 +04:00
# if SUPPORTED_PERSONALITIES > 2
static const struct_sysent sysent2 [ ] = {
2012-02-25 05:44:25 +04:00
# include "syscallent2.h"
1999-02-19 03:21:36 +03:00
} ;
Small optimization in signal and ioctl tables
Trivial shuffling of data tables puts them all in one file,
allowing gcc to see their sizes and eliminate variables
which store these sizes.
Surprisingly, in C mode gcc does not optimize out static const int
variables. Help it by using enums instead.
* defs.h: Stop exporting ioctlent{0,1,2}, nioctlents{0,1,2},
signalent{0,1,2}, nsignals{0,1,2}.
* ioctl.c: Remove definitions of ioctlent{,0,1,2} and nioctlents{,0,1,2}.
* signal.c: Remove definitions of signalent{,0,1,2} and nsignals{,0,1,2}.
* syscall.c: Move above definitions to this file. Make them static const
or enums if suitable.
2011-08-20 04:12:33 +04:00
# endif
1999-02-19 03:21:36 +03:00
/* Now undef them since short defines cause wicked namespace pollution. */
2005-07-05 07:25:35 +04:00
# undef TD
1999-02-19 03:21:36 +03:00
# undef TF
# undef TI
# undef TN
# undef TP
# undef TS
Add -e trace=memory option
Add a new 'memory' category for tracing memory mapping related syscalls.
Affected syscalls are: break, brk, get_mempolicy, madvise, mbind,
migrate_pages, mincore, mlock, mlockall, mmap, move_pages, mprotect,
mremap, msync, munlock, munlockall, munmap, remap_file_pages, and
set_mempolicy.
* defs.h (TRACE_MEMORY): New macro.
* syscall.c (lookup_class): Handle trace=memory option.
* strace.1: Document it.
* linux/alpha/syscallent.h: Add TM flag to memory mapping related syscalls.
* linux/arm/syscallent.h: Likewise.
* linux/avr32/syscallent.h: Likewise.
* linux/bfin/syscallent.h: Likewise.
* linux/hppa/syscallent.h: Likewise.
* linux/i386/syscallent.h: Likewise.
* linux/ia64/syscallent.h: Likewise.
* linux/m68k/syscallent.h: Likewise.
* linux/microblaze/syscallent.h: Likewise.
* linux/mips/syscallent.h: Likewise.
* linux/powerpc/syscallent.h: Likewise.
* linux/s390/syscallent.h: Likewise.
* linux/s390x/syscallent.h: Likewise.
* linux/sh/syscallent.h: Likewise.
* linux/sh64/syscallent.h: Likewise.
* linux/sparc/syscallent.h: Likewise.
* linux/tile/syscallent.h: Likewise.
* linux/x32/syscallent.h: Likewise.
* linux/x86_64/syscallent.h: Likewise.
Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
2012-10-24 06:41:57 +04:00
# undef TM
2011-01-18 20:36:20 +03:00
# undef NF
2011-08-23 15:24:17 +04:00
# undef MA
2014-04-16 10:33:11 +04:00
# undef SI
# undef SE
1999-02-19 03:21:36 +03:00
Small optimization in signal and ioctl tables
Trivial shuffling of data tables puts them all in one file,
allowing gcc to see their sizes and eliminate variables
which store these sizes.
Surprisingly, in C mode gcc does not optimize out static const int
variables. Help it by using enums instead.
* defs.h: Stop exporting ioctlent{0,1,2}, nioctlents{0,1,2},
signalent{0,1,2}, nsignals{0,1,2}.
* ioctl.c: Remove definitions of ioctlent{,0,1,2} and nioctlents{,0,1,2}.
* signal.c: Remove definitions of signalent{,0,1,2} and nsignals{,0,1,2}.
* syscall.c: Move above definitions to this file. Make them static const
or enums if suitable.
2011-08-20 04:12:33 +04:00
/*
ioctl: take all 32 bits of ioctl commands into account
Historically, only 16 bits (8-bit number and 8-bit type) of 32-bit ioctl
commands were used for decoding, which was the source for numerous
annoying collisions like this:
ioctl(0, SNDCTL_TMR_TIMEBASE or SNDRV_TIMER_IOCTL_NEXT_DEVICE or TCGETS, {B38400 opost isig icanon echo ...}) = 0
ioctl(0, MGSL_IOCGPARAMS or MMTIMER_GETRES or MTIOCTOP or SNDCTL_MIDI_MPUMODE, 0x7fffd47f7338) = -1 ENOTTY (Inappropriate ioctl for device)
The solution is to use all 32 bits for decoding, not just "number" and
"type", but also "size" and "direction".
As some architectures override defaults that come from asm-generic/ and
provide alternative definitions for some ioctl commands, we support
per-architecture ioctl definitions and merge them with common
definitions at build time. During the merge, we used to keep both
generic and architecture-specific definitions, now architecture-specific
definitions have precedence over generic ones -- ioctlsort omits
definitions from asm-generic/ for those ioctl names that have different
definitions in asm/.
Additional bits of "direction" are architecture specific -- the number
of bits and their values differ between architectures. To reduce
architecture differences in the source code, we keep "direction" in
symbolic form and compile it in ioctlsort.
Additional bits of "size" are also architecture specific -- not only the
number of bits differ between architectures, but sizes of many types
depend on sizeof(long). To reduce architecture differences in the
source code, we keep 32-bit and 64-bit versions of common ioctl
definitions, and use the appropriate version for each architecture and
personality.
To implement this, the tools for generating ioctl definitions from
kernel headers have been rewritten, and the source format of ioctl
definitions has been extended. The final ioctlent*.h files that are
included by syscall.c are now generated from source ioctls_inc*.h and
ioctls_arch*.h files at build time with ioctlsort.
* ioctl.c (ioctl_lookup): Use all 32 bits of ioctl command code.
* ioctlsort.c: Rewritten.
* linux/32/ioctls_inc.h: New file.
* linux/64/ioctls_inc.h: New file.
* linux/aarch64/ioctls_arch0.h: New file.
* linux/aarch64/ioctls_arch1.h: New file.
* linux/aarch64/ioctls_inc0.h: New file.
* linux/aarch64/ioctls_inc1.h: New file.
* linux/alpha/ioctls_arch0.h: New file.
* linux/alpha/ioctls_inc0.h: New file.
* linux/arc/ioctls_arch0.h: New file.
* linux/arc/ioctls_inc0.h: New file.
* linux/arm/ioctls_arch0.h: New file.
* linux/arm/ioctls_inc0.h: New file.
* linux/avr32/ioctls_arch0.h: New file.
* linux/avr32/ioctls_inc0.h: New file.
* linux/bfin/ioctls_arch0.h: New file.
* linux/bfin/ioctls_inc0.h: New file.
* linux/hppa/ioctls_arch0.h: New file.
* linux/hppa/ioctls_inc0.h: New file.
* linux/i386/ioctls_arch0.h: New file.
* linux/i386/ioctls_inc0.h: New file.
* linux/ia64/ioctls_arch0.h: New file.
* linux/ia64/ioctls_inc0.h: New file.
* linux/m68k/ioctls_arch0.h: New file.
* linux/m68k/ioctls_inc0.h: New file.
* linux/metag/ioctls_arch0.h: New file.
* linux/metag/ioctls_inc0.h: New file.
* linux/microblaze/ioctls_arch0.h: New file.
* linux/microblaze/ioctls_inc0.h: New file.
* linux/mips/ioctls_arch0.h: New file.
* linux/mips/ioctls_inc0.h: New file.
* linux/or1k/ioctls_arch0.h: New file.
* linux/or1k/ioctls_inc0.h: New file.
* linux/powerpc/ioctls_arch0.h: New file.
* linux/powerpc/ioctls_inc0.h: New file.
* linux/powerpc64/ioctls_arch0.h: New file.
* linux/powerpc64/ioctls_arch1.h: New file.
* linux/powerpc64/ioctls_inc0.h: New file.
* linux/powerpc64/ioctls_inc1.h: New file.
* linux/s390/ioctls_arch0.h: New file.
* linux/s390/ioctls_inc0.h: New file.
* linux/s390x/ioctls_arch0.h: New file.
* linux/s390x/ioctls_inc0.h: New file.
* linux/sh/ioctls_arch0.h: New file.
* linux/sh/ioctls_inc0.h: New file.
* linux/sh64/ioctls_arch0.h: New file.
* linux/sh64/ioctls_inc0.h: New file.
* linux/sparc/ioctls_arch0.h: New file.
* linux/sparc/ioctls_inc0.h: New file.
* linux/sparc64/ioctls_arch0.h: New file.
* linux/sparc64/ioctls_arch2.h: New file.
* linux/sparc64/ioctls_inc0.h: New file.
* linux/sparc64/ioctls_inc2.h: New file.
* linux/tile/ioctls_arch0.h: New file.
* linux/tile/ioctls_arch1.h: New file.
* linux/tile/ioctls_inc0.h: New file.
* linux/tile/ioctls_inc1.h: New file.
* linux/x32/ioctls_arch0.h: New file.
* linux/x32/ioctls_arch1.h: New file.
* linux/x32/ioctls_inc0.h: New file.
* linux/x32/ioctls_inc1.h: New file.
* linux/x86_64/ioctls_arch0.h: New file.
* linux/x86_64/ioctls_arch1.h: New file.
* linux/x86_64/ioctls_inc0.h: New file.
* linux/x86_64/ioctls_inc1.h: New file.
* linux/xtensa/ioctls_arch0.h: New file.
* linux/xtensa/ioctls_inc0.h: New file.
* linux/aarch64/ioctlent.h.in: Remove.
* linux/aarch64/ioctlent1.h: Remove.
* linux/alpha/ioctlent.h.in: Remove.
* linux/arc/ioctlent.h.in: Remove.
* linux/arm/ioctlent.h.in: Remove.
* linux/avr32/ioctlent.h.in: Remove.
* linux/bfin/ioctlent.h.in: Remove.
* linux/hppa/ioctlent.h.in: Remove.
* linux/i386/ioctlent.h.in: Remove.
* linux/ia64/ioctlent.h.in: Remove.
* linux/ioctlent.h.in: Remove.
* linux/ioctlent.sh: Remove.
* linux/m68k/ioctlent.h.in: Remove.
* linux/metag/ioctlent.h.in: Remove.
* linux/microblaze/ioctlent.h.in: Remove.
* linux/mips/ioctlent.h.in: Remove.
* linux/mips/ioctlent.sh: Remove.
* linux/or1k/ioctlent.h.in: Remove.
* linux/powerpc/ioctlent.h.in: Remove.
* linux/powerpc64/ioctlent.h: Remove.
* linux/powerpc64/ioctlent1.h: Remove.
* linux/s390/ioctlent.h.in: Remove.
* linux/s390x/ioctlent.h.in: Remove.
* linux/sh/ioctlent.h.in: Remove.
* linux/sh64/ioctlent.h.in: Remove.
* linux/sparc/ioctlent.h.in: Remove.
* linux/sparc64/ioctlent.h.in: Remove.
* linux/sparc64/ioctlent2.h: Remove.
* linux/tile/ioctlent.h.in: Remove.
* linux/tile/ioctlent1.h: Remove.
* linux/x32/ioctlent.h.in: Remove.
* linux/x32/ioctlent1.h: Remove.
* linux/x86_64/ioctlent.h.in: Remove.
* linux/x86_64/ioctlent1.h: Remove.
* linux/xtensa/ioctlent.h.in: Remove.
* linux/x86_64/ioctlent2.h: Include ioctlent0.h instead of ioctlent.h.
* syscall.c (struct_ioctlent ioctlent0): Likewise.
* Makefile.am: Remove all ioctlent-related definitions.
Define the list of ioctlent*.h files that have to be generated by
presence of $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h files.
Add rules for ioctlent*.h files generation.
(EXTRA_DIST): Update.
* maint/ioctls_gen.sh: New file.
* maint/ioctls_hex.sh: New file.
* maint/ioctls_sym.sh: New file.
* maint/print_ioctlent.c: New file.
* HACKING-scripts: Update for ioctlent.sh -> ioctls_gen.sh migration.
* .gitignore: Add ioctlent[012].h and ioctls_all[012].h.
* configure.ac (AC_CHECK_HEADERS): Add linux/hiddev.h
and linux/mmtimer.h for tests.
* tests/ioctl.c: New file.
* tests/ioctl.test: New test.
* tests/Makefile.am (check_PROGRAMS): Add ioctl.
(TESTS): Add ioctl.test.
* tests/.gitignore: Add ioctl.
2015-01-19 20:02:16 +03:00
* ` ioctlent [ 012 ] . h ' files are automatically generated by the auxiliary
Small optimization in signal and ioctl tables
Trivial shuffling of data tables puts them all in one file,
allowing gcc to see their sizes and eliminate variables
which store these sizes.
Surprisingly, in C mode gcc does not optimize out static const int
variables. Help it by using enums instead.
* defs.h: Stop exporting ioctlent{0,1,2}, nioctlents{0,1,2},
signalent{0,1,2}, nsignals{0,1,2}.
* ioctl.c: Remove definitions of ioctlent{,0,1,2} and nioctlents{,0,1,2}.
* signal.c: Remove definitions of signalent{,0,1,2} and nsignals{,0,1,2}.
* syscall.c: Move above definitions to this file. Make them static const
or enums if suitable.
2011-08-20 04:12:33 +04:00
* program ` ioctlsort ' , such that the list is sorted by the ` code ' field .
* This has the side - effect of resolving the _IO . . macros into
* plain integers , eliminating the need to include here everything
* in " /usr/include " .
*/
2013-02-22 16:37:36 +04:00
const char * const errnoent0 [ ] = {
1999-02-19 03:21:36 +03:00
# include "errnoent.h"
} ;
2013-02-22 16:37:36 +04:00
const char * const signalent0 [ ] = {
Small optimization in signal and ioctl tables
Trivial shuffling of data tables puts them all in one file,
allowing gcc to see their sizes and eliminate variables
which store these sizes.
Surprisingly, in C mode gcc does not optimize out static const int
variables. Help it by using enums instead.
* defs.h: Stop exporting ioctlent{0,1,2}, nioctlents{0,1,2},
signalent{0,1,2}, nsignals{0,1,2}.
* ioctl.c: Remove definitions of ioctlent{,0,1,2} and nioctlents{,0,1,2}.
* signal.c: Remove definitions of signalent{,0,1,2} and nsignals{,0,1,2}.
* syscall.c: Move above definitions to this file. Make them static const
or enums if suitable.
2011-08-20 04:12:33 +04:00
# include "signalent.h"
} ;
2013-02-22 16:37:36 +04:00
const struct_ioctlent ioctlent0 [ ] = {
ioctl: take all 32 bits of ioctl commands into account
Historically, only 16 bits (8-bit number and 8-bit type) of 32-bit ioctl
commands were used for decoding, which was the source for numerous
annoying collisions like this:
ioctl(0, SNDCTL_TMR_TIMEBASE or SNDRV_TIMER_IOCTL_NEXT_DEVICE or TCGETS, {B38400 opost isig icanon echo ...}) = 0
ioctl(0, MGSL_IOCGPARAMS or MMTIMER_GETRES or MTIOCTOP or SNDCTL_MIDI_MPUMODE, 0x7fffd47f7338) = -1 ENOTTY (Inappropriate ioctl for device)
The solution is to use all 32 bits for decoding, not just "number" and
"type", but also "size" and "direction".
As some architectures override defaults that come from asm-generic/ and
provide alternative definitions for some ioctl commands, we support
per-architecture ioctl definitions and merge them with common
definitions at build time. During the merge, we used to keep both
generic and architecture-specific definitions, now architecture-specific
definitions have precedence over generic ones -- ioctlsort omits
definitions from asm-generic/ for those ioctl names that have different
definitions in asm/.
Additional bits of "direction" are architecture specific -- the number
of bits and their values differ between architectures. To reduce
architecture differences in the source code, we keep "direction" in
symbolic form and compile it in ioctlsort.
Additional bits of "size" are also architecture specific -- not only the
number of bits differ between architectures, but sizes of many types
depend on sizeof(long). To reduce architecture differences in the
source code, we keep 32-bit and 64-bit versions of common ioctl
definitions, and use the appropriate version for each architecture and
personality.
To implement this, the tools for generating ioctl definitions from
kernel headers have been rewritten, and the source format of ioctl
definitions has been extended. The final ioctlent*.h files that are
included by syscall.c are now generated from source ioctls_inc*.h and
ioctls_arch*.h files at build time with ioctlsort.
* ioctl.c (ioctl_lookup): Use all 32 bits of ioctl command code.
* ioctlsort.c: Rewritten.
* linux/32/ioctls_inc.h: New file.
* linux/64/ioctls_inc.h: New file.
* linux/aarch64/ioctls_arch0.h: New file.
* linux/aarch64/ioctls_arch1.h: New file.
* linux/aarch64/ioctls_inc0.h: New file.
* linux/aarch64/ioctls_inc1.h: New file.
* linux/alpha/ioctls_arch0.h: New file.
* linux/alpha/ioctls_inc0.h: New file.
* linux/arc/ioctls_arch0.h: New file.
* linux/arc/ioctls_inc0.h: New file.
* linux/arm/ioctls_arch0.h: New file.
* linux/arm/ioctls_inc0.h: New file.
* linux/avr32/ioctls_arch0.h: New file.
* linux/avr32/ioctls_inc0.h: New file.
* linux/bfin/ioctls_arch0.h: New file.
* linux/bfin/ioctls_inc0.h: New file.
* linux/hppa/ioctls_arch0.h: New file.
* linux/hppa/ioctls_inc0.h: New file.
* linux/i386/ioctls_arch0.h: New file.
* linux/i386/ioctls_inc0.h: New file.
* linux/ia64/ioctls_arch0.h: New file.
* linux/ia64/ioctls_inc0.h: New file.
* linux/m68k/ioctls_arch0.h: New file.
* linux/m68k/ioctls_inc0.h: New file.
* linux/metag/ioctls_arch0.h: New file.
* linux/metag/ioctls_inc0.h: New file.
* linux/microblaze/ioctls_arch0.h: New file.
* linux/microblaze/ioctls_inc0.h: New file.
* linux/mips/ioctls_arch0.h: New file.
* linux/mips/ioctls_inc0.h: New file.
* linux/or1k/ioctls_arch0.h: New file.
* linux/or1k/ioctls_inc0.h: New file.
* linux/powerpc/ioctls_arch0.h: New file.
* linux/powerpc/ioctls_inc0.h: New file.
* linux/powerpc64/ioctls_arch0.h: New file.
* linux/powerpc64/ioctls_arch1.h: New file.
* linux/powerpc64/ioctls_inc0.h: New file.
* linux/powerpc64/ioctls_inc1.h: New file.
* linux/s390/ioctls_arch0.h: New file.
* linux/s390/ioctls_inc0.h: New file.
* linux/s390x/ioctls_arch0.h: New file.
* linux/s390x/ioctls_inc0.h: New file.
* linux/sh/ioctls_arch0.h: New file.
* linux/sh/ioctls_inc0.h: New file.
* linux/sh64/ioctls_arch0.h: New file.
* linux/sh64/ioctls_inc0.h: New file.
* linux/sparc/ioctls_arch0.h: New file.
* linux/sparc/ioctls_inc0.h: New file.
* linux/sparc64/ioctls_arch0.h: New file.
* linux/sparc64/ioctls_arch2.h: New file.
* linux/sparc64/ioctls_inc0.h: New file.
* linux/sparc64/ioctls_inc2.h: New file.
* linux/tile/ioctls_arch0.h: New file.
* linux/tile/ioctls_arch1.h: New file.
* linux/tile/ioctls_inc0.h: New file.
* linux/tile/ioctls_inc1.h: New file.
* linux/x32/ioctls_arch0.h: New file.
* linux/x32/ioctls_arch1.h: New file.
* linux/x32/ioctls_inc0.h: New file.
* linux/x32/ioctls_inc1.h: New file.
* linux/x86_64/ioctls_arch0.h: New file.
* linux/x86_64/ioctls_arch1.h: New file.
* linux/x86_64/ioctls_inc0.h: New file.
* linux/x86_64/ioctls_inc1.h: New file.
* linux/xtensa/ioctls_arch0.h: New file.
* linux/xtensa/ioctls_inc0.h: New file.
* linux/aarch64/ioctlent.h.in: Remove.
* linux/aarch64/ioctlent1.h: Remove.
* linux/alpha/ioctlent.h.in: Remove.
* linux/arc/ioctlent.h.in: Remove.
* linux/arm/ioctlent.h.in: Remove.
* linux/avr32/ioctlent.h.in: Remove.
* linux/bfin/ioctlent.h.in: Remove.
* linux/hppa/ioctlent.h.in: Remove.
* linux/i386/ioctlent.h.in: Remove.
* linux/ia64/ioctlent.h.in: Remove.
* linux/ioctlent.h.in: Remove.
* linux/ioctlent.sh: Remove.
* linux/m68k/ioctlent.h.in: Remove.
* linux/metag/ioctlent.h.in: Remove.
* linux/microblaze/ioctlent.h.in: Remove.
* linux/mips/ioctlent.h.in: Remove.
* linux/mips/ioctlent.sh: Remove.
* linux/or1k/ioctlent.h.in: Remove.
* linux/powerpc/ioctlent.h.in: Remove.
* linux/powerpc64/ioctlent.h: Remove.
* linux/powerpc64/ioctlent1.h: Remove.
* linux/s390/ioctlent.h.in: Remove.
* linux/s390x/ioctlent.h.in: Remove.
* linux/sh/ioctlent.h.in: Remove.
* linux/sh64/ioctlent.h.in: Remove.
* linux/sparc/ioctlent.h.in: Remove.
* linux/sparc64/ioctlent.h.in: Remove.
* linux/sparc64/ioctlent2.h: Remove.
* linux/tile/ioctlent.h.in: Remove.
* linux/tile/ioctlent1.h: Remove.
* linux/x32/ioctlent.h.in: Remove.
* linux/x32/ioctlent1.h: Remove.
* linux/x86_64/ioctlent.h.in: Remove.
* linux/x86_64/ioctlent1.h: Remove.
* linux/xtensa/ioctlent.h.in: Remove.
* linux/x86_64/ioctlent2.h: Include ioctlent0.h instead of ioctlent.h.
* syscall.c (struct_ioctlent ioctlent0): Likewise.
* Makefile.am: Remove all ioctlent-related definitions.
Define the list of ioctlent*.h files that have to be generated by
presence of $(srcdir)/$(OS)/$(ARCH)/ioctls_inc*.h files.
Add rules for ioctlent*.h files generation.
(EXTRA_DIST): Update.
* maint/ioctls_gen.sh: New file.
* maint/ioctls_hex.sh: New file.
* maint/ioctls_sym.sh: New file.
* maint/print_ioctlent.c: New file.
* HACKING-scripts: Update for ioctlent.sh -> ioctls_gen.sh migration.
* .gitignore: Add ioctlent[012].h and ioctls_all[012].h.
* configure.ac (AC_CHECK_HEADERS): Add linux/hiddev.h
and linux/mmtimer.h for tests.
* tests/ioctl.c: New file.
* tests/ioctl.test: New test.
* tests/Makefile.am (check_PROGRAMS): Add ioctl.
(TESTS): Add ioctl.test.
* tests/.gitignore: Add ioctl.
2015-01-19 20:02:16 +03:00
# include "ioctlent0.h"
Small optimization in signal and ioctl tables
Trivial shuffling of data tables puts them all in one file,
allowing gcc to see their sizes and eliminate variables
which store these sizes.
Surprisingly, in C mode gcc does not optimize out static const int
variables. Help it by using enums instead.
* defs.h: Stop exporting ioctlent{0,1,2}, nioctlents{0,1,2},
signalent{0,1,2}, nsignals{0,1,2}.
* ioctl.c: Remove definitions of ioctlent{,0,1,2} and nioctlents{,0,1,2}.
* signal.c: Remove definitions of signalent{,0,1,2} and nsignals{,0,1,2}.
* syscall.c: Move above definitions to this file. Make them static const
or enums if suitable.
2011-08-20 04:12:33 +04:00
} ;
1999-02-19 03:21:36 +03:00
2013-02-22 16:26:10 +04:00
# if SUPPORTED_PERSONALITIES > 1
2004-09-03 Roland McGrath <roland@redhat.com>
* syscall.c (sysent0, sysent1, sysent2, sysent): Add const to defn.
(nsyscalls0, nsyscalls1, nsyscalls2): Likewise.
(errnoent0, errnoent1, errnoent2, errnoent): Likewise.
(nerrnos0, nerrnos1, nerrnos2): Likewise.
* signal.c (signalent0, signalent1, signalent2): Likewise.
(nsignals0, nsignals1, nsignals2): Likewise.
(signame): LIkewise.
* ioctl.c (ioctlent0, ioctlent1, ioctlent2): Likewise.
(nioctlents0, nioctlents1, nioctlents2): Likewise.
(ioctl_lookup, ioctl_next_match): Likewise.
* defs.h: Update decls.
* io.c (sys_ioctl): Update users.
2004-09-04 07:53:10 +04:00
static const char * const errnoent1 [ ] = {
2012-02-25 05:44:25 +04:00
# include "errnoent1.h"
1999-02-19 03:21:36 +03:00
} ;
Small optimization in signal and ioctl tables
Trivial shuffling of data tables puts them all in one file,
allowing gcc to see their sizes and eliminate variables
which store these sizes.
Surprisingly, in C mode gcc does not optimize out static const int
variables. Help it by using enums instead.
* defs.h: Stop exporting ioctlent{0,1,2}, nioctlents{0,1,2},
signalent{0,1,2}, nsignals{0,1,2}.
* ioctl.c: Remove definitions of ioctlent{,0,1,2} and nioctlents{,0,1,2}.
* signal.c: Remove definitions of signalent{,0,1,2} and nsignals{,0,1,2}.
* syscall.c: Move above definitions to this file. Make them static const
or enums if suitable.
2011-08-20 04:12:33 +04:00
static const char * const signalent1 [ ] = {
2012-02-25 05:44:25 +04:00
# include "signalent1.h"
Small optimization in signal and ioctl tables
Trivial shuffling of data tables puts them all in one file,
allowing gcc to see their sizes and eliminate variables
which store these sizes.
Surprisingly, in C mode gcc does not optimize out static const int
variables. Help it by using enums instead.
* defs.h: Stop exporting ioctlent{0,1,2}, nioctlents{0,1,2},
signalent{0,1,2}, nsignals{0,1,2}.
* ioctl.c: Remove definitions of ioctlent{,0,1,2} and nioctlents{,0,1,2}.
* signal.c: Remove definitions of signalent{,0,1,2} and nsignals{,0,1,2}.
* syscall.c: Move above definitions to this file. Make them static const
or enums if suitable.
2011-08-20 04:12:33 +04:00
} ;
2013-02-22 16:26:10 +04:00
static const struct_ioctlent ioctlent1 [ ] = {
2012-02-25 05:44:25 +04:00
# include "ioctlent1.h"
Small optimization in signal and ioctl tables
Trivial shuffling of data tables puts them all in one file,
allowing gcc to see their sizes and eliminate variables
which store these sizes.
Surprisingly, in C mode gcc does not optimize out static const int
variables. Help it by using enums instead.
* defs.h: Stop exporting ioctlent{0,1,2}, nioctlents{0,1,2},
signalent{0,1,2}, nsignals{0,1,2}.
* ioctl.c: Remove definitions of ioctlent{,0,1,2} and nioctlents{,0,1,2}.
* signal.c: Remove definitions of signalent{,0,1,2} and nsignals{,0,1,2}.
* syscall.c: Move above definitions to this file. Make them static const
or enums if suitable.
2011-08-20 04:12:33 +04:00
} ;
# endif
1999-02-19 03:21:36 +03:00
2013-02-22 16:26:10 +04:00
# if SUPPORTED_PERSONALITIES > 2
2004-09-03 Roland McGrath <roland@redhat.com>
* syscall.c (sysent0, sysent1, sysent2, sysent): Add const to defn.
(nsyscalls0, nsyscalls1, nsyscalls2): Likewise.
(errnoent0, errnoent1, errnoent2, errnoent): Likewise.
(nerrnos0, nerrnos1, nerrnos2): Likewise.
* signal.c (signalent0, signalent1, signalent2): Likewise.
(nsignals0, nsignals1, nsignals2): Likewise.
(signame): LIkewise.
* ioctl.c (ioctlent0, ioctlent1, ioctlent2): Likewise.
(nioctlents0, nioctlents1, nioctlents2): Likewise.
(ioctl_lookup, ioctl_next_match): Likewise.
* defs.h: Update decls.
* io.c (sys_ioctl): Update users.
2004-09-04 07:53:10 +04:00
static const char * const errnoent2 [ ] = {
2012-02-25 05:44:25 +04:00
# include "errnoent2.h"
1999-02-19 03:21:36 +03:00
} ;
Small optimization in signal and ioctl tables
Trivial shuffling of data tables puts them all in one file,
allowing gcc to see their sizes and eliminate variables
which store these sizes.
Surprisingly, in C mode gcc does not optimize out static const int
variables. Help it by using enums instead.
* defs.h: Stop exporting ioctlent{0,1,2}, nioctlents{0,1,2},
signalent{0,1,2}, nsignals{0,1,2}.
* ioctl.c: Remove definitions of ioctlent{,0,1,2} and nioctlents{,0,1,2}.
* signal.c: Remove definitions of signalent{,0,1,2} and nsignals{,0,1,2}.
* syscall.c: Move above definitions to this file. Make them static const
or enums if suitable.
2011-08-20 04:12:33 +04:00
static const char * const signalent2 [ ] = {
2012-02-25 05:44:25 +04:00
# include "signalent2.h"
Small optimization in signal and ioctl tables
Trivial shuffling of data tables puts them all in one file,
allowing gcc to see their sizes and eliminate variables
which store these sizes.
Surprisingly, in C mode gcc does not optimize out static const int
variables. Help it by using enums instead.
* defs.h: Stop exporting ioctlent{0,1,2}, nioctlents{0,1,2},
signalent{0,1,2}, nsignals{0,1,2}.
* ioctl.c: Remove definitions of ioctlent{,0,1,2} and nioctlents{,0,1,2}.
* signal.c: Remove definitions of signalent{,0,1,2} and nsignals{,0,1,2}.
* syscall.c: Move above definitions to this file. Make them static const
or enums if suitable.
2011-08-20 04:12:33 +04:00
} ;
2013-02-22 16:26:10 +04:00
static const struct_ioctlent ioctlent2 [ ] = {
2012-02-25 05:44:25 +04:00
# include "ioctlent2.h"
Small optimization in signal and ioctl tables
Trivial shuffling of data tables puts them all in one file,
allowing gcc to see their sizes and eliminate variables
which store these sizes.
Surprisingly, in C mode gcc does not optimize out static const int
variables. Help it by using enums instead.
* defs.h: Stop exporting ioctlent{0,1,2}, nioctlents{0,1,2},
signalent{0,1,2}, nsignals{0,1,2}.
* ioctl.c: Remove definitions of ioctlent{,0,1,2} and nioctlents{,0,1,2}.
* signal.c: Remove definitions of signalent{,0,1,2} and nsignals{,0,1,2}.
* syscall.c: Move above definitions to this file. Make them static const
or enums if suitable.
2011-08-20 04:12:33 +04:00
} ;
# endif
2013-02-27 02:02:30 +04:00
enum {
nsyscalls0 = ARRAY_SIZE ( sysent0 )
# if SUPPORTED_PERSONALITIES > 1
, nsyscalls1 = ARRAY_SIZE ( sysent1 )
# if SUPPORTED_PERSONALITIES > 2
, nsyscalls2 = ARRAY_SIZE ( sysent2 )
# endif
# endif
} ;
enum {
nerrnos0 = ARRAY_SIZE ( errnoent0 )
# if SUPPORTED_PERSONALITIES > 1
, nerrnos1 = ARRAY_SIZE ( errnoent1 )
# if SUPPORTED_PERSONALITIES > 2
, nerrnos2 = ARRAY_SIZE ( errnoent2 )
# endif
# endif
} ;
enum {
nsignals0 = ARRAY_SIZE ( signalent0 )
# if SUPPORTED_PERSONALITIES > 1
, nsignals1 = ARRAY_SIZE ( signalent1 )
# if SUPPORTED_PERSONALITIES > 2
, nsignals2 = ARRAY_SIZE ( signalent2 )
# endif
# endif
} ;
enum {
nioctlents0 = ARRAY_SIZE ( ioctlent0 )
# if SUPPORTED_PERSONALITIES > 1
, nioctlents1 = ARRAY_SIZE ( ioctlent1 )
# if SUPPORTED_PERSONALITIES > 2
, nioctlents2 = ARRAY_SIZE ( ioctlent2 )
# endif
# endif
} ;
2013-02-22 16:37:36 +04:00
# if SUPPORTED_PERSONALITIES > 1
2013-02-22 16:26:10 +04:00
const struct_sysent * sysent = sysent0 ;
2012-03-19 12:36:42 +04:00
const char * const * errnoent = errnoent0 ;
const char * const * signalent = signalent0 ;
2013-02-22 16:26:10 +04:00
const struct_ioctlent * ioctlent = ioctlent0 ;
2013-02-22 16:37:36 +04:00
# endif
2012-03-19 12:36:42 +04:00
unsigned nsyscalls = nsyscalls0 ;
unsigned nerrnos = nerrnos0 ;
unsigned nsignals = nsignals0 ;
unsigned nioctlents = nioctlents0 ;
2013-02-22 16:37:36 +04:00
unsigned num_quals ;
qualbits_t * qual_vec [ SUPPORTED_PERSONALITIES ] ;
static const unsigned nsyscall_vec [ SUPPORTED_PERSONALITIES ] = {
nsyscalls0 ,
# if SUPPORTED_PERSONALITIES > 1
nsyscalls1 ,
# endif
# if SUPPORTED_PERSONALITIES > 2
nsyscalls2 ,
# endif
} ;
static const struct_sysent * const sysent_vec [ SUPPORTED_PERSONALITIES ] = {
sysent0 ,
# if SUPPORTED_PERSONALITIES > 1
sysent1 ,
# endif
# if SUPPORTED_PERSONALITIES > 2
sysent2 ,
# endif
} ;
enum {
MAX_NSYSCALLS1 = ( nsyscalls0
# if SUPPORTED_PERSONALITIES > 1
> nsyscalls1 ? nsyscalls0 : nsyscalls1
# endif
) ,
MAX_NSYSCALLS2 = ( MAX_NSYSCALLS1
# if SUPPORTED_PERSONALITIES > 2
> nsyscalls2 ? MAX_NSYSCALLS1 : nsyscalls2
# endif
) ,
MAX_NSYSCALLS = MAX_NSYSCALLS2 ,
/* We are ready for arches with up to 255 signals,
* even though the largest known signo is on MIPS and it is 128.
* The number of existing syscalls on all arches is
* larger that 255 anyway , so it is just a pedantic matter .
*/
MIN_QUALS = MAX_NSYSCALLS > 255 ? MAX_NSYSCALLS : 255
} ;
1999-02-19 03:21:36 +03:00
2012-03-19 12:36:42 +04:00
# if SUPPORTED_PERSONALITIES > 1
2013-02-15 17:55:14 +04:00
unsigned current_personality ;
1999-02-19 03:21:36 +03:00
2013-02-15 17:55:14 +04:00
# ifndef current_wordsize
unsigned current_wordsize ;
static const int personality_wordsize [ SUPPORTED_PERSONALITIES ] = {
2006-01-12 13:18:53 +03:00
PERSONALITY0_WORDSIZE ,
PERSONALITY1_WORDSIZE ,
2012-03-19 12:36:42 +04:00
# if SUPPORTED_PERSONALITIES > 2
2006-01-12 13:18:53 +03:00
PERSONALITY2_WORDSIZE ,
2012-03-19 12:36:42 +04:00
# endif
2011-08-20 03:50:09 +04:00
} ;
2013-02-15 17:55:14 +04:00
# endif
2006-01-12 13:18:53 +03:00
2011-08-20 03:50:09 +04:00
void
2006-12-21 01:37:21 +03:00
set_personality ( int personality )
1999-02-19 03:21:36 +03:00
{
2013-02-22 16:37:36 +04:00
nsyscalls = nsyscall_vec [ personality ] ;
sysent = sysent_vec [ personality ] ;
1999-02-19 03:21:36 +03:00
switch ( personality ) {
case 0 :
errnoent = errnoent0 ;
nerrnos = nerrnos0 ;
ioctlent = ioctlent0 ;
nioctlents = nioctlents0 ;
signalent = signalent0 ;
nsignals = nsignals0 ;
break ;
case 1 :
errnoent = errnoent1 ;
nerrnos = nerrnos1 ;
ioctlent = ioctlent1 ;
nioctlents = nioctlents1 ;
signalent = signalent1 ;
nsignals = nsignals1 ;
break ;
2013-02-22 16:26:10 +04:00
# if SUPPORTED_PERSONALITIES > 2
1999-02-19 03:21:36 +03:00
case 2 :
errnoent = errnoent2 ;
nerrnos = nerrnos2 ;
ioctlent = ioctlent2 ;
nioctlents = nioctlents2 ;
signalent = signalent2 ;
nsignals = nsignals2 ;
break ;
2012-03-19 12:36:42 +04:00
# endif
1999-02-19 03:21:36 +03:00
}
current_personality = personality ;
2013-02-15 17:55:14 +04:00
# ifndef current_wordsize
current_wordsize = personality_wordsize [ personality ] ;
# endif
1999-02-19 03:21:36 +03:00
}
2011-12-23 04:50:49 +04:00
static void
2014-09-10 17:46:04 +04:00
update_personality ( struct tcb * tcp , unsigned int personality )
2011-12-23 04:50:49 +04:00
{
if ( personality = = current_personality )
return ;
set_personality ( personality ) ;
if ( personality = = tcp - > currpers )
return ;
tcp - > currpers = personality ;
Add x32 support to strace
X32 support is added to Linux kernel 3.4. In a nutshell, x32 is x86-64 with
32bit pointers. At system call level, x32 is also identical to x86-64,
as shown by many changes like "defined(X86_64) || defined(X32)". The
main differerence bewteen x32 and x86-64 is off_t in x32 is long long
instead of long.
This patch adds x32 support to strace. Tested on Linux/x32.
* configure.ac: Support X32.
* defs.h: Set SUPPORTED_PERSONALITIES to 3 for X86_64,
Set PERSONALITY2_WORDSIZE to 4 for X86_64.
Add tcb::ext_arg for X32.
* file.c (stat): New for X32.
(sys_lseek): Use 64-bit version for X32.
(printstat64): Check current_personality != 1 for X86_64.
* ipc.c (indirect_ipccall): Check current_personality == 1
for X86_64.
* mem.c (sys_mmap64): Also use tcp->u_arg for X32. Print NULL
for zero address. Call printllval for offset for X32.
* pathtrace.c (pathtrace_match): Don't check sys_old_mmap for
X32.
* process.c (ARG_FLAGS): Defined for X32.
(ARG_STACK): Likewise.
(ARG_PTID): Likewise.
(change_syscall): Handle X32.
(struct_user_offsets): Support X32.
(sys_arch_prctl): Likewise.
* signal.c: Include <asm/sigcontext.h> for X32.
(SA_RESTORER): Also define for X32.
* syscall.c (update_personality): Support X32 for X86_64.
(is_restart_error): Likewise.
(syscall_fixup_on_sysenter): Likewise.
(get_syscall_args): Likewise.
(get_syscall_result): Likewise.
(get_error): Likewise.
(__X32_SYSCALL_BIT): Define if not defined.
(__X32_SYSCALL_MASK): Likewise.
(get_scno): Check DS register value for X32. Use
__X32_SYSCALL_MASK on X32 system calls.
* util.c (printllval): Use ext_arg for X32.
(printcall): Support X32.
(change_syscall): Likewise.
(arg0_offset): Likewise.
(arg1_offset): Likewise.
* Makefile.am (EXTRA_DIST): Add linux/x32/errnoent.h,
linux/x32/ioctlent.h.in, linux/x32/signalent.h,
linux/x32/syscallent.h, linux/x86_64/errnoent2.h,
linux/x86_64/ioctlent2.h, linux/x86_64/signalent2.h and
linux/x86_64/syscallent2.h.
* linux/x32/errnoent.h: New.
* linux/x32/ioctlent.h.in: Likewise.
* linux/x32/signalent.h: Likewise.
* linux/x32/syscallent.h: Likewise.
* linux/x86_64/errnoent2.h: Likewise.
* linux/x86_64/ioctlent2.h: Likewise.
* linux/x86_64/signalent2.h: Likewise.
* linux/x86_64/syscallent2.h: Likewise.
Signed-off-by: H.J. Lu <hongjiu.lu@intel.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-04-16 15:00:01 +04:00
# if defined(POWERPC64)
2011-12-23 04:50:49 +04:00
if ( ! qflag ) {
static const char * const names [ ] = { " 64 bit " , " 32 bit " } ;
fprintf ( stderr , " [ Process PID=%d runs in %s mode. ] \n " ,
tcp - > pid , names [ personality ] ) ;
}
Add x32 support to strace
X32 support is added to Linux kernel 3.4. In a nutshell, x32 is x86-64 with
32bit pointers. At system call level, x32 is also identical to x86-64,
as shown by many changes like "defined(X86_64) || defined(X32)". The
main differerence bewteen x32 and x86-64 is off_t in x32 is long long
instead of long.
This patch adds x32 support to strace. Tested on Linux/x32.
* configure.ac: Support X32.
* defs.h: Set SUPPORTED_PERSONALITIES to 3 for X86_64,
Set PERSONALITY2_WORDSIZE to 4 for X86_64.
Add tcb::ext_arg for X32.
* file.c (stat): New for X32.
(sys_lseek): Use 64-bit version for X32.
(printstat64): Check current_personality != 1 for X86_64.
* ipc.c (indirect_ipccall): Check current_personality == 1
for X86_64.
* mem.c (sys_mmap64): Also use tcp->u_arg for X32. Print NULL
for zero address. Call printllval for offset for X32.
* pathtrace.c (pathtrace_match): Don't check sys_old_mmap for
X32.
* process.c (ARG_FLAGS): Defined for X32.
(ARG_STACK): Likewise.
(ARG_PTID): Likewise.
(change_syscall): Handle X32.
(struct_user_offsets): Support X32.
(sys_arch_prctl): Likewise.
* signal.c: Include <asm/sigcontext.h> for X32.
(SA_RESTORER): Also define for X32.
* syscall.c (update_personality): Support X32 for X86_64.
(is_restart_error): Likewise.
(syscall_fixup_on_sysenter): Likewise.
(get_syscall_args): Likewise.
(get_syscall_result): Likewise.
(get_error): Likewise.
(__X32_SYSCALL_BIT): Define if not defined.
(__X32_SYSCALL_MASK): Likewise.
(get_scno): Check DS register value for X32. Use
__X32_SYSCALL_MASK on X32 system calls.
* util.c (printllval): Use ext_arg for X32.
(printcall): Support X32.
(change_syscall): Likewise.
(arg0_offset): Likewise.
(arg1_offset): Likewise.
* Makefile.am (EXTRA_DIST): Add linux/x32/errnoent.h,
linux/x32/ioctlent.h.in, linux/x32/signalent.h,
linux/x32/syscallent.h, linux/x86_64/errnoent2.h,
linux/x86_64/ioctlent2.h, linux/x86_64/signalent2.h and
linux/x86_64/syscallent2.h.
* linux/x32/errnoent.h: New.
* linux/x32/ioctlent.h.in: Likewise.
* linux/x32/signalent.h: Likewise.
* linux/x32/syscallent.h: Likewise.
* linux/x86_64/errnoent2.h: Likewise.
* linux/x86_64/ioctlent2.h: Likewise.
* linux/x86_64/signalent2.h: Likewise.
* linux/x86_64/syscallent2.h: Likewise.
Signed-off-by: H.J. Lu <hongjiu.lu@intel.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-04-16 15:00:01 +04:00
# elif defined(X86_64)
if ( ! qflag ) {
static const char * const names [ ] = { " 64 bit " , " 32 bit " , " x32 " } ;
fprintf ( stderr , " [ Process PID=%d runs in %s mode. ] \n " ,
tcp - > pid , names [ personality ] ) ;
}
2012-04-17 22:05:04 +04:00
# elif defined(X32)
if ( ! qflag ) {
static const char * const names [ ] = { " x32 " , " 32 bit " } ;
fprintf ( stderr , " [ Process PID=%d runs in %s mode. ] \n " ,
tcp - > pid , names [ personality ] ) ;
}
2012-11-10 15:24:48 +04:00
# elif defined(AARCH64)
if ( ! qflag ) {
2013-02-08 15:38:51 +04:00
static const char * const names [ ] = { " 32-bit " , " AArch64 " } ;
2012-11-10 15:24:48 +04:00
fprintf ( stderr , " [ Process PID=%d runs in %s mode. ] \n " ,
tcp - > pid , names [ personality ] ) ;
}
Add tilegx support to strace
tilegx support has been in the kernel since 3.0.
In addition, fix some issues with the tilepro support already
present in strace, primarily the decision to use the
<asm/unistd.h> numbering space for system calls.
* defs.h [TILE]: Include <asm/ptrace.h> and provide an extern
struct pt_regs tile_regs for efficiency. Provide compat 32-bit
personality via SUPPORTED_PERSONALITIES, PERSONALITY0_WORDSIZE,
PERSONALITY1_WORDSIZE, and DEFAULT_PERSONALITY.
* linux/tile/errnoent1.h: New file, includes linux/errnoent.h.
* linux/tile/ioctlent1.h: New file, includes linux/ioctlent.h.
* linux/tile/signalent1.h: New file, includes linux/signalent.h.
* linux/tile/syscallent.h: Update with new asm-generic syscalls.
The version previously committed was the from the first tile patch
to LKML, which subsequently was changed to use <asm-generic/unistd.h>.
* linux/tile/syscallent1.h: Copy from linux/tile/syscallent.h.
* mem.c (addtileflags) [TILE]: use %ld properly for a "long" variable.
* process.c [TILE]: Choose clone arguments correctly and properly
suppress all "struct user" related offsets in user_struct_offsets.
* signal.c [TILE]: Use tile_regs not upeek.
* syscall.c (update_personality) [TILE]: Print mode.
(PT_FLAGS_COMPAT) [TILE]: Provide if not in system headers.
(tile_regs) [TILE]: Define 'struct pt_regs' variable to hold state.
(get_regs) [TILE]: use PTRACE_GETREGS to set tile_regs rather than using upeek.
(get_scno) [TILE]: Set personality.
(get_syscall_args) [TILE]: Use tile_regs.
(get_syscall_result) [TILE]: Update tile_regs.
(get_error) [TILE]: Use tile_regs.
(printcall) [TILE]: Print pc.
(arg0_offset, arg1_offset, restore_arg0, restore_arg1) [TILE]:
Properly handle tile call semantics and support tilegx.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 20:48:33 +04:00
# elif defined(TILE)
if ( ! qflag ) {
static const char * const names [ ] = { " 64-bit " , " 32-bit " } ;
fprintf ( stderr , " [ Process PID=%d runs in %s mode. ] \n " ,
tcp - > pid , names [ personality ] ) ;
}
2012-02-25 05:44:25 +04:00
# endif
2011-12-23 04:50:49 +04:00
}
# endif
2004-09-04 08:20:43 +04:00
2013-02-21 19:17:08 +04:00
static int qual_syscall ( ) , qual_signal ( ) , qual_desc ( ) ;
1999-02-19 03:21:36 +03:00
2004-09-04 08:20:43 +04:00
static const struct qual_options {
2014-09-10 17:46:04 +04:00
unsigned int bitflag ;
2010-09-07 02:08:24 +04:00
const char * option_name ;
2010-09-15 20:18:20 +04:00
int ( * qualify ) ( const char * , int , int ) ;
2010-09-07 02:08:24 +04:00
const char * argument_name ;
1999-02-19 03:21:36 +03:00
} qual_options [ ] = {
2002-12-30 13:23:00 +03:00
{ QUAL_TRACE , " trace " , qual_syscall , " system call " } ,
{ QUAL_TRACE , " t " , qual_syscall , " system call " } ,
{ QUAL_ABBREV , " abbrev " , qual_syscall , " system call " } ,
{ QUAL_ABBREV , " a " , qual_syscall , " system call " } ,
{ QUAL_VERBOSE , " verbose " , qual_syscall , " system call " } ,
{ QUAL_VERBOSE , " v " , qual_syscall , " system call " } ,
{ QUAL_RAW , " raw " , qual_syscall , " system call " } ,
{ QUAL_RAW , " x " , qual_syscall , " system call " } ,
{ QUAL_SIGNAL , " signal " , qual_signal , " signal " } ,
{ QUAL_SIGNAL , " signals " , qual_signal , " signal " } ,
{ QUAL_SIGNAL , " s " , qual_signal , " signal " } ,
{ QUAL_READ , " read " , qual_desc , " descriptor " } ,
{ QUAL_READ , " reads " , qual_desc , " descriptor " } ,
{ QUAL_READ , " r " , qual_desc , " descriptor " } ,
{ QUAL_WRITE , " write " , qual_desc , " descriptor " } ,
{ QUAL_WRITE , " writes " , qual_desc , " descriptor " } ,
{ QUAL_WRITE , " w " , qual_desc , " descriptor " } ,
1999-02-19 03:21:36 +03:00
{ 0 , NULL , NULL , NULL } ,
} ;
2013-02-22 16:37:36 +04:00
static void
2014-09-10 17:46:04 +04:00
reallocate_qual ( const unsigned int n )
2013-02-22 16:37:36 +04:00
{
unsigned p ;
qualbits_t * qp ;
for ( p = 0 ; p < SUPPORTED_PERSONALITIES ; p + + ) {
qp = qual_vec [ p ] = realloc ( qual_vec [ p ] , n * sizeof ( qualbits_t ) ) ;
if ( ! qp )
die_out_of_memory ( ) ;
memset ( & qp [ num_quals ] , 0 , ( n - num_quals ) * sizeof ( qualbits_t ) ) ;
}
num_quals = n ;
}
2002-12-30 13:23:00 +03:00
static void
2014-09-10 17:46:04 +04:00
qualify_one ( const unsigned int n , unsigned int bitflag , const int not , const int pers )
2002-12-30 13:23:00 +03:00
{
2014-09-10 17:46:04 +04:00
int p ;
2006-01-12 12:50:49 +03:00
2013-02-22 16:37:36 +04:00
if ( num_quals < = n )
reallocate_qual ( n + 1 ) ;
2006-01-12 12:50:49 +03:00
2013-02-22 16:37:36 +04:00
for ( p = 0 ; p < SUPPORTED_PERSONALITIES ; p + + ) {
if ( pers = = p | | pers < 0 ) {
if ( not )
qual_vec [ p ] [ n ] & = ~ bitflag ;
else
qual_vec [ p ] [ n ] | = bitflag ;
}
2006-01-12 12:50:49 +03:00
}
2002-12-30 13:23:00 +03:00
}
1999-02-19 03:21:36 +03:00
static int
2014-09-10 17:46:04 +04:00
qual_syscall ( const char * s , const unsigned int bitflag , const int not )
1999-02-19 03:21:36 +03:00
{
2014-09-10 17:46:04 +04:00
int p ;
unsigned int i ;
2005-02-02 07:40:11 +03:00
int rc = - 1 ;
1999-02-19 03:21:36 +03:00
2012-03-23 14:29:01 +04:00
if ( * s > = ' 0 ' & & * s < = ' 9 ' ) {
2013-02-22 16:37:36 +04:00
i = string_to_uint ( s ) ;
2013-02-23 21:19:28 +04:00
if ( i > = MAX_NSYSCALLS )
2009-02-27 23:32:52 +03:00
return - 1 ;
2010-09-15 20:18:20 +04:00
qualify_one ( i , bitflag , not , - 1 ) ;
2009-02-27 23:32:52 +03:00
return 0 ;
2006-01-12 12:45:56 +03:00
}
2006-01-12 12:50:49 +03:00
2013-02-22 16:37:36 +04:00
for ( p = 0 ; p < SUPPORTED_PERSONALITIES ; p + + ) {
for ( i = 0 ; i < nsyscall_vec [ p ] ; i + + ) {
if ( sysent_vec [ p ] [ i ] . sys_name
& & strcmp ( s , sysent_vec [ p ] [ i ] . sys_name ) = = 0
) {
2013-03-01 19:50:22 +04:00
qualify_one ( i , bitflag , not , p ) ;
2013-02-22 16:37:36 +04:00
rc = 0 ;
}
2006-01-12 12:50:49 +03:00
}
2013-02-22 16:37:36 +04:00
}
2007-08-23 01:43:30 +04:00
2005-02-02 07:40:11 +03:00
return rc ;
1999-02-19 03:21:36 +03:00
}
static int
2014-09-10 17:46:04 +04:00
qual_signal ( const char * s , const unsigned int bitflag , const int not )
1999-02-19 03:21:36 +03:00
{
2014-09-10 17:46:04 +04:00
unsigned int i ;
1999-02-19 03:21:36 +03:00
2012-03-23 14:29:01 +04:00
if ( * s > = ' 0 ' & & * s < = ' 9 ' ) {
2012-03-26 01:49:48 +04:00
int signo = string_to_uint ( s ) ;
2013-02-22 16:37:36 +04:00
if ( signo < 0 | | signo > 255 )
2009-02-27 23:32:52 +03:00
return - 1 ;
2010-09-15 20:18:20 +04:00
qualify_one ( signo , bitflag , not , - 1 ) ;
2009-02-27 23:32:52 +03:00
return 0 ;
2002-12-30 13:23:00 +03:00
}
2010-09-07 02:08:24 +04:00
if ( strncasecmp ( s , " SIG " , 3 ) = = 0 )
1999-02-19 03:21:36 +03:00
s + = 3 ;
2012-03-23 14:29:01 +04:00
for ( i = 0 ; i < = NSIG ; i + + ) {
2010-09-07 02:08:24 +04:00
if ( strcasecmp ( s , signame ( i ) + 3 ) = = 0 ) {
2010-09-15 20:18:20 +04:00
qualify_one ( i , bitflag , not , - 1 ) ;
2005-02-02 06:51:18 +03:00
return 0 ;
2002-12-30 13:23:00 +03:00
}
2012-03-23 14:29:01 +04:00
}
2005-02-02 06:51:18 +03:00
return - 1 ;
1999-02-19 03:21:36 +03:00
}
static int
2014-09-10 17:46:04 +04:00
qual_desc ( const char * s , const unsigned int bitflag , const int not )
1999-02-19 03:21:36 +03:00
{
2012-03-23 14:29:01 +04:00
if ( * s > = ' 0 ' & & * s < = ' 9 ' ) {
2012-03-26 01:49:48 +04:00
int desc = string_to_uint ( s ) ;
2013-02-22 16:37:36 +04:00
if ( desc < 0 | | desc > 0x7fff ) /* paranoia */
2005-02-02 07:40:11 +03:00
return - 1 ;
2010-09-15 20:18:20 +04:00
qualify_one ( desc , bitflag , not , - 1 ) ;
2003-04-10 22:58:20 +04:00
return 0 ;
2002-12-30 13:23:00 +03:00
}
1999-02-19 03:21:36 +03:00
return - 1 ;
}
static int
2010-09-07 02:08:24 +04:00
lookup_class ( const char * s )
1999-02-19 03:21:36 +03:00
{
if ( strcmp ( s , " file " ) = = 0 )
return TRACE_FILE ;
if ( strcmp ( s , " ipc " ) = = 0 )
return TRACE_IPC ;
if ( strcmp ( s , " network " ) = = 0 )
return TRACE_NETWORK ;
if ( strcmp ( s , " process " ) = = 0 )
return TRACE_PROCESS ;
if ( strcmp ( s , " signal " ) = = 0 )
return TRACE_SIGNAL ;
2005-07-05 07:25:35 +04:00
if ( strcmp ( s , " desc " ) = = 0 )
return TRACE_DESC ;
Add -e trace=memory option
Add a new 'memory' category for tracing memory mapping related syscalls.
Affected syscalls are: break, brk, get_mempolicy, madvise, mbind,
migrate_pages, mincore, mlock, mlockall, mmap, move_pages, mprotect,
mremap, msync, munlock, munlockall, munmap, remap_file_pages, and
set_mempolicy.
* defs.h (TRACE_MEMORY): New macro.
* syscall.c (lookup_class): Handle trace=memory option.
* strace.1: Document it.
* linux/alpha/syscallent.h: Add TM flag to memory mapping related syscalls.
* linux/arm/syscallent.h: Likewise.
* linux/avr32/syscallent.h: Likewise.
* linux/bfin/syscallent.h: Likewise.
* linux/hppa/syscallent.h: Likewise.
* linux/i386/syscallent.h: Likewise.
* linux/ia64/syscallent.h: Likewise.
* linux/m68k/syscallent.h: Likewise.
* linux/microblaze/syscallent.h: Likewise.
* linux/mips/syscallent.h: Likewise.
* linux/powerpc/syscallent.h: Likewise.
* linux/s390/syscallent.h: Likewise.
* linux/s390x/syscallent.h: Likewise.
* linux/sh/syscallent.h: Likewise.
* linux/sh64/syscallent.h: Likewise.
* linux/sparc/syscallent.h: Likewise.
* linux/tile/syscallent.h: Likewise.
* linux/x32/syscallent.h: Likewise.
* linux/x86_64/syscallent.h: Likewise.
Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
2012-10-24 06:41:57 +04:00
if ( strcmp ( s , " memory " ) = = 0 )
return TRACE_MEMORY ;
1999-02-19 03:21:36 +03:00
return - 1 ;
}
void
2010-09-07 02:08:24 +04:00
qualify ( const char * s )
1999-02-19 03:21:36 +03:00
{
2004-09-04 08:20:43 +04:00
const struct qual_options * opt ;
2010-09-07 02:08:24 +04:00
char * copy ;
const char * p ;
2014-09-10 17:46:04 +04:00
int not ;
unsigned int i ;
1999-02-19 03:21:36 +03:00
2013-02-22 16:37:36 +04:00
if ( num_quals = = 0 )
reallocate_qual ( MIN_QUALS ) ;
1999-02-19 03:21:36 +03:00
opt = & qual_options [ 0 ] ;
for ( i = 0 ; ( p = qual_options [ i ] . option_name ) ; i + + ) {
2014-09-10 17:46:04 +04:00
unsigned int len = strlen ( p ) ;
if ( strncmp ( s , p , len ) = = 0 & & s [ len ] = = ' = ' ) {
1999-02-19 03:21:36 +03:00
opt = & qual_options [ i ] ;
2014-09-10 17:46:04 +04:00
s + = len + 1 ;
1999-02-19 03:21:36 +03:00
break ;
}
}
not = 0 ;
if ( * s = = ' ! ' ) {
not = 1 ;
s + + ;
}
if ( strcmp ( s , " none " ) = = 0 ) {
not = 1 - not ;
s = " all " ;
}
if ( strcmp ( s , " all " ) = = 0 ) {
2013-02-22 16:37:36 +04:00
for ( i = 0 ; i < num_quals ; i + + ) {
2010-09-15 20:18:20 +04:00
qualify_one ( i , opt - > bitflag , not , - 1 ) ;
1999-02-19 03:21:36 +03:00
}
return ;
}
2013-02-22 16:37:36 +04:00
for ( i = 0 ; i < num_quals ; i + + ) {
2010-09-15 20:18:20 +04:00
qualify_one ( i , opt - > bitflag , ! not , - 1 ) ;
1999-02-19 03:21:36 +03:00
}
2011-08-20 14:48:18 +04:00
copy = strdup ( s ) ;
2011-08-31 16:00:02 +04:00
if ( ! copy )
die_out_of_memory ( ) ;
2010-09-07 02:08:24 +04:00
for ( p = strtok ( copy , " , " ) ; p ; p = strtok ( NULL , " , " ) ) {
2014-09-10 17:46:04 +04:00
int n ;
1999-02-19 03:21:36 +03:00
if ( opt - > bitflag = = QUAL_TRACE & & ( n = lookup_class ( p ) ) > 0 ) {
2013-02-22 16:37:36 +04:00
unsigned pers ;
for ( pers = 0 ; pers < SUPPORTED_PERSONALITIES ; pers + + ) {
for ( i = 0 ; i < nsyscall_vec [ pers ] ; i + + )
if ( sysent_vec [ pers ] [ i ] . sys_flags & n )
2013-03-01 19:50:22 +04:00
qualify_one ( i , opt - > bitflag , not , pers ) ;
2013-02-22 16:37:36 +04:00
}
1999-02-19 03:21:36 +03:00
continue ;
}
2010-09-15 20:18:20 +04:00
if ( opt - > qualify ( p , opt - > bitflag , not ) ) {
2012-03-08 14:54:10 +04:00
error_msg_and_die ( " invalid %s '%s' " ,
1999-02-19 03:21:36 +03:00
opt - > argument_name , p ) ;
}
}
2010-09-07 02:08:24 +04:00
free ( copy ) ;
1999-02-19 03:21:36 +03:00
return ;
}
2012-03-16 02:08:55 +04:00
# ifdef SYS_socket_subcall
2005-06-09 00:45:28 +04:00
static void
2012-03-16 02:08:55 +04:00
decode_socket_subcall ( struct tcb * tcp )
1999-02-19 03:21:36 +03:00
{
2012-03-16 02:08:55 +04:00
unsigned long addr ;
2013-02-21 19:13:47 +04:00
unsigned int i , n , size ;
2012-03-16 02:08:55 +04:00
if ( tcp - > u_arg [ 0 ] < 0 | | tcp - > u_arg [ 0 ] > = SYS_socket_nsubcalls )
return ;
tcp - > scno = SYS_socket_subcall + tcp - > u_arg [ 0 ] ;
2013-02-21 19:13:47 +04:00
tcp - > qual_flg = qual_flags [ tcp - > scno ] ;
tcp - > s_ent = & sysent [ tcp - > scno ] ;
2012-03-16 02:08:55 +04:00
addr = tcp - > u_arg [ 1 ] ;
2012-03-19 12:36:42 +04:00
size = current_wordsize ;
2013-02-21 19:13:47 +04:00
n = tcp - > s_ent - > nargs ;
for ( i = 0 ; i < n ; + + i ) {
2012-03-16 02:08:55 +04:00
if ( size = = sizeof ( int ) ) {
unsigned int arg ;
if ( umove ( tcp , addr , & arg ) < 0 )
arg = 0 ;
tcp - > u_arg [ i ] = arg ;
1999-02-19 03:21:36 +03:00
}
2012-03-16 02:08:55 +04:00
else {
unsigned long arg ;
if ( umove ( tcp , addr , & arg ) < 0 )
arg = 0 ;
tcp - > u_arg [ i ] = arg ;
}
addr + = size ;
1999-02-19 03:21:36 +03:00
}
}
2012-03-16 02:08:55 +04:00
# endif
# ifdef SYS_ipc_subcall
static void
decode_ipc_subcall ( struct tcb * tcp )
{
2013-02-21 19:13:47 +04:00
unsigned int i , n ;
2012-03-16 02:08:55 +04:00
if ( tcp - > u_arg [ 0 ] < 0 | | tcp - > u_arg [ 0 ] > = SYS_ipc_nsubcalls )
return ;
2012-03-15 09:09:19 +04:00
2012-03-16 02:08:55 +04:00
tcp - > scno = SYS_ipc_subcall + tcp - > u_arg [ 0 ] ;
2013-02-21 19:13:47 +04:00
tcp - > qual_flg = qual_flags [ tcp - > scno ] ;
tcp - > s_ent = & sysent [ tcp - > scno ] ;
n = tcp - > s_ent - > nargs ;
for ( i = 0 ; i < n ; i + + )
2012-03-16 02:08:55 +04:00
tcp - > u_arg [ i ] = tcp - > u_arg [ i + 1 ] ;
}
# endif
1999-02-19 03:21:36 +03:00
2011-08-24 20:07:22 +04:00
int
printargs ( struct tcb * tcp )
1999-02-19 03:21:36 +03:00
{
2011-08-24 20:07:22 +04:00
if ( entering ( tcp ) ) {
int i ;
2013-02-21 19:13:47 +04:00
int n = tcp - > s_ent - > nargs ;
for ( i = 0 ; i < n ; i + + )
2011-08-24 20:07:22 +04:00
tprintf ( " %s%#lx " , i ? " , " : " " , tcp - > u_arg [ i ] ) ;
}
return 0 ;
}
2006-12-21 14:44:28 +03:00
2012-02-27 17:18:02 +04:00
int
printargs_lu ( struct tcb * tcp )
{
if ( entering ( tcp ) ) {
int i ;
2013-02-21 19:13:47 +04:00
int n = tcp - > s_ent - > nargs ;
for ( i = 0 ; i < n ; i + + )
2012-02-27 17:18:02 +04:00
tprintf ( " %s%lu " , i ? " , " : " " , tcp - > u_arg [ i ] ) ;
}
return 0 ;
}
int
printargs_ld ( struct tcb * tcp )
{
if ( entering ( tcp ) ) {
int i ;
2013-02-21 19:13:47 +04:00
int n = tcp - > s_ent - > nargs ;
for ( i = 0 ; i < n ; i + + )
2012-02-27 17:18:02 +04:00
tprintf ( " %s%ld " , i ? " , " : " " , tcp - > u_arg [ i ] ) ;
}
return 0 ;
}
2012-02-25 05:44:25 +04:00
# if defined(I386)
2013-07-16 14:06:25 +04:00
static struct user_regs_struct i386_regs ;
2015-02-15 03:08:11 +03:00
long * const i386_esp_ptr = & i386_regs . esp ;
2015-02-14 02:56:54 +03:00
# define ARCH_REGS_FOR_GETREGS i386_regs
Add x32 support to strace
X32 support is added to Linux kernel 3.4. In a nutshell, x32 is x86-64 with
32bit pointers. At system call level, x32 is also identical to x86-64,
as shown by many changes like "defined(X86_64) || defined(X32)". The
main differerence bewteen x32 and x86-64 is off_t in x32 is long long
instead of long.
This patch adds x32 support to strace. Tested on Linux/x32.
* configure.ac: Support X32.
* defs.h: Set SUPPORTED_PERSONALITIES to 3 for X86_64,
Set PERSONALITY2_WORDSIZE to 4 for X86_64.
Add tcb::ext_arg for X32.
* file.c (stat): New for X32.
(sys_lseek): Use 64-bit version for X32.
(printstat64): Check current_personality != 1 for X86_64.
* ipc.c (indirect_ipccall): Check current_personality == 1
for X86_64.
* mem.c (sys_mmap64): Also use tcp->u_arg for X32. Print NULL
for zero address. Call printllval for offset for X32.
* pathtrace.c (pathtrace_match): Don't check sys_old_mmap for
X32.
* process.c (ARG_FLAGS): Defined for X32.
(ARG_STACK): Likewise.
(ARG_PTID): Likewise.
(change_syscall): Handle X32.
(struct_user_offsets): Support X32.
(sys_arch_prctl): Likewise.
* signal.c: Include <asm/sigcontext.h> for X32.
(SA_RESTORER): Also define for X32.
* syscall.c (update_personality): Support X32 for X86_64.
(is_restart_error): Likewise.
(syscall_fixup_on_sysenter): Likewise.
(get_syscall_args): Likewise.
(get_syscall_result): Likewise.
(get_error): Likewise.
(__X32_SYSCALL_BIT): Define if not defined.
(__X32_SYSCALL_MASK): Likewise.
(get_scno): Check DS register value for X32. Use
__X32_SYSCALL_MASK on X32 system calls.
* util.c (printllval): Use ext_arg for X32.
(printcall): Support X32.
(change_syscall): Likewise.
(arg0_offset): Likewise.
(arg1_offset): Likewise.
* Makefile.am (EXTRA_DIST): Add linux/x32/errnoent.h,
linux/x32/ioctlent.h.in, linux/x32/signalent.h,
linux/x32/syscallent.h, linux/x86_64/errnoent2.h,
linux/x86_64/ioctlent2.h, linux/x86_64/signalent2.h and
linux/x86_64/syscallent2.h.
* linux/x32/errnoent.h: New.
* linux/x32/ioctlent.h.in: Likewise.
* linux/x32/signalent.h: Likewise.
* linux/x32/syscallent.h: Likewise.
* linux/x86_64/errnoent2.h: Likewise.
* linux/x86_64/ioctlent2.h: Likewise.
* linux/x86_64/signalent2.h: Likewise.
* linux/x86_64/syscallent2.h: Likewise.
Signed-off-by: H.J. Lu <hongjiu.lu@intel.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-04-16 15:00:01 +04:00
# elif defined(X86_64) || defined(X32)
2012-01-18 14:07:24 +04:00
/*
2013-02-14 06:29:48 +04:00
* On i386 , pt_regs and user_regs_struct are the same ,
* but on 64 bit x86 , user_regs_struct has six more fields :
2012-01-18 14:07:24 +04:00
* fs_base , gs_base , ds , es , fs , gs .
* PTRACE_GETREGS fills them too , so struct pt_regs would overflow .
*/
2013-02-14 06:29:48 +04:00
struct i386_user_regs_struct {
uint32_t ebx ;
uint32_t ecx ;
uint32_t edx ;
uint32_t esi ;
uint32_t edi ;
uint32_t ebp ;
uint32_t eax ;
uint32_t xds ;
uint32_t xes ;
uint32_t xfs ;
uint32_t xgs ;
uint32_t orig_eax ;
uint32_t eip ;
uint32_t xcs ;
uint32_t eflags ;
uint32_t esp ;
uint32_t xss ;
} ;
static union {
struct user_regs_struct x86_64_r ;
struct i386_user_regs_struct i386_r ;
} x86_regs_union ;
# define x86_64_regs x86_regs_union.x86_64_r
# define i386_regs x86_regs_union.i386_r
2013-07-16 14:06:25 +04:00
uint32_t * const i386_esp_ptr = & i386_regs . esp ;
2015-03-04 15:19:55 +03:00
uint64_t * const x86_64_rsp_ptr = ( uint64_t * ) & x86_64_regs . rsp ;
2013-02-14 06:29:48 +04:00
static struct iovec x86_io = {
. iov_base = & x86_regs_union
} ;
2015-02-14 02:41:04 +03:00
# define ARCH_REGS_FOR_GETREGSET x86_regs_union
# define ARCH_IOVEC_FOR_GETREGSET x86_io
2012-02-25 05:44:25 +04:00
# elif defined(IA64)
2015-03-06 02:30:02 +03:00
static struct pt_all_user_regs ia64_regs ;
unsigned long * const ia64_frame_ptr = & ia64_regs . gr [ 12 ] ;
# define IA64_PSR_IS ((long)1 << 34)
# define ia64_ia32mode (ia64_regs.cr_ipsr & IA64_PSR_IS)
# define ARCH_REGS_FOR_GETREGS ia64_regs
2012-02-25 05:44:25 +04:00
# elif defined(POWERPC)
Remove support for systems without PTRACE_SETOPTIONS
Assume that the kernel is v2.5.46 or newer, i.e. PTRACE_SETOPTIONS
and PTRACE_O_TRACESYSGOOD|PTRACE_O_TRACEEXEC|PTRACE_O_TRACECLONE
are universally available.
This change removes all code that implemented post-execve SIGTRAP
handling and fork/vfork/clone->CLONE_PTRACE substitution.
* defs.h (TCB_BPTSET, TCB_WAITEXECVE): Remove macros.
(need_fork_exec_workarounds, setbpt, clearbpt): Remove declarations.
* strace.c (need_fork_exec_workarounds,
test_ptrace_setoptions_followfork, test_ptrace_setoptions_for_all):
Remove.
(syscall_trap_sig): Set to (SIGTRAP | 0x80).
(ptrace_setoptions): Set to (PTRACE_O_TRACESYSGOOD | PTRACE_O_TRACEEXEC).
(detach): Do not test for TCB_BPTSET.
(init): Do not call test_ptrace_setoptions_followfork and
test_ptrace_setoptions_for_all. Do not test for TCB_BPTSET.
* syscall.c (syscall_fixup_on_sysenter, internal_fork, internal_exec,
syscall_fixup_for_fork_exec, syscall_fixup_on_sysexit): Remove.
(trace_syscall_entering): Do not test for TCB_WAITEXECVE. Do not call
syscall_fixup_on_sysenter and syscall_fixup_for_fork_exec.
(trace_syscall_exiting): Do not call syscall_fixup_on_sysexit and
syscall_fixup_for_fork_exec.
[IA64] (ia64_ia32mode): Make static.
* linux/ia64/arch_regs.h (ia64_ia32mode): Remove declaration.
* util.c: Do not include "syscall.h".
(arg_setup, get_arg0, get_arg1, set_arg0, set_arg1, restore_arg0,
restore_arg1, arg_finish_change, change_syscall, setbpt, clearbpt):
Remove.
* tests/ptrace_setoptions.test: Remove.
* tests/Makefile.am (TESTS): Remove it.
2015-02-08 16:05:53 +03:00
struct pt_regs ppc_regs ; /* not static */
2015-02-14 02:56:54 +03:00
# define ARCH_REGS_FOR_GETREGS ppc_regs
2012-02-25 05:44:25 +04:00
# elif defined(M68K)
2013-02-07 16:14:48 +04:00
static long m68k_d0 ;
2012-02-25 05:44:25 +04:00
# elif defined(BFIN)
2013-02-13 20:52:31 +04:00
static long bfin_r0 ;
2012-02-25 05:44:25 +04:00
# elif defined(ARM)
2015-03-05 02:05:53 +03:00
static struct pt_regs arm_regs ;
long * const arm_sp_ptr = & arm_regs . ARM_sp ;
2015-02-14 02:56:54 +03:00
# define ARCH_REGS_FOR_GETREGS arm_regs
2012-10-24 20:58:16 +04:00
# elif defined(AARCH64)
2015-02-13 05:12:14 +03:00
struct arm_pt_regs {
int uregs [ 18 ] ;
} ;
# define ARM_cpsr uregs[16]
# define ARM_pc uregs[15]
# define ARM_lr uregs[14]
# define ARM_sp uregs[13]
# define ARM_ip uregs[12]
# define ARM_fp uregs[11]
# define ARM_r10 uregs[10]
# define ARM_r9 uregs[9]
# define ARM_r8 uregs[8]
# define ARM_r7 uregs[7]
# define ARM_r6 uregs[6]
# define ARM_r5 uregs[5]
# define ARM_r4 uregs[4]
# define ARM_r3 uregs[3]
# define ARM_r2 uregs[2]
# define ARM_r1 uregs[1]
# define ARM_r0 uregs[0]
# define ARM_ORIG_r0 uregs[17]
2013-02-08 15:38:51 +04:00
static union {
2013-02-11 15:29:36 +04:00
struct user_pt_regs aarch64_r ;
struct arm_pt_regs arm_r ;
2013-02-08 15:38:51 +04:00
} arm_regs_union ;
2013-02-11 15:29:36 +04:00
# define aarch64_regs arm_regs_union.aarch64_r
# define arm_regs arm_regs_union.arm_r
2015-03-05 07:10:52 +03:00
uint64_t * const aarch64_sp_ptr = ( uint64_t * ) & aarch64_regs . sp ;
uint32_t * const arm_sp_ptr = ( uint32_t * ) & arm_regs . ARM_sp ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
static struct iovec aarch64_io = {
2013-02-11 15:29:36 +04:00
. iov_base = & arm_regs_union
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
} ;
2015-02-14 02:41:04 +03:00
# define ARCH_REGS_FOR_GETREGSET arm_regs_union
# define ARCH_IOVEC_FOR_GETREGSET aarch64_io
2012-02-25 05:44:25 +04:00
# elif defined(ALPHA)
2013-02-13 20:52:31 +04:00
static long alpha_r0 ;
2013-02-07 16:14:48 +04:00
static long alpha_a3 ;
2012-02-25 05:44:25 +04:00
# elif defined(AVR32)
2013-02-16 11:23:40 +04:00
static struct pt_regs avr32_regs ;
2015-02-14 02:56:54 +03:00
# define ARCH_REGS_FOR_GETREGS avr32_regs
2012-02-25 05:44:25 +04:00
# elif defined(SPARC) || defined(SPARC64)
2013-02-16 11:23:40 +04:00
struct pt_regs sparc_regs ; /* not static */
2015-02-14 02:56:54 +03:00
# define ARCH_REGS_FOR_GETREGS sparc_regs
2012-02-25 05:44:25 +04:00
# elif defined(MIPS)
2015-02-15 06:27:13 +03:00
struct mips_regs mips_regs ; /* not static */
/* PTRACE_GETREGS on MIPS is available since linux v2.6.15. */
# define ARCH_REGS_FOR_GETREGS mips_regs
2012-02-25 05:44:25 +04:00
# elif defined(S390) || defined(S390X)
2015-03-06 01:10:15 +03:00
/* PTRACE_GETREGSET on S390 is available since linux v2.6.27. */
static struct user_regs_struct s390_regset ;
unsigned long * const s390_frame_ptr = & s390_regset . gprs [ 15 ] ;
# define ARCH_REGS_FOR_GETREGSET s390_regset
2012-02-25 05:44:25 +04:00
# elif defined(HPPA)
2013-02-07 16:14:48 +04:00
static long hppa_r28 ;
2012-02-25 05:44:25 +04:00
# elif defined(SH)
2013-02-13 20:52:31 +04:00
static long sh_r0 ;
2012-02-25 05:44:25 +04:00
# elif defined(SH64)
2013-02-07 16:14:48 +04:00
static long sh64_r9 ;
2012-02-25 05:44:25 +04:00
# elif defined(CRISV10) || defined(CRISV32)
2013-02-07 16:14:48 +04:00
static long cris_r10 ;
Add tilegx support to strace
tilegx support has been in the kernel since 3.0.
In addition, fix some issues with the tilepro support already
present in strace, primarily the decision to use the
<asm/unistd.h> numbering space for system calls.
* defs.h [TILE]: Include <asm/ptrace.h> and provide an extern
struct pt_regs tile_regs for efficiency. Provide compat 32-bit
personality via SUPPORTED_PERSONALITIES, PERSONALITY0_WORDSIZE,
PERSONALITY1_WORDSIZE, and DEFAULT_PERSONALITY.
* linux/tile/errnoent1.h: New file, includes linux/errnoent.h.
* linux/tile/ioctlent1.h: New file, includes linux/ioctlent.h.
* linux/tile/signalent1.h: New file, includes linux/signalent.h.
* linux/tile/syscallent.h: Update with new asm-generic syscalls.
The version previously committed was the from the first tile patch
to LKML, which subsequently was changed to use <asm-generic/unistd.h>.
* linux/tile/syscallent1.h: Copy from linux/tile/syscallent.h.
* mem.c (addtileflags) [TILE]: use %ld properly for a "long" variable.
* process.c [TILE]: Choose clone arguments correctly and properly
suppress all "struct user" related offsets in user_struct_offsets.
* signal.c [TILE]: Use tile_regs not upeek.
* syscall.c (update_personality) [TILE]: Print mode.
(PT_FLAGS_COMPAT) [TILE]: Provide if not in system headers.
(tile_regs) [TILE]: Define 'struct pt_regs' variable to hold state.
(get_regs) [TILE]: use PTRACE_GETREGS to set tile_regs rather than using upeek.
(get_scno) [TILE]: Set personality.
(get_syscall_args) [TILE]: Use tile_regs.
(get_syscall_result) [TILE]: Update tile_regs.
(get_error) [TILE]: Use tile_regs.
(printcall) [TILE]: Print pc.
(arg0_offset, arg1_offset, restore_arg0, restore_arg1) [TILE]:
Properly handle tile call semantics and support tilegx.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 20:48:33 +04:00
# elif defined(TILE)
Remove support for systems without PTRACE_SETOPTIONS
Assume that the kernel is v2.5.46 or newer, i.e. PTRACE_SETOPTIONS
and PTRACE_O_TRACESYSGOOD|PTRACE_O_TRACEEXEC|PTRACE_O_TRACECLONE
are universally available.
This change removes all code that implemented post-execve SIGTRAP
handling and fork/vfork/clone->CLONE_PTRACE substitution.
* defs.h (TCB_BPTSET, TCB_WAITEXECVE): Remove macros.
(need_fork_exec_workarounds, setbpt, clearbpt): Remove declarations.
* strace.c (need_fork_exec_workarounds,
test_ptrace_setoptions_followfork, test_ptrace_setoptions_for_all):
Remove.
(syscall_trap_sig): Set to (SIGTRAP | 0x80).
(ptrace_setoptions): Set to (PTRACE_O_TRACESYSGOOD | PTRACE_O_TRACEEXEC).
(detach): Do not test for TCB_BPTSET.
(init): Do not call test_ptrace_setoptions_followfork and
test_ptrace_setoptions_for_all. Do not test for TCB_BPTSET.
* syscall.c (syscall_fixup_on_sysenter, internal_fork, internal_exec,
syscall_fixup_for_fork_exec, syscall_fixup_on_sysexit): Remove.
(trace_syscall_entering): Do not test for TCB_WAITEXECVE. Do not call
syscall_fixup_on_sysenter and syscall_fixup_for_fork_exec.
(trace_syscall_exiting): Do not call syscall_fixup_on_sysexit and
syscall_fixup_for_fork_exec.
[IA64] (ia64_ia32mode): Make static.
* linux/ia64/arch_regs.h (ia64_ia32mode): Remove declaration.
* util.c: Do not include "syscall.h".
(arg_setup, get_arg0, get_arg1, set_arg0, set_arg1, restore_arg0,
restore_arg1, arg_finish_change, change_syscall, setbpt, clearbpt):
Remove.
* tests/ptrace_setoptions.test: Remove.
* tests/Makefile.am (TESTS): Remove it.
2015-02-08 16:05:53 +03:00
struct pt_regs tile_regs ; /* not static */
2015-02-14 02:56:54 +03:00
# define ARCH_REGS_FOR_GETREGS tile_regs
2012-02-25 05:44:25 +04:00
# elif defined(MICROBLAZE)
2013-02-07 16:14:48 +04:00
static long microblaze_r3 ;
2013-02-14 16:26:27 +04:00
# elif defined(OR1K)
static struct user_regs_struct or1k_regs ;
2013-03-18 14:17:14 +04:00
# define ARCH_REGS_FOR_GETREGSET or1k_regs
2013-02-22 18:44:10 +04:00
# elif defined(METAG)
static struct user_gp_regs metag_regs ;
2013-03-18 14:17:14 +04:00
# define ARCH_REGS_FOR_GETREGSET metag_regs
2013-03-25 21:22:07 +04:00
# elif defined(XTENSA)
static long xtensa_a2 ;
2013-08-16 11:17:06 +04:00
# elif defined(ARC)
static struct user_regs_struct arc_regs ;
# define ARCH_REGS_FOR_GETREGSET arc_regs
2012-02-25 05:44:25 +04:00
# endif
2000-04-11 02:22:31 +04:00
2015-02-14 00:56:50 +03:00
static long get_regs_error ;
2015-03-06 02:30:02 +03:00
# if defined(SPARC) || defined(SPARC64) || defined(IA64) || defined(SH)
long
getrval2 ( struct tcb * tcp )
{
long val ;
# if defined(SPARC) || defined(SPARC64)
val = sparc_regs . u_regs [ U_REG_O1 ] ;
# elif defined(SH)
if ( upeek ( tcp - > pid , 4 * ( REG_REG0 + 1 ) , & val ) < 0 )
return - 1 ;
# elif defined(IA64)
val = ia64_regs . gr [ 9 ] ;
# endif
return val ;
}
# endif
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
void
2013-07-01 14:49:14 +04:00
print_pc ( struct tcb * tcp )
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
{
2015-02-15 18:52:02 +03:00
const char * fmt ;
const char * bad ;
2015-02-23 16:43:20 +03:00
# ifdef current_wordsize
2015-02-15 18:52:02 +03:00
# define pc_wordsize current_wordsize
2015-02-23 16:43:20 +03:00
# else
# define pc_wordsize personality_wordsize[tcp->currpers]
2015-02-15 18:52:02 +03:00
# endif
if ( pc_wordsize = = 4 ) {
fmt = " [%08lx] " ;
bad = " [????????] " ;
} else {
fmt = " [%016lx] " ;
bad = " [????????????????] " ;
}
# undef pc_wordsize
# define PRINTBADPC tprints(bad)
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
if ( get_regs_error ) {
PRINTBADPC ;
return ;
}
2015-02-15 18:52:02 +03:00
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# if defined(I386)
2015-02-15 18:52:02 +03:00
tprintf ( fmt , i386_regs . eip ) ;
# elif defined(X86_64) || defined(X32)
if ( x86_io . iov_len = = sizeof ( i386_regs ) )
tprintf ( fmt , ( unsigned long ) i386_regs . eip ) ;
else
tprintf ( fmt , ( unsigned long ) x86_64_regs . rip ) ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# elif defined(S390) || defined(S390X)
2015-03-06 01:10:15 +03:00
tprintf ( fmt , s390_regset . psw . addr ) ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# elif defined(IA64)
2015-03-06 02:30:02 +03:00
tprintf ( fmt , ia64_regs . br [ 0 ] ) ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# elif defined(POWERPC)
2015-02-15 18:52:02 +03:00
tprintf ( fmt , ppc_regs . nip ) ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# elif defined(M68K)
long pc ;
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , 4 * PT_PC , & pc ) < 0 ) {
2015-02-15 18:52:02 +03:00
PRINTBADPC ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
return ;
}
2015-02-15 18:52:02 +03:00
tprintf ( fmt , pc ) ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# elif defined(ALPHA)
long pc ;
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , REG_PC , & pc ) < 0 ) {
2015-02-15 18:52:02 +03:00
PRINTBADPC ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
return ;
}
2015-02-15 18:52:02 +03:00
tprintf ( fmt , pc ) ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# elif defined(SPARC)
2015-02-15 18:52:02 +03:00
tprintf ( fmt , sparc_regs . pc ) ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# elif defined(SPARC64)
2015-02-15 18:52:02 +03:00
tprintf ( fmt , sparc_regs . tpc ) ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# elif defined(HPPA)
long pc ;
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , PT_IAOQ0 , & pc ) < 0 ) {
2015-02-15 18:52:02 +03:00
PRINTBADPC ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
return ;
}
2015-02-15 18:52:02 +03:00
tprintf ( fmt , pc ) ;
2015-02-15 06:27:13 +03:00
# elif defined MIPS
2015-02-15 18:52:02 +03:00
tprintf ( fmt , ( unsigned long ) mips_REG_EPC ) ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# elif defined(SH)
long pc ;
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , 4 * REG_PC , & pc ) < 0 ) {
2015-02-15 18:52:02 +03:00
PRINTBADPC ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
return ;
}
2015-02-15 18:52:02 +03:00
tprintf ( fmt , pc ) ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# elif defined(SH64)
long pc ;
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , REG_PC , & pc ) < 0 ) {
2015-02-15 18:52:02 +03:00
PRINTBADPC ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
return ;
}
2015-02-15 18:52:02 +03:00
tprintf ( fmt , pc ) ;
2015-03-02 06:38:27 +03:00
# elif defined(AARCH64)
if ( aarch64_io . iov_len = = sizeof ( arm_regs ) )
tprintf ( fmt , ( unsigned long ) arm_regs . ARM_pc ) ;
else
tprintf ( fmt , ( unsigned long ) aarch64_regs . pc ) ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# elif defined(ARM)
2015-02-15 18:52:02 +03:00
tprintf ( fmt , arm_regs . ARM_pc ) ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# elif defined(AVR32)
2015-02-15 18:52:02 +03:00
tprintf ( fmt , avr32_regs . pc ) ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# elif defined(BFIN)
long pc ;
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , PT_PC , & pc ) < 0 ) {
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
PRINTBADPC ;
return ;
}
2015-02-15 18:52:02 +03:00
tprintf ( fmt , pc ) ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# elif defined(CRISV10)
long pc ;
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , 4 * PT_IRP , & pc ) < 0 ) {
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
PRINTBADPC ;
return ;
}
2015-02-15 18:52:02 +03:00
tprintf ( fmt , pc ) ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# elif defined(CRISV32)
long pc ;
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , 4 * PT_ERP , & pc ) < 0 ) {
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
PRINTBADPC ;
return ;
}
2015-02-15 18:52:02 +03:00
tprintf ( fmt , pc ) ;
Add tilegx support to strace
tilegx support has been in the kernel since 3.0.
In addition, fix some issues with the tilepro support already
present in strace, primarily the decision to use the
<asm/unistd.h> numbering space for system calls.
* defs.h [TILE]: Include <asm/ptrace.h> and provide an extern
struct pt_regs tile_regs for efficiency. Provide compat 32-bit
personality via SUPPORTED_PERSONALITIES, PERSONALITY0_WORDSIZE,
PERSONALITY1_WORDSIZE, and DEFAULT_PERSONALITY.
* linux/tile/errnoent1.h: New file, includes linux/errnoent.h.
* linux/tile/ioctlent1.h: New file, includes linux/ioctlent.h.
* linux/tile/signalent1.h: New file, includes linux/signalent.h.
* linux/tile/syscallent.h: Update with new asm-generic syscalls.
The version previously committed was the from the first tile patch
to LKML, which subsequently was changed to use <asm-generic/unistd.h>.
* linux/tile/syscallent1.h: Copy from linux/tile/syscallent.h.
* mem.c (addtileflags) [TILE]: use %ld properly for a "long" variable.
* process.c [TILE]: Choose clone arguments correctly and properly
suppress all "struct user" related offsets in user_struct_offsets.
* signal.c [TILE]: Use tile_regs not upeek.
* syscall.c (update_personality) [TILE]: Print mode.
(PT_FLAGS_COMPAT) [TILE]: Provide if not in system headers.
(tile_regs) [TILE]: Define 'struct pt_regs' variable to hold state.
(get_regs) [TILE]: use PTRACE_GETREGS to set tile_regs rather than using upeek.
(get_scno) [TILE]: Set personality.
(get_syscall_args) [TILE]: Use tile_regs.
(get_syscall_result) [TILE]: Update tile_regs.
(get_error) [TILE]: Use tile_regs.
(printcall) [TILE]: Print pc.
(arg0_offset, arg1_offset, restore_arg0, restore_arg1) [TILE]:
Properly handle tile call semantics and support tilegx.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 20:48:33 +04:00
# elif defined(TILE)
2015-02-15 18:52:02 +03:00
tprintf ( fmt , ( unsigned long ) tile_regs . pc ) ;
2013-02-14 16:26:27 +04:00
# elif defined(OR1K)
2015-02-15 18:52:02 +03:00
tprintf ( fmt , or1k_regs . pc ) ;
2013-02-22 18:44:10 +04:00
# elif defined(METAG)
2015-02-15 18:52:02 +03:00
tprintf ( fmt , metag_regs . pc ) ;
2013-03-25 21:22:07 +04:00
# elif defined(XTENSA)
long pc ;
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , REG_PC , & pc ) < 0 ) {
2013-03-25 21:22:07 +04:00
PRINTBADPC ;
return ;
}
2015-02-15 18:52:02 +03:00
tprintf ( fmt , pc ) ;
2013-08-16 11:17:06 +04:00
# elif defined(ARC)
2015-02-15 18:52:02 +03:00
tprintf ( fmt , arc_regs . efa ) ;
# else
# warning print_pc is not implemented for this architecture
PRINTBADPC ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# endif /* architecture */
}
2015-01-11 20:26:29 +03:00
/*
* Shuffle syscall numbers so that we don ' t have huge gaps in syscall table .
* The shuffling should be an involution : shuffle_scno ( shuffle_scno ( n ) ) = = n .
2013-02-21 18:46:34 +04:00
*/
2014-03-04 03:45:26 +04:00
# if defined(ARM) || defined(AARCH64) /* So far only 32-bit ARM needs this */
2013-02-21 18:46:34 +04:00
static long
shuffle_scno ( unsigned long scno )
{
2015-01-11 20:26:29 +03:00
if ( scno < ARM_FIRST_SHUFFLED_SYSCALL )
2013-02-21 18:46:34 +04:00
return scno ;
/* __ARM_NR_cmpxchg? Swap with LAST_ORDINARY+1 */
2015-01-11 20:26:29 +03:00
if ( scno = = ARM_FIRST_SHUFFLED_SYSCALL )
2013-02-21 18:46:34 +04:00
return 0x000ffff0 ;
2015-01-11 20:26:29 +03:00
if ( scno = = 0x000ffff0 )
return ARM_FIRST_SHUFFLED_SYSCALL ;
2013-02-21 18:46:34 +04:00
2015-01-11 20:26:29 +03:00
# define ARM_SECOND_SHUFFLED_SYSCALL (ARM_FIRST_SHUFFLED_SYSCALL + 1)
/*
* Is it ARM specific syscall ?
* Swap [ 0x000f0000 , 0x000f0000 + LAST_SPECIAL ] range
* with [ SECOND_SHUFFLED , SECOND_SHUFFLED + LAST_SPECIAL ] range .
2013-02-21 18:46:34 +04:00
*/
2015-01-11 20:26:29 +03:00
if ( scno > = 0x000f0000 & &
scno < = 0x000f0000 + ARM_LAST_SPECIAL_SYSCALL ) {
return scno - 0x000f0000 + ARM_SECOND_SHUFFLED_SYSCALL ;
}
if ( scno < = ARM_SECOND_SHUFFLED_SYSCALL + ARM_LAST_SPECIAL_SYSCALL ) {
return scno + 0x000f0000 - ARM_SECOND_SHUFFLED_SYSCALL ;
2013-02-21 18:46:34 +04:00
}
return scno ;
}
# else
# define shuffle_scno(scno) ((long)(scno))
# endif
static char *
undefined_scno_name ( struct tcb * tcp )
{
static char buf [ sizeof ( " syscall_%lu " ) + sizeof ( long ) * 3 ] ;
sprintf ( buf , " syscall_%lu " , shuffle_scno ( tcp - > scno ) ) ;
return buf ;
}
2013-06-26 08:42:37 +04:00
# ifdef POWERPC
/*
2013-06-28 16:36:39 +04:00
* PTRACE_GETREGS was added to the PowerPC kernel in v2 .6 .23 ,
* we provide a slow fallback for old kernels .
2013-06-26 08:42:37 +04:00
*/
2013-06-28 16:36:39 +04:00
static int powerpc_getregs_old ( pid_t pid )
2013-06-26 08:42:37 +04:00
{
int i ;
long r ;
2013-06-28 16:51:50 +04:00
if ( iflag ) {
2013-07-12 14:24:02 +04:00
r = upeek ( pid , sizeof ( long ) * PT_NIP , ( long * ) & ppc_regs . nip ) ;
2013-06-28 16:51:50 +04:00
if ( r )
goto out ;
}
# ifdef POWERPC64 /* else we never use it */
2013-07-12 14:24:02 +04:00
r = upeek ( pid , sizeof ( long ) * PT_MSR , ( long * ) & ppc_regs . msr ) ;
2013-06-26 08:42:37 +04:00
if ( r )
goto out ;
2013-06-28 16:51:50 +04:00
# endif
2013-07-12 14:24:02 +04:00
r = upeek ( pid , sizeof ( long ) * PT_CCR , ( long * ) & ppc_regs . ccr ) ;
2013-06-26 08:42:37 +04:00
if ( r )
goto out ;
2013-07-12 14:24:02 +04:00
r = upeek ( pid , sizeof ( long ) * PT_ORIG_R3 , ( long * ) & ppc_regs . orig_gpr3 ) ;
2013-06-26 08:42:37 +04:00
if ( r )
goto out ;
for ( i = 0 ; i < = 8 ; i + + ) {
2013-07-12 14:24:02 +04:00
r = upeek ( pid , sizeof ( long ) * ( PT_R0 + i ) ,
( long * ) & ppc_regs . gpr [ i ] ) ;
2013-06-26 08:42:37 +04:00
if ( r )
goto out ;
}
2013-06-28 16:36:39 +04:00
out :
2013-06-26 08:42:37 +04:00
return r ;
}
# endif
2015-02-14 00:56:50 +03:00
void
clear_regs ( void )
{
get_regs_error = - 1 ;
}
2013-03-18 03:48:45 +04:00
2015-02-14 02:41:04 +03:00
# if defined ARCH_REGS_FOR_GETREGSET
static long
get_regset ( pid_t pid )
2013-03-18 03:48:45 +04:00
{
2015-02-14 02:41:04 +03:00
# ifdef ARCH_IOVEC_FOR_GETREGSET
/* variable iovec */
ARCH_IOVEC_FOR_GETREGSET . iov_len = sizeof ( ARCH_REGS_FOR_GETREGSET ) ;
return ptrace ( PTRACE_GETREGSET , pid , NT_PRSTATUS ,
& ARCH_IOVEC_FOR_GETREGSET ) ;
# else
/* constant iovec */
2013-03-18 14:17:14 +04:00
static struct iovec io = {
. iov_base = & ARCH_REGS_FOR_GETREGSET ,
. iov_len = sizeof ( ARCH_REGS_FOR_GETREGSET )
2013-03-18 03:48:45 +04:00
} ;
2015-02-14 02:41:04 +03:00
return ptrace ( PTRACE_GETREGSET , pid , NT_PRSTATUS , & io ) ;
2013-03-18 14:17:14 +04:00
2013-03-18 03:48:45 +04:00
# endif
2013-03-18 14:17:14 +04:00
}
2015-02-14 02:41:04 +03:00
# endif /* ARCH_REGS_FOR_GETREGSET */
2013-03-18 14:17:14 +04:00
2013-02-16 11:23:40 +04:00
void
get_regs ( pid_t pid )
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
{
2015-02-14 02:56:54 +03:00
# ifdef ARCH_REGS_FOR_GETREGSET
# ifdef X86_64
/* Try PTRACE_GETREGSET first, fallback to PTRACE_GETREGS. */
2013-03-18 03:18:35 +04:00
static int getregset_support ;
if ( getregset_support > = 0 ) {
2015-02-14 02:41:04 +03:00
get_regs_error = get_regset ( pid ) ;
2013-03-18 03:18:35 +04:00
if ( getregset_support > 0 )
return ;
if ( get_regs_error > = 0 ) {
getregset_support = 1 ;
return ;
2013-02-14 06:29:48 +04:00
}
2013-03-18 03:18:35 +04:00
if ( errno = = EPERM | | errno = = ESRCH )
return ;
getregset_support = - 1 ;
}
/* Use old method, with unreliable heuristical detection of 32-bitness. */
x86_io . iov_len = sizeof ( x86_64_regs ) ;
2013-03-18 14:17:14 +04:00
get_regs_error = ptrace ( PTRACE_GETREGS , pid , NULL , & x86_64_regs ) ;
2013-03-18 03:18:35 +04:00
if ( ! get_regs_error & & x86_64_regs . cs = = 0x23 ) {
x86_io . iov_len = sizeof ( i386_regs ) ;
/*
* The order is important : i386_regs and x86_64_regs
* are overlaid in memory !
*/
i386_regs . ebx = x86_64_regs . rbx ;
i386_regs . ecx = x86_64_regs . rcx ;
i386_regs . edx = x86_64_regs . rdx ;
i386_regs . esi = x86_64_regs . rsi ;
i386_regs . edi = x86_64_regs . rdi ;
i386_regs . ebp = x86_64_regs . rbp ;
i386_regs . eax = x86_64_regs . rax ;
/* i386_regs.xds = x86_64_regs.ds; unused by strace */
/* i386_regs.xes = x86_64_regs.es; ditto... */
/* i386_regs.xfs = x86_64_regs.fs; */
/* i386_regs.xgs = x86_64_regs.gs; */
i386_regs . orig_eax = x86_64_regs . orig_rax ;
i386_regs . eip = x86_64_regs . rip ;
/* i386_regs.xcs = x86_64_regs.cs; */
/* i386_regs.eflags = x86_64_regs.eflags; */
i386_regs . esp = x86_64_regs . rsp ;
/* i386_regs.xss = x86_64_regs.ss; */
2013-02-14 06:29:48 +04:00
}
2015-02-14 02:56:54 +03:00
# else /* !X86_64 */
/* Assume that PTRACE_GETREGSET works. */
get_regs_error = get_regset ( pid ) ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
# endif
2015-02-14 02:56:54 +03:00
# elif defined ARCH_REGS_FOR_GETREGS
# if defined SPARC || defined SPARC64
/* SPARC systems have the meaning of data and addr reversed */
get_regs_error = ptrace ( PTRACE_GETREGS , pid , ( char * ) & ARCH_REGS_FOR_GETREGS , 0 ) ;
# elif defined POWERPC
static bool old_kernel = 0 ;
if ( old_kernel )
goto old ;
get_regs_error = ptrace ( PTRACE_GETREGS , pid , NULL , & ARCH_REGS_FOR_GETREGS ) ;
if ( get_regs_error & & errno = = EIO ) {
old_kernel = 1 ;
old :
get_regs_error = powerpc_getregs_old ( pid ) ;
}
# else
/* Assume that PTRACE_GETREGS works. */
get_regs_error = ptrace ( PTRACE_GETREGS , pid , NULL , & ARCH_REGS_FOR_GETREGS ) ;
# endif
# else /* !ARCH_REGS_FOR_GETREGSET && !ARCH_REGS_FOR_GETREGS */
# warning get_regs is not implemented for this architecture yet
get_regs_error = 0 ;
# endif
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
}
2011-08-21 20:03:23 +04:00
/* Returns:
2012-03-21 03:23:16 +04:00
* 0 : " ignore this ptrace stop " , bail out of trace_syscall_entering ( ) silently .
* 1 : ok , continue in trace_syscall_entering ( ) .
* other : error , trace_syscall_entering ( ) should print error indicator
2011-08-21 20:03:23 +04:00
* ( " ???? " etc ) and bail out .
*/
2012-03-19 12:36:42 +04:00
static int
2011-08-24 19:53:52 +04:00
get_scno ( struct tcb * tcp )
1999-02-19 03:21:36 +03:00
{
long scno = 0 ;
2012-02-25 05:44:25 +04:00
# if defined(S390) || defined(S390X)
2015-03-06 01:10:15 +03:00
scno = s390_regset . gprs [ 2 ] ;
2012-02-25 05:44:25 +04:00
# elif defined(POWERPC)
2013-06-26 17:53:33 +04:00
scno = ppc_regs . gpr [ 0 ] ;
2012-02-25 05:44:25 +04:00
# ifdef POWERPC64
2014-09-10 17:46:04 +04:00
unsigned int currpers ;
2010-07-12 23:39:57 +04:00
2014-02-19 01:32:43 +04:00
/*
* Check for 64 / 32 bit mode .
* Embedded implementations covered by Book E extension of PPC use
* bit 0 ( CM ) of 32 - bit Machine state register ( MSR ) .
* Other implementations use bit 0 ( SF ) of 64 - bit MSR .
*/
currpers = ( ppc_regs . msr & 0x8000000080000000 ) ? 0 : 1 ;
2011-12-23 04:50:49 +04:00
update_personality ( tcp , currpers ) ;
2012-02-25 05:44:25 +04:00
# endif
# elif defined(AVR32)
2013-02-16 11:23:40 +04:00
scno = avr32_regs . r8 ;
2012-02-25 05:44:25 +04:00
# elif defined(BFIN)
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , PT_ORIG_P0 , & scno ) )
2008-11-11 01:21:41 +03:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(I386)
2011-08-30 20:53:49 +04:00
scno = i386_regs . orig_eax ;
Add x32 support to strace
X32 support is added to Linux kernel 3.4. In a nutshell, x32 is x86-64 with
32bit pointers. At system call level, x32 is also identical to x86-64,
as shown by many changes like "defined(X86_64) || defined(X32)". The
main differerence bewteen x32 and x86-64 is off_t in x32 is long long
instead of long.
This patch adds x32 support to strace. Tested on Linux/x32.
* configure.ac: Support X32.
* defs.h: Set SUPPORTED_PERSONALITIES to 3 for X86_64,
Set PERSONALITY2_WORDSIZE to 4 for X86_64.
Add tcb::ext_arg for X32.
* file.c (stat): New for X32.
(sys_lseek): Use 64-bit version for X32.
(printstat64): Check current_personality != 1 for X86_64.
* ipc.c (indirect_ipccall): Check current_personality == 1
for X86_64.
* mem.c (sys_mmap64): Also use tcp->u_arg for X32. Print NULL
for zero address. Call printllval for offset for X32.
* pathtrace.c (pathtrace_match): Don't check sys_old_mmap for
X32.
* process.c (ARG_FLAGS): Defined for X32.
(ARG_STACK): Likewise.
(ARG_PTID): Likewise.
(change_syscall): Handle X32.
(struct_user_offsets): Support X32.
(sys_arch_prctl): Likewise.
* signal.c: Include <asm/sigcontext.h> for X32.
(SA_RESTORER): Also define for X32.
* syscall.c (update_personality): Support X32 for X86_64.
(is_restart_error): Likewise.
(syscall_fixup_on_sysenter): Likewise.
(get_syscall_args): Likewise.
(get_syscall_result): Likewise.
(get_error): Likewise.
(__X32_SYSCALL_BIT): Define if not defined.
(__X32_SYSCALL_MASK): Likewise.
(get_scno): Check DS register value for X32. Use
__X32_SYSCALL_MASK on X32 system calls.
* util.c (printllval): Use ext_arg for X32.
(printcall): Support X32.
(change_syscall): Likewise.
(arg0_offset): Likewise.
(arg1_offset): Likewise.
* Makefile.am (EXTRA_DIST): Add linux/x32/errnoent.h,
linux/x32/ioctlent.h.in, linux/x32/signalent.h,
linux/x32/syscallent.h, linux/x86_64/errnoent2.h,
linux/x86_64/ioctlent2.h, linux/x86_64/signalent2.h and
linux/x86_64/syscallent2.h.
* linux/x32/errnoent.h: New.
* linux/x32/ioctlent.h.in: Likewise.
* linux/x32/signalent.h: Likewise.
* linux/x32/syscallent.h: Likewise.
* linux/x86_64/errnoent2.h: Likewise.
* linux/x86_64/ioctlent2.h: Likewise.
* linux/x86_64/signalent2.h: Likewise.
* linux/x86_64/syscallent2.h: Likewise.
Signed-off-by: H.J. Lu <hongjiu.lu@intel.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-04-16 15:00:01 +04:00
# elif defined(X86_64) || defined(X32)
# ifndef __X32_SYSCALL_BIT
# define __X32_SYSCALL_BIT 0x40000000
# endif
2014-09-10 17:46:04 +04:00
unsigned int currpers ;
2013-02-14 06:29:48 +04:00
# if 1
/* GETREGSET of NT_PRSTATUS tells us regset size,
* which unambiguously detects i386 .
*
* Linux kernel distinguishes x86 - 64 and x32 processes
* solely by looking at __X32_SYSCALL_BIT :
* arch / x86 / include / asm / compat . h : : is_x32_task ( ) :
* if ( task_pt_regs ( current ) - > orig_ax & __X32_SYSCALL_BIT )
* return true ;
*/
if ( x86_io . iov_len = = sizeof ( i386_regs ) ) {
scno = i386_regs . orig_eax ;
currpers = 1 ;
} else {
scno = x86_64_regs . orig_rax ;
currpers = 0 ;
if ( scno & __X32_SYSCALL_BIT ) {
2015-02-05 19:15:46 +03:00
/*
* Syscall number - 1 requires special treatment :
* it might be a side effect of SECCOMP_RET_ERRNO
* filtering that sets orig_rax to - 1
* in some versions of linux kernel .
* If that is the case , then
* __X32_SYSCALL_BIT logic does not apply .
*/
if ( ( long long ) x86_64_regs . orig_rax ! = - 1 ) {
scno - = __X32_SYSCALL_BIT ;
currpers = 2 ;
} else {
# ifdef X32
currpers = 2 ;
# endif
}
2013-02-14 06:29:48 +04:00
}
}
# elif 0
/* cs = 0x33 for long mode (native 64 bit and x32)
* cs = 0x23 for compatibility mode ( 32 bit )
* ds = 0x2b for x32 mode ( x86 - 64 in 32 bit )
2011-08-24 18:52:57 +04:00
*/
2013-02-14 06:29:48 +04:00
scno = x86_64_regs . orig_rax ;
2011-08-30 20:53:49 +04:00
switch ( x86_64_regs . cs ) {
2011-08-24 18:52:57 +04:00
case 0x23 : currpers = 1 ; break ;
Add x32 support to strace
X32 support is added to Linux kernel 3.4. In a nutshell, x32 is x86-64 with
32bit pointers. At system call level, x32 is also identical to x86-64,
as shown by many changes like "defined(X86_64) || defined(X32)". The
main differerence bewteen x32 and x86-64 is off_t in x32 is long long
instead of long.
This patch adds x32 support to strace. Tested on Linux/x32.
* configure.ac: Support X32.
* defs.h: Set SUPPORTED_PERSONALITIES to 3 for X86_64,
Set PERSONALITY2_WORDSIZE to 4 for X86_64.
Add tcb::ext_arg for X32.
* file.c (stat): New for X32.
(sys_lseek): Use 64-bit version for X32.
(printstat64): Check current_personality != 1 for X86_64.
* ipc.c (indirect_ipccall): Check current_personality == 1
for X86_64.
* mem.c (sys_mmap64): Also use tcp->u_arg for X32. Print NULL
for zero address. Call printllval for offset for X32.
* pathtrace.c (pathtrace_match): Don't check sys_old_mmap for
X32.
* process.c (ARG_FLAGS): Defined for X32.
(ARG_STACK): Likewise.
(ARG_PTID): Likewise.
(change_syscall): Handle X32.
(struct_user_offsets): Support X32.
(sys_arch_prctl): Likewise.
* signal.c: Include <asm/sigcontext.h> for X32.
(SA_RESTORER): Also define for X32.
* syscall.c (update_personality): Support X32 for X86_64.
(is_restart_error): Likewise.
(syscall_fixup_on_sysenter): Likewise.
(get_syscall_args): Likewise.
(get_syscall_result): Likewise.
(get_error): Likewise.
(__X32_SYSCALL_BIT): Define if not defined.
(__X32_SYSCALL_MASK): Likewise.
(get_scno): Check DS register value for X32. Use
__X32_SYSCALL_MASK on X32 system calls.
* util.c (printllval): Use ext_arg for X32.
(printcall): Support X32.
(change_syscall): Likewise.
(arg0_offset): Likewise.
(arg1_offset): Likewise.
* Makefile.am (EXTRA_DIST): Add linux/x32/errnoent.h,
linux/x32/ioctlent.h.in, linux/x32/signalent.h,
linux/x32/syscallent.h, linux/x86_64/errnoent2.h,
linux/x86_64/ioctlent2.h, linux/x86_64/signalent2.h and
linux/x86_64/syscallent2.h.
* linux/x32/errnoent.h: New.
* linux/x32/ioctlent.h.in: Likewise.
* linux/x32/signalent.h: Likewise.
* linux/x32/syscallent.h: Likewise.
* linux/x86_64/errnoent2.h: Likewise.
* linux/x86_64/ioctlent2.h: Likewise.
* linux/x86_64/signalent2.h: Likewise.
* linux/x86_64/syscallent2.h: Likewise.
Signed-off-by: H.J. Lu <hongjiu.lu@intel.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-04-16 15:00:01 +04:00
case 0x33 :
if ( x86_64_regs . ds = = 0x2b ) {
currpers = 2 ;
2013-02-11 15:29:36 +04:00
scno & = ~ __X32_SYSCALL_BIT ;
Add x32 support to strace
X32 support is added to Linux kernel 3.4. In a nutshell, x32 is x86-64 with
32bit pointers. At system call level, x32 is also identical to x86-64,
as shown by many changes like "defined(X86_64) || defined(X32)". The
main differerence bewteen x32 and x86-64 is off_t in x32 is long long
instead of long.
This patch adds x32 support to strace. Tested on Linux/x32.
* configure.ac: Support X32.
* defs.h: Set SUPPORTED_PERSONALITIES to 3 for X86_64,
Set PERSONALITY2_WORDSIZE to 4 for X86_64.
Add tcb::ext_arg for X32.
* file.c (stat): New for X32.
(sys_lseek): Use 64-bit version for X32.
(printstat64): Check current_personality != 1 for X86_64.
* ipc.c (indirect_ipccall): Check current_personality == 1
for X86_64.
* mem.c (sys_mmap64): Also use tcp->u_arg for X32. Print NULL
for zero address. Call printllval for offset for X32.
* pathtrace.c (pathtrace_match): Don't check sys_old_mmap for
X32.
* process.c (ARG_FLAGS): Defined for X32.
(ARG_STACK): Likewise.
(ARG_PTID): Likewise.
(change_syscall): Handle X32.
(struct_user_offsets): Support X32.
(sys_arch_prctl): Likewise.
* signal.c: Include <asm/sigcontext.h> for X32.
(SA_RESTORER): Also define for X32.
* syscall.c (update_personality): Support X32 for X86_64.
(is_restart_error): Likewise.
(syscall_fixup_on_sysenter): Likewise.
(get_syscall_args): Likewise.
(get_syscall_result): Likewise.
(get_error): Likewise.
(__X32_SYSCALL_BIT): Define if not defined.
(__X32_SYSCALL_MASK): Likewise.
(get_scno): Check DS register value for X32. Use
__X32_SYSCALL_MASK on X32 system calls.
* util.c (printllval): Use ext_arg for X32.
(printcall): Support X32.
(change_syscall): Likewise.
(arg0_offset): Likewise.
(arg1_offset): Likewise.
* Makefile.am (EXTRA_DIST): Add linux/x32/errnoent.h,
linux/x32/ioctlent.h.in, linux/x32/signalent.h,
linux/x32/syscallent.h, linux/x86_64/errnoent2.h,
linux/x86_64/ioctlent2.h, linux/x86_64/signalent2.h and
linux/x86_64/syscallent2.h.
* linux/x32/errnoent.h: New.
* linux/x32/ioctlent.h.in: Likewise.
* linux/x32/signalent.h: Likewise.
* linux/x32/syscallent.h: Likewise.
* linux/x86_64/errnoent2.h: Likewise.
* linux/x86_64/ioctlent2.h: Likewise.
* linux/x86_64/signalent2.h: Likewise.
* linux/x86_64/syscallent2.h: Likewise.
Signed-off-by: H.J. Lu <hongjiu.lu@intel.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-04-16 15:00:01 +04:00
} else
currpers = 0 ;
break ;
2011-08-24 18:52:57 +04:00
default :
2011-08-30 20:53:49 +04:00
fprintf ( stderr , " Unknown value CS=0x%08X while "
2011-08-24 18:52:57 +04:00
" detecting personality of process "
2011-08-30 20:53:49 +04:00
" PID=%d \n " , ( int ) x86_64_regs . cs , tcp - > pid ) ;
2011-08-24 18:52:57 +04:00
currpers = current_personality ;
break ;
}
2013-02-14 06:29:48 +04:00
# elif 0
2011-08-24 18:52:57 +04:00
/* This version analyzes the opcode of a syscall instruction.
* ( int 0x80 on i386 vs . syscall on x86 - 64 )
2013-02-14 06:29:48 +04:00
* It works , but is too complicated , and strictly speaking , unreliable .
2011-08-24 18:52:57 +04:00
*/
2013-02-14 06:29:48 +04:00
unsigned long call , rip = x86_64_regs . rip ;
2011-08-24 18:52:57 +04:00
/* sizeof(syscall) == sizeof(int 0x80) == 2 */
rip - = 2 ;
errno = 0 ;
2011-08-30 20:53:49 +04:00
call = ptrace ( PTRACE_PEEKTEXT , tcp - > pid , ( char * ) rip , ( char * ) 0 ) ;
2011-08-24 18:52:57 +04:00
if ( errno )
fprintf ( stderr , " ptrace_peektext failed: %s \n " ,
strerror ( errno ) ) ;
switch ( call & 0xffff ) {
/* x86-64: syscall = 0x0f 0x05 */
case 0x050f : currpers = 0 ; break ;
/* i386: int 0x80 = 0xcd 0x80 */
case 0x80cd : currpers = 1 ; break ;
default :
currpers = current_personality ;
fprintf ( stderr ,
" Unknown syscall opcode (0x%04X) while "
" detecting personality of process "
2011-08-30 20:53:49 +04:00
" PID=%d \n " , ( int ) call , tcp - > pid ) ;
2011-08-24 18:52:57 +04:00
break ;
}
2012-02-25 05:44:25 +04:00
# endif
2013-02-11 15:29:36 +04:00
Add x32 support to strace
X32 support is added to Linux kernel 3.4. In a nutshell, x32 is x86-64 with
32bit pointers. At system call level, x32 is also identical to x86-64,
as shown by many changes like "defined(X86_64) || defined(X32)". The
main differerence bewteen x32 and x86-64 is off_t in x32 is long long
instead of long.
This patch adds x32 support to strace. Tested on Linux/x32.
* configure.ac: Support X32.
* defs.h: Set SUPPORTED_PERSONALITIES to 3 for X86_64,
Set PERSONALITY2_WORDSIZE to 4 for X86_64.
Add tcb::ext_arg for X32.
* file.c (stat): New for X32.
(sys_lseek): Use 64-bit version for X32.
(printstat64): Check current_personality != 1 for X86_64.
* ipc.c (indirect_ipccall): Check current_personality == 1
for X86_64.
* mem.c (sys_mmap64): Also use tcp->u_arg for X32. Print NULL
for zero address. Call printllval for offset for X32.
* pathtrace.c (pathtrace_match): Don't check sys_old_mmap for
X32.
* process.c (ARG_FLAGS): Defined for X32.
(ARG_STACK): Likewise.
(ARG_PTID): Likewise.
(change_syscall): Handle X32.
(struct_user_offsets): Support X32.
(sys_arch_prctl): Likewise.
* signal.c: Include <asm/sigcontext.h> for X32.
(SA_RESTORER): Also define for X32.
* syscall.c (update_personality): Support X32 for X86_64.
(is_restart_error): Likewise.
(syscall_fixup_on_sysenter): Likewise.
(get_syscall_args): Likewise.
(get_syscall_result): Likewise.
(get_error): Likewise.
(__X32_SYSCALL_BIT): Define if not defined.
(__X32_SYSCALL_MASK): Likewise.
(get_scno): Check DS register value for X32. Use
__X32_SYSCALL_MASK on X32 system calls.
* util.c (printllval): Use ext_arg for X32.
(printcall): Support X32.
(change_syscall): Likewise.
(arg0_offset): Likewise.
(arg1_offset): Likewise.
* Makefile.am (EXTRA_DIST): Add linux/x32/errnoent.h,
linux/x32/ioctlent.h.in, linux/x32/signalent.h,
linux/x32/syscallent.h, linux/x86_64/errnoent2.h,
linux/x86_64/ioctlent2.h, linux/x86_64/signalent2.h and
linux/x86_64/syscallent2.h.
* linux/x32/errnoent.h: New.
* linux/x32/ioctlent.h.in: Likewise.
* linux/x32/signalent.h: Likewise.
* linux/x32/syscallent.h: Likewise.
* linux/x86_64/errnoent2.h: Likewise.
* linux/x86_64/ioctlent2.h: Likewise.
* linux/x86_64/signalent2.h: Likewise.
* linux/x86_64/syscallent2.h: Likewise.
Signed-off-by: H.J. Lu <hongjiu.lu@intel.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-04-16 15:00:01 +04:00
# ifdef X32
2013-02-11 15:29:36 +04:00
/* If we are built for a x32 system, then personality 0 is x32
* ( not x86_64 ) , and stracing of x86_64 apps is not supported .
* Stracing of i386 apps is still supported .
2012-04-17 22:05:04 +04:00
*/
2013-02-11 15:29:36 +04:00
if ( currpers = = 0 ) {
fprintf ( stderr , " syscall_%lu(...) in unsupported "
" 64-bit mode of process PID=%d \n " ,
scno , tcp - > pid ) ;
return 0 ;
Add x32 support to strace
X32 support is added to Linux kernel 3.4. In a nutshell, x32 is x86-64 with
32bit pointers. At system call level, x32 is also identical to x86-64,
as shown by many changes like "defined(X86_64) || defined(X32)". The
main differerence bewteen x32 and x86-64 is off_t in x32 is long long
instead of long.
This patch adds x32 support to strace. Tested on Linux/x32.
* configure.ac: Support X32.
* defs.h: Set SUPPORTED_PERSONALITIES to 3 for X86_64,
Set PERSONALITY2_WORDSIZE to 4 for X86_64.
Add tcb::ext_arg for X32.
* file.c (stat): New for X32.
(sys_lseek): Use 64-bit version for X32.
(printstat64): Check current_personality != 1 for X86_64.
* ipc.c (indirect_ipccall): Check current_personality == 1
for X86_64.
* mem.c (sys_mmap64): Also use tcp->u_arg for X32. Print NULL
for zero address. Call printllval for offset for X32.
* pathtrace.c (pathtrace_match): Don't check sys_old_mmap for
X32.
* process.c (ARG_FLAGS): Defined for X32.
(ARG_STACK): Likewise.
(ARG_PTID): Likewise.
(change_syscall): Handle X32.
(struct_user_offsets): Support X32.
(sys_arch_prctl): Likewise.
* signal.c: Include <asm/sigcontext.h> for X32.
(SA_RESTORER): Also define for X32.
* syscall.c (update_personality): Support X32 for X86_64.
(is_restart_error): Likewise.
(syscall_fixup_on_sysenter): Likewise.
(get_syscall_args): Likewise.
(get_syscall_result): Likewise.
(get_error): Likewise.
(__X32_SYSCALL_BIT): Define if not defined.
(__X32_SYSCALL_MASK): Likewise.
(get_scno): Check DS register value for X32. Use
__X32_SYSCALL_MASK on X32 system calls.
* util.c (printllval): Use ext_arg for X32.
(printcall): Support X32.
(change_syscall): Likewise.
(arg0_offset): Likewise.
(arg1_offset): Likewise.
* Makefile.am (EXTRA_DIST): Add linux/x32/errnoent.h,
linux/x32/ioctlent.h.in, linux/x32/signalent.h,
linux/x32/syscallent.h, linux/x86_64/errnoent2.h,
linux/x86_64/ioctlent2.h, linux/x86_64/signalent2.h and
linux/x86_64/syscallent2.h.
* linux/x32/errnoent.h: New.
* linux/x32/ioctlent.h.in: Likewise.
* linux/x32/signalent.h: Likewise.
* linux/x32/syscallent.h: Likewise.
* linux/x86_64/errnoent2.h: Likewise.
* linux/x86_64/ioctlent2.h: Likewise.
* linux/x86_64/signalent2.h: Likewise.
* linux/x86_64/syscallent2.h: Likewise.
Signed-off-by: H.J. Lu <hongjiu.lu@intel.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-04-16 15:00:01 +04:00
}
2013-02-11 15:29:36 +04:00
currpers & = ~ 2 ; /* map 2,1 to 0,1 */
Add x32 support to strace
X32 support is added to Linux kernel 3.4. In a nutshell, x32 is x86-64 with
32bit pointers. At system call level, x32 is also identical to x86-64,
as shown by many changes like "defined(X86_64) || defined(X32)". The
main differerence bewteen x32 and x86-64 is off_t in x32 is long long
instead of long.
This patch adds x32 support to strace. Tested on Linux/x32.
* configure.ac: Support X32.
* defs.h: Set SUPPORTED_PERSONALITIES to 3 for X86_64,
Set PERSONALITY2_WORDSIZE to 4 for X86_64.
Add tcb::ext_arg for X32.
* file.c (stat): New for X32.
(sys_lseek): Use 64-bit version for X32.
(printstat64): Check current_personality != 1 for X86_64.
* ipc.c (indirect_ipccall): Check current_personality == 1
for X86_64.
* mem.c (sys_mmap64): Also use tcp->u_arg for X32. Print NULL
for zero address. Call printllval for offset for X32.
* pathtrace.c (pathtrace_match): Don't check sys_old_mmap for
X32.
* process.c (ARG_FLAGS): Defined for X32.
(ARG_STACK): Likewise.
(ARG_PTID): Likewise.
(change_syscall): Handle X32.
(struct_user_offsets): Support X32.
(sys_arch_prctl): Likewise.
* signal.c: Include <asm/sigcontext.h> for X32.
(SA_RESTORER): Also define for X32.
* syscall.c (update_personality): Support X32 for X86_64.
(is_restart_error): Likewise.
(syscall_fixup_on_sysenter): Likewise.
(get_syscall_args): Likewise.
(get_syscall_result): Likewise.
(get_error): Likewise.
(__X32_SYSCALL_BIT): Define if not defined.
(__X32_SYSCALL_MASK): Likewise.
(get_scno): Check DS register value for X32. Use
__X32_SYSCALL_MASK on X32 system calls.
* util.c (printllval): Use ext_arg for X32.
(printcall): Support X32.
(change_syscall): Likewise.
(arg0_offset): Likewise.
(arg1_offset): Likewise.
* Makefile.am (EXTRA_DIST): Add linux/x32/errnoent.h,
linux/x32/ioctlent.h.in, linux/x32/signalent.h,
linux/x32/syscallent.h, linux/x86_64/errnoent2.h,
linux/x86_64/ioctlent2.h, linux/x86_64/signalent2.h and
linux/x86_64/syscallent2.h.
* linux/x32/errnoent.h: New.
* linux/x32/ioctlent.h.in: Likewise.
* linux/x32/signalent.h: Likewise.
* linux/x32/syscallent.h: Likewise.
* linux/x86_64/errnoent2.h: Likewise.
* linux/x86_64/ioctlent2.h: Likewise.
* linux/x86_64/signalent2.h: Likewise.
* linux/x86_64/syscallent2.h: Likewise.
Signed-off-by: H.J. Lu <hongjiu.lu@intel.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-04-16 15:00:01 +04:00
# endif
2012-04-17 22:05:04 +04:00
update_personality ( tcp , currpers ) ;
2012-02-25 05:44:25 +04:00
# elif defined(IA64)
2013-07-01 14:28:17 +04:00
if ( ia64_ia32mode ) {
2015-03-06 02:30:02 +03:00
scno = ia64_regs . gr [ 0 ] ;
2011-08-24 18:52:57 +04:00
} else {
2015-03-06 02:30:02 +03:00
scno = ia64_regs . gr [ 15 ] ;
2000-02-04 00:58:30 +03:00
}
2012-11-10 15:24:48 +04:00
# elif defined(AARCH64)
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
switch ( aarch64_io . iov_len ) {
2012-11-10 15:24:48 +04:00
case sizeof ( aarch64_regs ) :
/* We are in 64-bit mode */
scno = aarch64_regs . regs [ 8 ] ;
update_personality ( tcp , 1 ) ;
break ;
2013-02-08 15:38:51 +04:00
case sizeof ( arm_regs ) :
2012-11-10 15:24:48 +04:00
/* We are in 32-bit mode */
2013-07-04 11:54:19 +04:00
/* Note: we don't support OABI, unlike 32-bit ARM build */
2013-02-08 15:38:51 +04:00
scno = arm_regs . ARM_r7 ;
2014-03-04 03:45:26 +04:00
scno = shuffle_scno ( scno ) ;
2012-11-10 15:24:48 +04:00
update_personality ( tcp , 0 ) ;
break ;
}
2012-02-25 05:44:25 +04:00
# elif defined(ARM)
2013-02-20 21:08:25 +04:00
if ( arm_regs . ARM_ip ! = 0 ) {
/* It is not a syscall entry */
fprintf ( stderr , " pid %d stray syscall exit \n " , tcp - > pid ) ;
tcp - > flags | = TCB_INSYSCALL ;
return 0 ;
}
/* Note: we support only 32-bit CPUs, not 26-bit */
2014-03-19 03:37:43 +04:00
# if !defined(__ARM_EABI__) || ENABLE_ARM_OABI
2013-07-04 11:54:19 +04:00
if ( arm_regs . ARM_cpsr & 0x20 )
2013-02-20 21:08:25 +04:00
/* Thumb mode */
2013-07-04 11:54:19 +04:00
goto scno_in_r7 ;
/* ARM mode */
/* Check EABI/OABI by examining SVC insn's low 24 bits */
errno = 0 ;
scno = ptrace ( PTRACE_PEEKTEXT , tcp - > pid , ( void * ) ( arm_regs . ARM_pc - 4 ) , NULL ) ;
if ( errno )
return - 1 ;
/* EABI syscall convention? */
2015-01-14 10:21:36 +03:00
if ( ( unsigned long ) scno ! = 0xef000000 ) {
2013-07-04 11:54:19 +04:00
/* No, it's OABI */
if ( ( scno & 0x0ff00000 ) ! = 0x0f900000 ) {
fprintf ( stderr , " pid %d unknown syscall trap 0x%08lx \n " ,
tcp - > pid , scno ) ;
2013-02-20 21:08:25 +04:00
return - 1 ;
2003-06-04 03:29:04 +04:00
}
2013-07-04 11:54:19 +04:00
/* Fixup the syscall number */
scno & = 0x000fffff ;
} else {
scno_in_r7 :
scno = arm_regs . ARM_r7 ;
2013-02-20 21:08:25 +04:00
}
2014-03-19 03:37:43 +04:00
# else /* __ARM_EABI__ || !ENABLE_ARM_OABI */
2013-07-04 11:54:19 +04:00
scno = arm_regs . ARM_r7 ;
# endif
2013-02-21 18:46:34 +04:00
scno = shuffle_scno ( scno ) ;
2012-02-25 05:44:25 +04:00
# elif defined(M68K)
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , 4 * PT_ORIG_D0 , & scno ) < 0 )
1999-02-19 03:21:36 +03:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(MIPS)
2015-02-15 06:27:13 +03:00
scno = mips_REG_V0 ;
1999-11-01 00:15:38 +03:00
2013-02-21 19:13:47 +04:00
if ( ! SCNO_IN_RANGE ( scno ) ) {
2015-03-02 18:06:51 +03:00
if ( mips_REG_A3 = = 0 | | mips_REG_A3 = = ( uint64_t ) - 1 ) {
Tidy up order of includes; make bool variables explicit.
Bool variables are more compact in data and (on x86) on code too:
text data bss dec hex filename
237950 676 19044 257670 3ee86 strace.before
237838 676 19012 257526 3edf6 strace
* defs.h: Group library includes at the top of the file.
Rename dtime to Tflag, debug to debug_flag.
Change debug_flag,Tflag,qflag,not_failing_only,show_fd_path,tracing_paths
variable declarations from int to bool.
* strace.c: Change corresponding definitions. Do the same for static
variables iflag,rflag,print_pid_pfx.
Rename dtime to Tflag, debug to debug_flag.
* syscall.c: Rename dtime to Tflag, debug to debug_flag.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-03-15 15:49:52 +04:00
if ( debug_flag )
2011-08-24 18:52:57 +04:00
fprintf ( stderr , " stray syscall exit: v0 = %ld \n " , scno ) ;
return 0 ;
1999-11-01 00:15:38 +03:00
}
}
2012-02-25 05:44:25 +04:00
# elif defined(ALPHA)
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , REG_A3 , & alpha_a3 ) < 0 )
1999-02-19 03:21:36 +03:00
return - 1 ;
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , REG_R0 , & scno ) < 0 )
2011-08-24 18:52:57 +04:00
return - 1 ;
1999-02-19 03:21:36 +03:00
2011-08-24 18:52:57 +04:00
/*
* Do some sanity checks to figure out if it ' s
* really a syscall entry
*/
2013-02-21 19:13:47 +04:00
if ( ! SCNO_IN_RANGE ( scno ) ) {
2013-02-07 16:14:48 +04:00
if ( alpha_a3 = = 0 | | alpha_a3 = = - 1 ) {
Tidy up order of includes; make bool variables explicit.
Bool variables are more compact in data and (on x86) on code too:
text data bss dec hex filename
237950 676 19044 257670 3ee86 strace.before
237838 676 19012 257526 3edf6 strace
* defs.h: Group library includes at the top of the file.
Rename dtime to Tflag, debug to debug_flag.
Change debug_flag,Tflag,qflag,not_failing_only,show_fd_path,tracing_paths
variable declarations from int to bool.
* strace.c: Change corresponding definitions. Do the same for static
variables iflag,rflag,print_pid_pfx.
Rename dtime to Tflag, debug to debug_flag.
* syscall.c: Rename dtime to Tflag, debug to debug_flag.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-03-15 15:49:52 +04:00
if ( debug_flag )
2011-08-24 18:52:57 +04:00
fprintf ( stderr , " stray syscall exit: r0 = %ld \n " , scno ) ;
return 0 ;
1999-02-19 03:21:36 +03:00
}
}
2012-02-25 05:44:25 +04:00
# elif defined(SPARC) || defined(SPARC64)
2011-08-24 18:52:57 +04:00
/* Disassemble the syscall trap. */
/* Retrieve the syscall trap instruction. */
2013-02-05 20:02:59 +04:00
unsigned long trap ;
2011-08-24 18:52:57 +04:00
errno = 0 ;
2012-02-25 05:44:25 +04:00
# if defined(SPARC64)
2013-02-16 11:23:40 +04:00
trap = ptrace ( PTRACE_PEEKTEXT , tcp - > pid , ( char * ) sparc_regs . tpc , 0 ) ;
2011-08-24 18:52:57 +04:00
trap > > = 32 ;
2012-02-25 05:44:25 +04:00
# else
2013-02-16 11:23:40 +04:00
trap = ptrace ( PTRACE_PEEKTEXT , tcp - > pid , ( char * ) sparc_regs . pc , 0 ) ;
2012-02-25 05:44:25 +04:00
# endif
2011-08-24 18:52:57 +04:00
if ( errno )
return - 1 ;
1999-02-19 03:21:36 +03:00
2011-08-24 18:52:57 +04:00
/* Disassemble the trap to see what personality to use. */
switch ( trap ) {
case 0x91d02010 :
/* Linux/SPARC syscall trap. */
2011-12-23 04:50:49 +04:00
update_personality ( tcp , 0 ) ;
2011-08-24 18:52:57 +04:00
break ;
case 0x91d0206d :
/* Linux/SPARC64 syscall trap. */
2011-12-23 04:50:49 +04:00
update_personality ( tcp , 2 ) ;
2011-08-24 18:52:57 +04:00
break ;
case 0x91d02000 :
/* SunOS syscall trap. (pers 1) */
fprintf ( stderr , " syscall: SunOS no support \n " ) ;
return - 1 ;
case 0x91d02008 :
/* Solaris 2.x syscall trap. (per 2) */
2011-12-23 04:50:49 +04:00
update_personality ( tcp , 1 ) ;
2011-08-24 18:52:57 +04:00
break ;
case 0x91d02009 :
/* NetBSD/FreeBSD syscall trap. */
fprintf ( stderr , " syscall: NetBSD/FreeBSD not supported \n " ) ;
return - 1 ;
case 0x91d02027 :
/* Solaris 2.x gettimeofday */
2011-12-23 04:50:49 +04:00
update_personality ( tcp , 1 ) ;
2011-08-24 18:52:57 +04:00
break ;
default :
2012-02-25 05:44:25 +04:00
# if defined(SPARC64)
2013-02-16 11:23:40 +04:00
fprintf ( stderr , " syscall: unknown syscall trap %08lx %016lx \n " , trap , sparc_regs . tpc ) ;
2012-02-25 05:44:25 +04:00
# else
2013-02-16 11:23:40 +04:00
fprintf ( stderr , " syscall: unknown syscall trap %08lx %08lx \n " , trap , sparc_regs . pc ) ;
2012-02-25 05:44:25 +04:00
# endif
2011-08-24 18:52:57 +04:00
return - 1 ;
}
1999-02-19 03:21:36 +03:00
2011-08-24 18:52:57 +04:00
/* Extract the system call number from the registers. */
if ( trap = = 0x91d02027 )
scno = 156 ;
else
2013-02-16 11:23:40 +04:00
scno = sparc_regs . u_regs [ U_REG_G1 ] ;
2011-08-24 18:52:57 +04:00
if ( scno = = 0 ) {
2013-02-16 11:23:40 +04:00
scno = sparc_regs . u_regs [ U_REG_O0 ] ;
memmove ( & sparc_regs . u_regs [ U_REG_O0 ] , & sparc_regs . u_regs [ U_REG_O1 ] , 7 * sizeof ( sparc_regs . u_regs [ 0 ] ) ) ;
1999-02-19 03:21:36 +03:00
}
2012-02-25 05:44:25 +04:00
# elif defined(HPPA)
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , PT_GR20 , & scno ) < 0 )
2001-03-27 16:17:16 +04:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(SH)
2008-12-30 21:47:55 +03:00
/*
* In the new syscall ABI , the system call number is in R3 .
*/
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , 4 * ( REG_REG0 + 3 ) , & scno ) < 0 )
2008-12-30 21:47:55 +03:00
return - 1 ;
if ( scno < 0 ) {
/* Odd as it may seem, a glibc bug has been known to cause
glibc to issue bogus negative syscall numbers . So for
our purposes , make strace print what it * should * have been */
long correct_scno = ( scno & 0xff ) ;
Tidy up order of includes; make bool variables explicit.
Bool variables are more compact in data and (on x86) on code too:
text data bss dec hex filename
237950 676 19044 257670 3ee86 strace.before
237838 676 19012 257526 3edf6 strace
* defs.h: Group library includes at the top of the file.
Rename dtime to Tflag, debug to debug_flag.
Change debug_flag,Tflag,qflag,not_failing_only,show_fd_path,tracing_paths
variable declarations from int to bool.
* strace.c: Change corresponding definitions. Do the same for static
variables iflag,rflag,print_pid_pfx.
Rename dtime to Tflag, debug to debug_flag.
* syscall.c: Rename dtime to Tflag, debug to debug_flag.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-03-15 15:49:52 +04:00
if ( debug_flag )
2009-02-27 23:32:52 +03:00
fprintf ( stderr ,
2008-12-30 21:47:55 +03:00
" Detected glibc bug: bogus system call "
" number = %ld, correcting to %ld \n " ,
scno ,
correct_scno ) ;
scno = correct_scno ;
}
2012-02-25 05:44:25 +04:00
# elif defined(SH64)
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , REG_SYSCALL , & scno ) < 0 )
2003-06-02 23:18:58 +04:00
return - 1 ;
2008-12-30 21:47:55 +03:00
scno & = 0xFFFF ;
2012-02-25 05:44:25 +04:00
# elif defined(CRISV10) || defined(CRISV32)
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , 4 * PT_R9 , & scno ) < 0 )
2009-02-25 20:08:40 +03:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(TILE)
2014-09-10 17:46:04 +04:00
unsigned int currpers ;
Add tilegx support to strace
tilegx support has been in the kernel since 3.0.
In addition, fix some issues with the tilepro support already
present in strace, primarily the decision to use the
<asm/unistd.h> numbering space for system calls.
* defs.h [TILE]: Include <asm/ptrace.h> and provide an extern
struct pt_regs tile_regs for efficiency. Provide compat 32-bit
personality via SUPPORTED_PERSONALITIES, PERSONALITY0_WORDSIZE,
PERSONALITY1_WORDSIZE, and DEFAULT_PERSONALITY.
* linux/tile/errnoent1.h: New file, includes linux/errnoent.h.
* linux/tile/ioctlent1.h: New file, includes linux/ioctlent.h.
* linux/tile/signalent1.h: New file, includes linux/signalent.h.
* linux/tile/syscallent.h: Update with new asm-generic syscalls.
The version previously committed was the from the first tile patch
to LKML, which subsequently was changed to use <asm-generic/unistd.h>.
* linux/tile/syscallent1.h: Copy from linux/tile/syscallent.h.
* mem.c (addtileflags) [TILE]: use %ld properly for a "long" variable.
* process.c [TILE]: Choose clone arguments correctly and properly
suppress all "struct user" related offsets in user_struct_offsets.
* signal.c [TILE]: Use tile_regs not upeek.
* syscall.c (update_personality) [TILE]: Print mode.
(PT_FLAGS_COMPAT) [TILE]: Provide if not in system headers.
(tile_regs) [TILE]: Define 'struct pt_regs' variable to hold state.
(get_regs) [TILE]: use PTRACE_GETREGS to set tile_regs rather than using upeek.
(get_scno) [TILE]: Set personality.
(get_syscall_args) [TILE]: Use tile_regs.
(get_syscall_result) [TILE]: Update tile_regs.
(get_error) [TILE]: Use tile_regs.
(printcall) [TILE]: Print pc.
(arg0_offset, arg1_offset, restore_arg0, restore_arg1) [TILE]:
Properly handle tile call semantics and support tilegx.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 20:48:33 +04:00
scno = tile_regs . regs [ 10 ] ;
# ifdef __tilepro__
currpers = 1 ;
# else
2013-02-11 15:29:36 +04:00
# ifndef PT_FLAGS_COMPAT
# define PT_FLAGS_COMPAT 0x10000 /* from Linux 3.8 on */
# endif
Add tilegx support to strace
tilegx support has been in the kernel since 3.0.
In addition, fix some issues with the tilepro support already
present in strace, primarily the decision to use the
<asm/unistd.h> numbering space for system calls.
* defs.h [TILE]: Include <asm/ptrace.h> and provide an extern
struct pt_regs tile_regs for efficiency. Provide compat 32-bit
personality via SUPPORTED_PERSONALITIES, PERSONALITY0_WORDSIZE,
PERSONALITY1_WORDSIZE, and DEFAULT_PERSONALITY.
* linux/tile/errnoent1.h: New file, includes linux/errnoent.h.
* linux/tile/ioctlent1.h: New file, includes linux/ioctlent.h.
* linux/tile/signalent1.h: New file, includes linux/signalent.h.
* linux/tile/syscallent.h: Update with new asm-generic syscalls.
The version previously committed was the from the first tile patch
to LKML, which subsequently was changed to use <asm-generic/unistd.h>.
* linux/tile/syscallent1.h: Copy from linux/tile/syscallent.h.
* mem.c (addtileflags) [TILE]: use %ld properly for a "long" variable.
* process.c [TILE]: Choose clone arguments correctly and properly
suppress all "struct user" related offsets in user_struct_offsets.
* signal.c [TILE]: Use tile_regs not upeek.
* syscall.c (update_personality) [TILE]: Print mode.
(PT_FLAGS_COMPAT) [TILE]: Provide if not in system headers.
(tile_regs) [TILE]: Define 'struct pt_regs' variable to hold state.
(get_regs) [TILE]: use PTRACE_GETREGS to set tile_regs rather than using upeek.
(get_scno) [TILE]: Set personality.
(get_syscall_args) [TILE]: Use tile_regs.
(get_syscall_result) [TILE]: Update tile_regs.
(get_error) [TILE]: Use tile_regs.
(printcall) [TILE]: Print pc.
(arg0_offset, arg1_offset, restore_arg0, restore_arg1) [TILE]:
Properly handle tile call semantics and support tilegx.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 20:48:33 +04:00
if ( tile_regs . flags & PT_FLAGS_COMPAT )
currpers = 1 ;
else
currpers = 0 ;
# endif
update_personality ( tcp , currpers ) ;
2012-02-25 05:44:25 +04:00
# elif defined(MICROBLAZE)
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , 0 , & scno ) < 0 )
2010-07-06 16:21:07 +04:00
return - 1 ;
2013-02-14 16:26:27 +04:00
# elif defined(OR1K)
scno = or1k_regs . gpr [ 11 ] ;
2013-02-22 18:44:10 +04:00
# elif defined(METAG)
scno = metag_regs . dx [ 0 ] [ 1 ] ; /* syscall number in D1Re0 (D1.0) */
2013-03-25 21:22:07 +04:00
# elif defined(XTENSA)
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , SYSCALL_NR , & scno ) < 0 )
2013-03-25 21:22:07 +04:00
return - 1 ;
2013-08-16 11:17:06 +04:00
# elif defined(ARC)
scno = arc_regs . scratch . r8 ;
2012-02-25 05:44:25 +04:00
# endif
2009-02-25 20:08:40 +03:00
2011-08-24 18:52:57 +04:00
tcp - > scno = scno ;
2013-02-21 19:13:47 +04:00
if ( SCNO_IS_VALID ( tcp - > scno ) ) {
tcp - > s_ent = & sysent [ scno ] ;
tcp - > qual_flg = qual_flags [ scno ] ;
} else {
2013-02-22 16:26:10 +04:00
static const struct_sysent unknown = {
2013-02-21 19:13:47 +04:00
. nargs = MAX_ARGS ,
. sys_flags = 0 ,
. sys_func = printargs ,
. sys_name = " unknown " , /* not used */
} ;
tcp - > s_ent = & unknown ;
tcp - > qual_flg = UNDEFINED_SCNO | QUAL_RAW | DEFAULT_QUAL_FLAGS ;
}
2000-02-01 20:58:41 +03:00
return 1 ;
}
2015-02-06 02:43:06 +03:00
/*
* Cannot rely on __kernel_ [ u ] long_t being defined ,
* it is quite a recent feature of < asm / posix_types . h > .
*/
# ifdef __kernel_long_t
typedef __kernel_long_t kernel_long_t ;
typedef __kernel_ulong_t kernel_ulong_t ;
# else
# ifdef X32
typedef long long kernel_long_t ;
typedef unsigned long long kernel_ulong_t ;
# else
typedef long kernel_long_t ;
typedef unsigned long kernel_ulong_t ;
# endif
# endif
/*
* Check the syscall return value register value for whether it is
* a negated errno code indicating an error , or a success return value .
*/
static inline bool
is_negated_errno ( kernel_ulong_t val )
{
2015-02-19 19:58:52 +03:00
/* Linux kernel defines MAX_ERRNO to 4095. */
kernel_ulong_t max = - ( kernel_long_t ) 4095 ;
2015-02-06 02:43:06 +03:00
# if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
if ( current_wordsize < sizeof ( val ) ) {
val = ( uint32_t ) val ;
max = ( uint32_t ) max ;
}
# elif defined X32
/*
* current_wordsize is 4 even in personality 0 ( native X32 )
* but truncation _must not_ be done in it .
* can ' t check current_wordsize here !
*/
if ( current_personality ! = 0 ) {
val = ( uint32_t ) val ;
max = ( uint32_t ) max ;
}
# endif
2015-02-19 19:58:52 +03:00
return val > = max ;
2015-02-06 02:43:06 +03:00
}
2012-03-20 20:10:35 +04:00
/* Return -1 on error or 1 on success (never 0!) */
2005-06-09 00:45:28 +04:00
static int
2012-03-20 20:10:35 +04:00
get_syscall_args ( struct tcb * tcp )
2000-02-01 20:58:41 +03:00
{
2011-08-24 20:07:22 +04:00
int i , nargs ;
2013-02-21 19:13:47 +04:00
nargs = tcp - > s_ent - > nargs ;
2011-08-24 20:07:22 +04:00
2012-02-25 05:44:25 +04:00
# if defined(S390) || defined(S390X)
2015-03-06 01:10:15 +03:00
( void ) i ;
( void ) nargs ;
tcp - > u_arg [ 0 ] = s390_regset . orig_gpr2 ;
tcp - > u_arg [ 1 ] = s390_regset . gprs [ 3 ] ;
tcp - > u_arg [ 2 ] = s390_regset . gprs [ 4 ] ;
tcp - > u_arg [ 3 ] = s390_regset . gprs [ 5 ] ;
tcp - > u_arg [ 4 ] = s390_regset . gprs [ 6 ] ;
tcp - > u_arg [ 5 ] = s390_regset . gprs [ 7 ] ;
2012-02-25 05:44:25 +04:00
# elif defined(ALPHA)
2011-08-24 20:07:22 +04:00
for ( i = 0 ; i < nargs ; + + i )
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , REG_A0 + i , & tcp - > u_arg [ i ] ) < 0 )
2011-08-24 20:07:22 +04:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(IA64)
2013-07-01 14:28:17 +04:00
if ( ! ia64_ia32mode ) {
2015-03-06 02:30:02 +03:00
unsigned long * rbs_end =
( unsigned long * ) ia64_regs . ar [ PT_AUR_BSP ] ;
unsigned long sof = ( ia64_regs . cfm > > 0 ) & 0x7f ;
unsigned long sol = ( ia64_regs . cfm > > 7 ) & 0x7f ;
unsigned long * out0 = ia64_rse_skip_regs ( rbs_end , - sof + sol ) ;
2011-08-24 20:07:22 +04:00
for ( i = 0 ; i < nargs ; + + i ) {
if ( umoven ( tcp , ( unsigned long ) ia64_rse_skip_regs ( out0 , i ) ,
sizeof ( long ) , ( char * ) & tcp - > u_arg [ i ] ) < 0 )
return - 1 ;
2002-09-23 19:41:01 +04:00
}
2008-05-28 03:18:29 +04:00
} else {
2015-03-06 02:30:02 +03:00
( void ) i ;
( void ) nargs ;
/* truncate away IVE sign-extension */
tcp - > u_arg [ 0 ] = 0xffffffff & ia64_regs . gr [ 11 ] ; /* EBX */
tcp - > u_arg [ 1 ] = 0xffffffff & ia64_regs . gr [ 9 ] ; /* ECX */
tcp - > u_arg [ 2 ] = 0xffffffff & ia64_regs . gr [ 10 ] ; /* EDX */
tcp - > u_arg [ 3 ] = 0xffffffff & ia64_regs . gr [ 14 ] ; /* ESI */
tcp - > u_arg [ 4 ] = 0xffffffff & ia64_regs . gr [ 15 ] ; /* EDI */
tcp - > u_arg [ 5 ] = 0xffffffff & ia64_regs . gr [ 13 ] ; /* EBP */
2008-05-28 03:18:29 +04:00
}
2015-02-15 06:27:13 +03:00
# elif defined LINUX_MIPSN64
( void ) i ;
( void ) nargs ;
tcp - > u_arg [ 0 ] = mips_REG_A0 ;
tcp - > u_arg [ 1 ] = mips_REG_A1 ;
tcp - > u_arg [ 2 ] = mips_REG_A2 ;
tcp - > u_arg [ 3 ] = mips_REG_A3 ;
tcp - > u_arg [ 4 ] = mips_REG_A4 ;
tcp - > u_arg [ 5 ] = mips_REG_A5 ;
# elif defined LINUX_MIPSN32
( void ) i ;
( void ) nargs ;
tcp - > u_arg [ 0 ] = tcp - > ext_arg [ 0 ] = mips_REG_A0 ;
tcp - > u_arg [ 1 ] = tcp - > ext_arg [ 1 ] = mips_REG_A1 ;
tcp - > u_arg [ 2 ] = tcp - > ext_arg [ 2 ] = mips_REG_A2 ;
tcp - > u_arg [ 3 ] = tcp - > ext_arg [ 3 ] = mips_REG_A3 ;
tcp - > u_arg [ 4 ] = tcp - > ext_arg [ 4 ] = mips_REG_A4 ;
tcp - > u_arg [ 5 ] = tcp - > ext_arg [ 5 ] = mips_REG_A5 ;
# elif defined LINUX_MIPSO32
( void ) i ;
( void ) nargs ;
tcp - > u_arg [ 0 ] = mips_REG_A0 ;
tcp - > u_arg [ 1 ] = mips_REG_A1 ;
tcp - > u_arg [ 2 ] = mips_REG_A2 ;
tcp - > u_arg [ 3 ] = mips_REG_A3 ;
2011-08-24 20:07:22 +04:00
if ( nargs > 4 ) {
2015-02-15 06:27:13 +03:00
umoven ( tcp , mips_REG_SP + 4 * 4 ,
( nargs - 4 ) * sizeof ( tcp - > u_arg [ 0 ] ) ,
2011-08-24 20:07:22 +04:00
( char * ) ( tcp - > u_arg + 4 ) ) ;
2011-06-07 14:13:24 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(POWERPC)
2013-06-26 17:53:33 +04:00
( void ) i ;
( void ) nargs ;
tcp - > u_arg [ 0 ] = ppc_regs . orig_gpr3 ;
tcp - > u_arg [ 1 ] = ppc_regs . gpr [ 4 ] ;
tcp - > u_arg [ 2 ] = ppc_regs . gpr [ 5 ] ;
tcp - > u_arg [ 3 ] = ppc_regs . gpr [ 6 ] ;
tcp - > u_arg [ 4 ] = ppc_regs . gpr [ 7 ] ;
tcp - > u_arg [ 5 ] = ppc_regs . gpr [ 8 ] ;
2012-02-25 05:44:25 +04:00
# elif defined(SPARC) || defined(SPARC64)
2011-08-24 20:07:22 +04:00
for ( i = 0 ; i < nargs ; + + i )
2013-02-16 11:23:40 +04:00
tcp - > u_arg [ i ] = sparc_regs . u_regs [ U_REG_O0 + i ] ;
2012-02-25 05:44:25 +04:00
# elif defined(HPPA)
2011-08-24 20:07:22 +04:00
for ( i = 0 ; i < nargs ; + + i )
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , PT_GR26 - 4 * i , & tcp - > u_arg [ i ] ) < 0 )
2011-08-24 20:07:22 +04:00
return - 1 ;
2012-11-10 15:24:48 +04:00
# elif defined(ARM) || defined(AARCH64)
# if defined(AARCH64)
if ( tcp - > currpers = = 1 )
for ( i = 0 ; i < nargs ; + + i )
tcp - > u_arg [ i ] = aarch64_regs . regs [ i ] ;
else
2013-02-08 15:38:51 +04:00
# endif
2011-08-24 20:07:22 +04:00
for ( i = 0 ; i < nargs ; + + i )
2013-02-06 21:24:39 +04:00
tcp - > u_arg [ i ] = arm_regs . uregs [ i ] ;
2012-02-25 05:44:25 +04:00
# elif defined(AVR32)
2011-08-30 21:04:54 +04:00
( void ) i ;
( void ) nargs ;
2013-02-16 11:23:40 +04:00
tcp - > u_arg [ 0 ] = avr32_regs . r12 ;
tcp - > u_arg [ 1 ] = avr32_regs . r11 ;
tcp - > u_arg [ 2 ] = avr32_regs . r10 ;
tcp - > u_arg [ 3 ] = avr32_regs . r9 ;
tcp - > u_arg [ 4 ] = avr32_regs . r5 ;
tcp - > u_arg [ 5 ] = avr32_regs . r3 ;
2012-02-25 05:44:25 +04:00
# elif defined(BFIN)
2011-08-24 20:07:22 +04:00
static const int argreg [ MAX_ARGS ] = { PT_R0 , PT_R1 , PT_R2 , PT_R3 , PT_R4 , PT_R5 } ;
for ( i = 0 ; i < nargs ; + + i )
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , argreg [ i ] , & tcp - > u_arg [ i ] ) < 0 )
2011-08-24 20:07:22 +04:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(SH)
2011-08-24 20:07:22 +04:00
static const int syscall_regs [ MAX_ARGS ] = {
4 * ( REG_REG0 + 4 ) , 4 * ( REG_REG0 + 5 ) , 4 * ( REG_REG0 + 6 ) ,
4 * ( REG_REG0 + 7 ) , 4 * ( REG_REG0 ) , 4 * ( REG_REG0 + 1 )
} ;
for ( i = 0 ; i < nargs ; + + i )
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , syscall_regs [ i ] , & tcp - > u_arg [ i ] ) < 0 )
2011-08-24 20:07:22 +04:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(SH64)
2011-08-24 20:07:22 +04:00
int i ;
/* Registers used by SH5 Linux system calls for parameters */
static const int syscall_regs [ MAX_ARGS ] = { 2 , 3 , 4 , 5 , 6 , 7 } ;
for ( i = 0 ; i < nargs ; + + i )
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , REG_GENERAL ( syscall_regs [ i ] ) , & tcp - > u_arg [ i ] ) < 0 )
2011-08-24 20:07:22 +04:00
return - 1 ;
2013-02-15 18:01:38 +04:00
# elif defined(I386)
( void ) i ;
( void ) nargs ;
tcp - > u_arg [ 0 ] = i386_regs . ebx ;
tcp - > u_arg [ 1 ] = i386_regs . ecx ;
tcp - > u_arg [ 2 ] = i386_regs . edx ;
tcp - > u_arg [ 3 ] = i386_regs . esi ;
tcp - > u_arg [ 4 ] = i386_regs . edi ;
tcp - > u_arg [ 5 ] = i386_regs . ebp ;
Add x32 support to strace
X32 support is added to Linux kernel 3.4. In a nutshell, x32 is x86-64 with
32bit pointers. At system call level, x32 is also identical to x86-64,
as shown by many changes like "defined(X86_64) || defined(X32)". The
main differerence bewteen x32 and x86-64 is off_t in x32 is long long
instead of long.
This patch adds x32 support to strace. Tested on Linux/x32.
* configure.ac: Support X32.
* defs.h: Set SUPPORTED_PERSONALITIES to 3 for X86_64,
Set PERSONALITY2_WORDSIZE to 4 for X86_64.
Add tcb::ext_arg for X32.
* file.c (stat): New for X32.
(sys_lseek): Use 64-bit version for X32.
(printstat64): Check current_personality != 1 for X86_64.
* ipc.c (indirect_ipccall): Check current_personality == 1
for X86_64.
* mem.c (sys_mmap64): Also use tcp->u_arg for X32. Print NULL
for zero address. Call printllval for offset for X32.
* pathtrace.c (pathtrace_match): Don't check sys_old_mmap for
X32.
* process.c (ARG_FLAGS): Defined for X32.
(ARG_STACK): Likewise.
(ARG_PTID): Likewise.
(change_syscall): Handle X32.
(struct_user_offsets): Support X32.
(sys_arch_prctl): Likewise.
* signal.c: Include <asm/sigcontext.h> for X32.
(SA_RESTORER): Also define for X32.
* syscall.c (update_personality): Support X32 for X86_64.
(is_restart_error): Likewise.
(syscall_fixup_on_sysenter): Likewise.
(get_syscall_args): Likewise.
(get_syscall_result): Likewise.
(get_error): Likewise.
(__X32_SYSCALL_BIT): Define if not defined.
(__X32_SYSCALL_MASK): Likewise.
(get_scno): Check DS register value for X32. Use
__X32_SYSCALL_MASK on X32 system calls.
* util.c (printllval): Use ext_arg for X32.
(printcall): Support X32.
(change_syscall): Likewise.
(arg0_offset): Likewise.
(arg1_offset): Likewise.
* Makefile.am (EXTRA_DIST): Add linux/x32/errnoent.h,
linux/x32/ioctlent.h.in, linux/x32/signalent.h,
linux/x32/syscallent.h, linux/x86_64/errnoent2.h,
linux/x86_64/ioctlent2.h, linux/x86_64/signalent2.h and
linux/x86_64/syscallent2.h.
* linux/x32/errnoent.h: New.
* linux/x32/ioctlent.h.in: Likewise.
* linux/x32/signalent.h: Likewise.
* linux/x32/syscallent.h: Likewise.
* linux/x86_64/errnoent2.h: Likewise.
* linux/x86_64/ioctlent2.h: Likewise.
* linux/x86_64/signalent2.h: Likewise.
* linux/x86_64/syscallent2.h: Likewise.
Signed-off-by: H.J. Lu <hongjiu.lu@intel.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-04-16 15:00:01 +04:00
# elif defined(X86_64) || defined(X32)
2011-08-30 20:53:49 +04:00
( void ) i ;
( void ) nargs ;
2013-02-14 06:29:48 +04:00
if ( x86_io . iov_len ! = sizeof ( i386_regs ) ) {
/* x86-64 or x32 ABI */
2011-08-30 20:53:49 +04:00
tcp - > u_arg [ 0 ] = x86_64_regs . rdi ;
tcp - > u_arg [ 1 ] = x86_64_regs . rsi ;
tcp - > u_arg [ 2 ] = x86_64_regs . rdx ;
tcp - > u_arg [ 3 ] = x86_64_regs . r10 ;
tcp - > u_arg [ 4 ] = x86_64_regs . r8 ;
tcp - > u_arg [ 5 ] = x86_64_regs . r9 ;
Add x32 support to strace
X32 support is added to Linux kernel 3.4. In a nutshell, x32 is x86-64 with
32bit pointers. At system call level, x32 is also identical to x86-64,
as shown by many changes like "defined(X86_64) || defined(X32)". The
main differerence bewteen x32 and x86-64 is off_t in x32 is long long
instead of long.
This patch adds x32 support to strace. Tested on Linux/x32.
* configure.ac: Support X32.
* defs.h: Set SUPPORTED_PERSONALITIES to 3 for X86_64,
Set PERSONALITY2_WORDSIZE to 4 for X86_64.
Add tcb::ext_arg for X32.
* file.c (stat): New for X32.
(sys_lseek): Use 64-bit version for X32.
(printstat64): Check current_personality != 1 for X86_64.
* ipc.c (indirect_ipccall): Check current_personality == 1
for X86_64.
* mem.c (sys_mmap64): Also use tcp->u_arg for X32. Print NULL
for zero address. Call printllval for offset for X32.
* pathtrace.c (pathtrace_match): Don't check sys_old_mmap for
X32.
* process.c (ARG_FLAGS): Defined for X32.
(ARG_STACK): Likewise.
(ARG_PTID): Likewise.
(change_syscall): Handle X32.
(struct_user_offsets): Support X32.
(sys_arch_prctl): Likewise.
* signal.c: Include <asm/sigcontext.h> for X32.
(SA_RESTORER): Also define for X32.
* syscall.c (update_personality): Support X32 for X86_64.
(is_restart_error): Likewise.
(syscall_fixup_on_sysenter): Likewise.
(get_syscall_args): Likewise.
(get_syscall_result): Likewise.
(get_error): Likewise.
(__X32_SYSCALL_BIT): Define if not defined.
(__X32_SYSCALL_MASK): Likewise.
(get_scno): Check DS register value for X32. Use
__X32_SYSCALL_MASK on X32 system calls.
* util.c (printllval): Use ext_arg for X32.
(printcall): Support X32.
(change_syscall): Likewise.
(arg0_offset): Likewise.
(arg1_offset): Likewise.
* Makefile.am (EXTRA_DIST): Add linux/x32/errnoent.h,
linux/x32/ioctlent.h.in, linux/x32/signalent.h,
linux/x32/syscallent.h, linux/x86_64/errnoent2.h,
linux/x86_64/ioctlent2.h, linux/x86_64/signalent2.h and
linux/x86_64/syscallent2.h.
* linux/x32/errnoent.h: New.
* linux/x32/ioctlent.h.in: Likewise.
* linux/x32/signalent.h: Likewise.
* linux/x32/syscallent.h: Likewise.
* linux/x86_64/errnoent2.h: Likewise.
* linux/x86_64/ioctlent2.h: Likewise.
* linux/x86_64/signalent2.h: Likewise.
* linux/x86_64/syscallent2.h: Likewise.
Signed-off-by: H.J. Lu <hongjiu.lu@intel.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-04-16 15:00:01 +04:00
# ifdef X32
tcp - > ext_arg [ 0 ] = x86_64_regs . rdi ;
tcp - > ext_arg [ 1 ] = x86_64_regs . rsi ;
tcp - > ext_arg [ 2 ] = x86_64_regs . rdx ;
tcp - > ext_arg [ 3 ] = x86_64_regs . r10 ;
tcp - > ext_arg [ 4 ] = x86_64_regs . r8 ;
tcp - > ext_arg [ 5 ] = x86_64_regs . r9 ;
# endif
2013-02-14 06:29:48 +04:00
} else {
/* i386 ABI */
2013-02-15 18:01:38 +04:00
/* Zero-extend from 32 bits */
/* Use widen_to_long(tcp->u_arg[N]) in syscall handlers
* if you need to use * sign - extended * parameter .
*/
tcp - > u_arg [ 0 ] = ( long ) ( uint32_t ) i386_regs . ebx ;
tcp - > u_arg [ 1 ] = ( long ) ( uint32_t ) i386_regs . ecx ;
tcp - > u_arg [ 2 ] = ( long ) ( uint32_t ) i386_regs . edx ;
tcp - > u_arg [ 3 ] = ( long ) ( uint32_t ) i386_regs . esi ;
tcp - > u_arg [ 4 ] = ( long ) ( uint32_t ) i386_regs . edi ;
tcp - > u_arg [ 5 ] = ( long ) ( uint32_t ) i386_regs . ebp ;
2011-08-30 20:53:49 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(MICROBLAZE)
2011-08-24 20:07:22 +04:00
for ( i = 0 ; i < nargs ; + + i )
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , ( 5 + i ) * 4 , & tcp - > u_arg [ i ] ) < 0 )
2011-08-24 20:07:22 +04:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(CRISV10) || defined(CRISV32)
2011-08-24 20:07:22 +04:00
static const int crisregs [ MAX_ARGS ] = {
4 * PT_ORIG_R10 , 4 * PT_R11 , 4 * PT_R12 ,
4 * PT_R13 , 4 * PT_MOF , 4 * PT_SRP
} ;
for ( i = 0 ; i < nargs ; + + i )
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , crisregs [ i ] , & tcp - > u_arg [ i ] ) < 0 )
2011-08-24 20:07:22 +04:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(TILE)
2011-08-24 20:07:22 +04:00
for ( i = 0 ; i < nargs ; + + i )
Add tilegx support to strace
tilegx support has been in the kernel since 3.0.
In addition, fix some issues with the tilepro support already
present in strace, primarily the decision to use the
<asm/unistd.h> numbering space for system calls.
* defs.h [TILE]: Include <asm/ptrace.h> and provide an extern
struct pt_regs tile_regs for efficiency. Provide compat 32-bit
personality via SUPPORTED_PERSONALITIES, PERSONALITY0_WORDSIZE,
PERSONALITY1_WORDSIZE, and DEFAULT_PERSONALITY.
* linux/tile/errnoent1.h: New file, includes linux/errnoent.h.
* linux/tile/ioctlent1.h: New file, includes linux/ioctlent.h.
* linux/tile/signalent1.h: New file, includes linux/signalent.h.
* linux/tile/syscallent.h: Update with new asm-generic syscalls.
The version previously committed was the from the first tile patch
to LKML, which subsequently was changed to use <asm-generic/unistd.h>.
* linux/tile/syscallent1.h: Copy from linux/tile/syscallent.h.
* mem.c (addtileflags) [TILE]: use %ld properly for a "long" variable.
* process.c [TILE]: Choose clone arguments correctly and properly
suppress all "struct user" related offsets in user_struct_offsets.
* signal.c [TILE]: Use tile_regs not upeek.
* syscall.c (update_personality) [TILE]: Print mode.
(PT_FLAGS_COMPAT) [TILE]: Provide if not in system headers.
(tile_regs) [TILE]: Define 'struct pt_regs' variable to hold state.
(get_regs) [TILE]: use PTRACE_GETREGS to set tile_regs rather than using upeek.
(get_scno) [TILE]: Set personality.
(get_syscall_args) [TILE]: Use tile_regs.
(get_syscall_result) [TILE]: Update tile_regs.
(get_error) [TILE]: Use tile_regs.
(printcall) [TILE]: Print pc.
(arg0_offset, arg1_offset, restore_arg0, restore_arg1) [TILE]:
Properly handle tile call semantics and support tilegx.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 20:48:33 +04:00
tcp - > u_arg [ i ] = tile_regs . regs [ i ] ;
2012-02-25 05:44:25 +04:00
# elif defined(M68K)
2011-08-24 20:07:22 +04:00
for ( i = 0 ; i < nargs ; + + i )
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , ( i < 5 ? i : i + 2 ) * 4 , & tcp - > u_arg [ i ] ) < 0 )
2011-08-24 20:07:22 +04:00
return - 1 ;
2013-02-14 16:26:27 +04:00
# elif defined(OR1K)
( void ) nargs ;
for ( i = 0 ; i < 6 ; + + i )
tcp - > u_arg [ i ] = or1k_regs . gpr [ 3 + i ] ;
2013-02-22 18:44:10 +04:00
# elif defined(METAG)
for ( i = 0 ; i < nargs ; i + + )
/* arguments go backwards from D1Ar1 (D1.3) */
tcp - > u_arg [ i ] = ( ( unsigned long * ) & metag_regs . dx [ 3 ] [ 1 ] ) [ - i ] ;
2013-03-25 21:22:07 +04:00
# elif defined(XTENSA)
/* arg0: a6, arg1: a3, arg2: a4, arg3: a5, arg4: a8, arg5: a9 */
static const int xtensaregs [ MAX_ARGS ] = { 6 , 3 , 4 , 5 , 8 , 9 } ;
for ( i = 0 ; i < nargs ; + + i )
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , REG_A_BASE + xtensaregs [ i ] , & tcp - > u_arg [ i ] ) < 0 )
2013-03-25 21:22:07 +04:00
return - 1 ;
2013-08-16 11:17:06 +04:00
# elif defined(ARC)
long * arc_args = & arc_regs . scratch . r0 ;
for ( i = 0 ; i < nargs ; + + i )
tcp - > u_arg [ i ] = * arc_args - - ;
2012-02-25 05:44:25 +04:00
# else /* Other architecture (32bits specific) */
2011-08-24 20:07:22 +04:00
for ( i = 0 ; i < nargs ; + + i )
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , i * 4 , & tcp - > u_arg [ i ] ) < 0 )
2011-08-24 20:07:22 +04:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# endif
2000-02-01 20:58:41 +03:00
return 1 ;
}
2011-08-22 13:54:06 +04:00
static int
trace_syscall_entering ( struct tcb * tcp )
{
int res , scno_good ;
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
scno_good = res = ( get_regs_error ? - 1 : get_scno ( tcp ) ) ;
2011-08-22 13:54:06 +04:00
if ( res = = 0 )
return res ;
Remove support for systems without PTRACE_SETOPTIONS
Assume that the kernel is v2.5.46 or newer, i.e. PTRACE_SETOPTIONS
and PTRACE_O_TRACESYSGOOD|PTRACE_O_TRACEEXEC|PTRACE_O_TRACECLONE
are universally available.
This change removes all code that implemented post-execve SIGTRAP
handling and fork/vfork/clone->CLONE_PTRACE substitution.
* defs.h (TCB_BPTSET, TCB_WAITEXECVE): Remove macros.
(need_fork_exec_workarounds, setbpt, clearbpt): Remove declarations.
* strace.c (need_fork_exec_workarounds,
test_ptrace_setoptions_followfork, test_ptrace_setoptions_for_all):
Remove.
(syscall_trap_sig): Set to (SIGTRAP | 0x80).
(ptrace_setoptions): Set to (PTRACE_O_TRACESYSGOOD | PTRACE_O_TRACEEXEC).
(detach): Do not test for TCB_BPTSET.
(init): Do not call test_ptrace_setoptions_followfork and
test_ptrace_setoptions_for_all. Do not test for TCB_BPTSET.
* syscall.c (syscall_fixup_on_sysenter, internal_fork, internal_exec,
syscall_fixup_for_fork_exec, syscall_fixup_on_sysexit): Remove.
(trace_syscall_entering): Do not test for TCB_WAITEXECVE. Do not call
syscall_fixup_on_sysenter and syscall_fixup_for_fork_exec.
(trace_syscall_exiting): Do not call syscall_fixup_on_sysexit and
syscall_fixup_for_fork_exec.
[IA64] (ia64_ia32mode): Make static.
* linux/ia64/arch_regs.h (ia64_ia32mode): Remove declaration.
* util.c: Do not include "syscall.h".
(arg_setup, get_arg0, get_arg1, set_arg0, set_arg1, restore_arg0,
restore_arg1, arg_finish_change, change_syscall, setbpt, clearbpt):
Remove.
* tests/ptrace_setoptions.test: Remove.
* tests/Makefile.am (TESTS): Remove it.
2015-02-08 16:05:53 +03:00
if ( res = = 1 )
res = get_syscall_args ( tcp ) ;
2011-08-22 13:54:06 +04:00
if ( res ! = 1 ) {
printleader ( tcp ) ;
if ( scno_good ! = 1 )
2012-03-20 19:48:35 +04:00
tprints ( " ???? " /* anti-trigraph gap */ " ( " ) ;
2013-02-21 19:13:47 +04:00
else if ( tcp - > qual_flg & UNDEFINED_SCNO )
2013-02-21 18:46:34 +04:00
tprintf ( " %s( " , undefined_scno_name ( tcp ) ) ;
2011-08-22 13:54:06 +04:00
else
2013-02-21 19:13:47 +04:00
tprintf ( " %s( " , tcp - > s_ent - > sys_name ) ;
2011-08-22 13:54:06 +04:00
/*
* " <unavailable> " will be added later by the code which
* detects ptrace errors .
*/
goto ret ;
}
2013-05-14 18:07:46 +04:00
if ( sys_execve = = tcp - > s_ent - > sys_func
# if defined(SPARC) || defined(SPARC64)
| | sys_execv = = tcp - > s_ent - > sys_func
# endif
) {
hide_log_until_execve = 0 ;
}
2012-02-20 21:02:38 +04:00
# if defined(SYS_socket_subcall) || defined(SYS_ipc_subcall)
2013-02-21 19:13:47 +04:00
while ( 1 ) {
2012-02-25 05:44:25 +04:00
# ifdef SYS_socket_subcall
2013-02-21 19:13:47 +04:00
if ( tcp - > s_ent - > sys_func = = sys_socketcall ) {
2012-03-16 02:08:55 +04:00
decode_socket_subcall ( tcp ) ;
2012-02-20 21:02:38 +04:00
break ;
}
2012-02-25 05:44:25 +04:00
# endif
# ifdef SYS_ipc_subcall
2013-02-21 19:13:47 +04:00
if ( tcp - > s_ent - > sys_func = = sys_ipc ) {
2012-03-16 02:08:55 +04:00
decode_ipc_subcall ( tcp ) ;
2012-02-20 21:02:38 +04:00
break ;
}
2012-02-25 05:44:25 +04:00
# endif
2012-02-20 21:02:38 +04:00
break ;
}
2013-02-21 19:13:47 +04:00
# endif
2012-02-20 21:02:38 +04:00
2013-02-21 19:13:47 +04:00
if ( ! ( tcp - > qual_flg & QUAL_TRACE )
| | ( tracing_paths & & ! pathtrace_match ( tcp ) )
) {
2011-08-24 20:07:22 +04:00
tcp - > flags | = TCB_INSYSCALL | TCB_FILTERED ;
return 0 ;
}
tcp - > flags & = ~ TCB_FILTERED ;
2013-05-14 18:07:46 +04:00
if ( cflag = = CFLAG_ONLY_STATS | | hide_log_until_execve ) {
2011-08-24 20:07:22 +04:00
res = 0 ;
goto ret ;
}
2014-04-16 10:33:35 +04:00
# ifdef USE_LIBUNWIND
if ( stack_trace_enabled ) {
if ( tcp - > s_ent - > sys_flags & STACKTRACE_CAPTURE_ON_ENTER )
unwind_capture_stacktrace ( tcp ) ;
}
# endif
2011-08-24 20:07:22 +04:00
printleader ( tcp ) ;
2013-02-21 19:13:47 +04:00
if ( tcp - > qual_flg & UNDEFINED_SCNO )
2013-02-21 18:46:34 +04:00
tprintf ( " %s( " , undefined_scno_name ( tcp ) ) ;
2011-08-24 20:07:22 +04:00
else
2013-02-21 19:13:47 +04:00
tprintf ( " %s( " , tcp - > s_ent - > sys_name ) ;
if ( ( tcp - > qual_flg & QUAL_RAW ) & & tcp - > s_ent - > sys_func ! = sys_exit )
2011-08-24 20:07:22 +04:00
res = printargs ( tcp ) ;
else
2013-02-21 19:13:47 +04:00
res = tcp - > s_ent - > sys_func ( tcp ) ;
2011-08-24 20:07:22 +04:00
2012-09-18 02:40:12 +04:00
fflush ( tcp - > outf ) ;
2011-08-24 20:07:22 +04:00
ret :
tcp - > flags | = TCB_INSYSCALL ;
/* Measure the entrance time as late as possible to avoid errors. */
Tidy up order of includes; make bool variables explicit.
Bool variables are more compact in data and (on x86) on code too:
text data bss dec hex filename
237950 676 19044 257670 3ee86 strace.before
237838 676 19012 257526 3edf6 strace
* defs.h: Group library includes at the top of the file.
Rename dtime to Tflag, debug to debug_flag.
Change debug_flag,Tflag,qflag,not_failing_only,show_fd_path,tracing_paths
variable declarations from int to bool.
* strace.c: Change corresponding definitions. Do the same for static
variables iflag,rflag,print_pid_pfx.
Rename dtime to Tflag, debug to debug_flag.
* syscall.c: Rename dtime to Tflag, debug to debug_flag.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-03-15 15:49:52 +04:00
if ( Tflag | | cflag )
2011-08-24 20:07:22 +04:00
gettimeofday ( & tcp - > etime , NULL ) ;
return res ;
}
/* Returns:
2012-03-21 03:23:16 +04:00
* 1 : ok , continue in trace_syscall_exiting ( ) .
* - 1 : error , trace_syscall_exiting ( ) should print error indicator
2011-08-24 20:07:22 +04:00
* ( " ???? " etc ) and bail out .
*/
static int
get_syscall_result ( struct tcb * tcp )
{
2015-02-14 02:06:36 +03:00
# if defined ARCH_REGS_FOR_GETREGSET || defined ARCH_REGS_FOR_GETREGS
/* already done by get_regs */
2012-02-25 05:44:25 +04:00
# elif defined(BFIN)
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , PT_R0 , & bfin_r0 ) < 0 )
2011-08-25 12:31:24 +04:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(M68K)
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , 4 * PT_D0 , & m68k_d0 ) < 0 )
2011-08-25 12:31:24 +04:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(ALPHA)
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , REG_A3 , & alpha_a3 ) < 0 )
2011-08-24 20:07:22 +04:00
return - 1 ;
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , REG_R0 , & alpha_r0 ) < 0 )
2011-08-24 20:07:22 +04:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(HPPA)
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , PT_GR28 , & hppa_r28 ) < 0 )
2011-08-25 12:31:24 +04:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(SH)
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
/* new syscall ABI returns result in R0 */
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , 4 * REG_REG0 , ( long * ) & sh_r0 ) < 0 )
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(SH64)
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
/* ABI defines result returned in r9 */
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , REG_GENERAL ( 9 ) , ( long * ) & sh64_r9 ) < 0 )
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(CRISV10) || defined(CRISV32)
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , 4 * PT_R10 , & cris_r10 ) < 0 )
2011-08-25 12:31:24 +04:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(MICROBLAZE)
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , 3 * 4 , & microblaze_r3 ) < 0 )
2011-08-25 12:31:24 +04:00
return - 1 ;
2013-03-25 21:22:07 +04:00
# elif defined(XTENSA)
2013-06-28 16:35:47 +04:00
if ( upeek ( tcp - > pid , REG_A_BASE + 2 , & xtensa_a2 ) < 0 )
2013-03-25 21:22:07 +04:00
return - 1 ;
2015-02-14 02:06:36 +03:00
# else
# error get_syscall_result is not implemented for this architecture
2012-02-25 05:44:25 +04:00
# endif
2011-08-24 20:07:22 +04:00
return 1 ;
}
2012-03-21 03:23:16 +04:00
/* Returns:
* 1 : ok , continue in trace_syscall_exiting ( ) .
* - 1 : error , trace_syscall_exiting ( ) should print error indicator
* ( " ???? " etc ) and bail out .
*/
2013-02-16 17:25:56 +04:00
static void
2011-08-24 20:07:22 +04:00
get_error ( struct tcb * tcp )
{
int u_error = 0 ;
int check_errno = 1 ;
2013-02-21 19:13:47 +04:00
if ( tcp - > s_ent - > sys_flags & SYSCALL_NEVER_FAILS ) {
2011-08-24 20:07:22 +04:00
check_errno = 0 ;
}
2012-02-25 05:44:25 +04:00
# if defined(S390) || defined(S390X)
2015-03-06 01:10:15 +03:00
if ( check_errno & & is_negated_errno ( s390_regset . gprs [ 2 ] ) ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2015-03-06 01:10:15 +03:00
u_error = - s390_regset . gprs [ 2 ] ;
2011-08-24 20:07:22 +04:00
}
else {
2015-03-06 01:10:15 +03:00
tcp - > u_rval = s390_regset . gprs [ 2 ] ;
2011-08-24 20:07:22 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(I386)
2011-08-30 20:53:49 +04:00
if ( check_errno & & is_negated_errno ( i386_regs . eax ) ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2011-08-30 20:53:49 +04:00
u_error = - i386_regs . eax ;
2011-08-24 20:07:22 +04:00
}
else {
2011-08-30 20:53:49 +04:00
tcp - > u_rval = i386_regs . eax ;
2011-08-24 20:07:22 +04:00
}
2015-02-05 21:50:24 +03:00
# elif defined(X86_64) || defined(X32)
/*
* In X32 , return value is 64 - bit ( llseek uses one ) .
2013-02-14 06:29:48 +04:00
* Using merely " long rax " would not work .
*/
2015-02-05 21:50:24 +03:00
kernel_long_t rax ;
2013-02-14 06:29:48 +04:00
if ( x86_io . iov_len = = sizeof ( i386_regs ) ) {
/* Sign extend from 32 bits */
2015-02-05 21:50:24 +03:00
rax = ( int32_t ) i386_regs . eax ;
2013-02-14 06:29:48 +04:00
} else {
rax = x86_64_regs . rax ;
}
2015-02-05 21:04:36 +03:00
if ( check_errno & & is_negated_errno ( rax ) ) {
2013-02-12 14:52:35 +04:00
tcp - > u_rval = - 1 ;
2013-02-14 06:29:48 +04:00
u_error = - rax ;
2013-02-12 14:52:35 +04:00
}
else {
2015-02-05 21:50:24 +03:00
tcp - > u_rval = rax ;
# ifdef X32
/* tcp->u_rval contains a truncated value */
2013-02-14 06:29:48 +04:00
tcp - > u_lrval = rax ;
2015-02-05 21:50:24 +03:00
# endif
2011-08-24 20:07:22 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(IA64)
2013-07-01 14:28:17 +04:00
if ( ia64_ia32mode ) {
2015-03-06 02:30:02 +03:00
int err = ia64_regs . gr [ 8 ] ;
2011-08-24 20:07:22 +04:00
if ( check_errno & & is_negated_errno ( err ) ) {
tcp - > u_rval = - 1 ;
u_error = - err ;
}
else {
tcp - > u_rval = err ;
}
} else {
2015-03-06 02:30:02 +03:00
if ( check_errno & & ia64_regs . gr [ 10 ] ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2015-03-06 02:30:02 +03:00
u_error = ia64_regs . gr [ 8 ] ;
2011-08-24 20:07:22 +04:00
} else {
2015-03-06 02:30:02 +03:00
tcp - > u_rval = ia64_regs . gr [ 8 ] ;
2011-08-24 20:07:22 +04:00
}
}
2012-02-25 05:44:25 +04:00
# elif defined(MIPS)
2015-02-15 06:27:13 +03:00
if ( check_errno & & mips_REG_A3 ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2015-02-15 06:27:13 +03:00
u_error = mips_REG_V0 ;
2011-08-24 20:07:22 +04:00
} else {
2015-02-15 06:27:13 +03:00
# if defined LINUX_MIPSN32
tcp - > u_lrval = mips_REG_V0 ;
2012-04-16 14:16:45 +04:00
# endif
2015-02-15 06:27:13 +03:00
tcp - > u_rval = mips_REG_V0 ;
2011-08-24 20:07:22 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(POWERPC)
2013-06-28 18:47:38 +04:00
if ( check_errno & & ( ppc_regs . ccr & 0x10000000 ) ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2013-06-28 18:47:38 +04:00
u_error = ppc_regs . gpr [ 3 ] ;
2011-08-24 20:07:22 +04:00
}
else {
2013-06-28 18:47:38 +04:00
tcp - > u_rval = ppc_regs . gpr [ 3 ] ;
2011-08-24 20:07:22 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(M68K)
2013-02-07 16:14:48 +04:00
if ( check_errno & & is_negated_errno ( m68k_d0 ) ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2013-02-07 16:14:48 +04:00
u_error = - m68k_d0 ;
2011-08-24 20:07:22 +04:00
}
else {
2013-02-07 16:14:48 +04:00
tcp - > u_rval = m68k_d0 ;
2011-08-24 20:07:22 +04:00
}
2012-11-10 15:24:48 +04:00
# elif defined(ARM) || defined(AARCH64)
# if defined(AARCH64)
if ( tcp - > currpers = = 1 ) {
if ( check_errno & & is_negated_errno ( aarch64_regs . regs [ 0 ] ) ) {
tcp - > u_rval = - 1 ;
u_error = - aarch64_regs . regs [ 0 ] ;
}
else {
tcp - > u_rval = aarch64_regs . regs [ 0 ] ;
}
2012-10-24 20:58:16 +04:00
}
2012-11-10 15:24:48 +04:00
else
2013-02-08 15:38:51 +04:00
# endif
2012-11-10 15:24:48 +04:00
{
2013-02-06 21:24:39 +04:00
if ( check_errno & & is_negated_errno ( arm_regs . ARM_r0 ) ) {
2012-11-10 15:24:48 +04:00
tcp - > u_rval = - 1 ;
2013-02-06 21:24:39 +04:00
u_error = - arm_regs . ARM_r0 ;
2012-11-10 15:24:48 +04:00
}
else {
2013-02-06 21:24:39 +04:00
tcp - > u_rval = arm_regs . ARM_r0 ;
2012-11-10 15:24:48 +04:00
}
2012-10-24 20:58:16 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(AVR32)
2013-02-16 11:23:40 +04:00
if ( check_errno & & avr32_regs . r12 & & ( unsigned ) - avr32_regs . r12 < nerrnos ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2013-02-16 11:23:40 +04:00
u_error = - avr32_regs . r12 ;
2011-08-24 20:07:22 +04:00
}
else {
2013-02-16 11:23:40 +04:00
tcp - > u_rval = avr32_regs . r12 ;
2011-08-24 20:07:22 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(BFIN)
2013-02-13 20:52:31 +04:00
if ( check_errno & & is_negated_errno ( bfin_r0 ) ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2013-02-13 20:52:31 +04:00
u_error = - bfin_r0 ;
2011-08-24 20:07:22 +04:00
} else {
2013-02-13 20:52:31 +04:00
tcp - > u_rval = bfin_r0 ;
2011-08-24 20:07:22 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(ALPHA)
2013-02-07 16:14:48 +04:00
if ( check_errno & & alpha_a3 ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2013-02-13 20:52:31 +04:00
u_error = alpha_r0 ;
2011-08-24 20:07:22 +04:00
}
else {
2013-02-13 20:52:31 +04:00
tcp - > u_rval = alpha_r0 ;
2011-08-24 20:07:22 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(SPARC)
2013-02-16 11:23:40 +04:00
if ( check_errno & & sparc_regs . psr & PSR_C ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2013-02-16 11:23:40 +04:00
u_error = sparc_regs . u_regs [ U_REG_O0 ] ;
2011-08-24 20:07:22 +04:00
}
else {
2013-02-16 11:23:40 +04:00
tcp - > u_rval = sparc_regs . u_regs [ U_REG_O0 ] ;
2011-08-24 20:07:22 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(SPARC64)
2013-02-16 11:23:40 +04:00
if ( check_errno & & sparc_regs . tstate & 0x1100000000UL ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2013-02-16 11:23:40 +04:00
u_error = sparc_regs . u_regs [ U_REG_O0 ] ;
2011-08-24 20:07:22 +04:00
}
else {
2013-02-16 11:23:40 +04:00
tcp - > u_rval = sparc_regs . u_regs [ U_REG_O0 ] ;
2011-08-24 20:07:22 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(HPPA)
2013-02-07 16:14:48 +04:00
if ( check_errno & & is_negated_errno ( hppa_r28 ) ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2013-02-07 16:14:48 +04:00
u_error = - hppa_r28 ;
2011-08-24 20:07:22 +04:00
}
else {
2013-02-07 16:14:48 +04:00
tcp - > u_rval = hppa_r28 ;
2011-08-24 20:07:22 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(SH)
2013-02-13 20:52:31 +04:00
if ( check_errno & & is_negated_errno ( sh_r0 ) ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2013-02-13 20:52:31 +04:00
u_error = - sh_r0 ;
2011-08-24 20:07:22 +04:00
}
else {
2013-02-13 20:52:31 +04:00
tcp - > u_rval = sh_r0 ;
2011-08-24 20:07:22 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(SH64)
2013-02-07 16:14:48 +04:00
if ( check_errno & & is_negated_errno ( sh64_r9 ) ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2013-02-07 16:14:48 +04:00
u_error = - sh64_r9 ;
2011-08-24 20:07:22 +04:00
}
else {
2013-02-07 16:14:48 +04:00
tcp - > u_rval = sh64_r9 ;
2011-08-24 20:07:22 +04:00
}
2013-02-22 18:44:10 +04:00
# elif defined(METAG)
/* result pointer in D0Re0 (D0.0) */
if ( check_errno & & is_negated_errno ( metag_regs . dx [ 0 ] [ 0 ] ) ) {
tcp - > u_rval = - 1 ;
u_error = - metag_regs . dx [ 0 ] [ 0 ] ;
}
else {
tcp - > u_rval = metag_regs . dx [ 0 ] [ 0 ] ;
}
2012-02-25 05:44:25 +04:00
# elif defined(CRISV10) || defined(CRISV32)
2013-02-07 16:14:48 +04:00
if ( check_errno & & cris_r10 & & ( unsigned ) - cris_r10 < nerrnos ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2013-02-07 16:14:48 +04:00
u_error = - cris_r10 ;
2011-08-24 20:07:22 +04:00
}
else {
2013-02-07 16:14:48 +04:00
tcp - > u_rval = cris_r10 ;
2011-08-24 20:07:22 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(TILE)
Add tilegx support to strace
tilegx support has been in the kernel since 3.0.
In addition, fix some issues with the tilepro support already
present in strace, primarily the decision to use the
<asm/unistd.h> numbering space for system calls.
* defs.h [TILE]: Include <asm/ptrace.h> and provide an extern
struct pt_regs tile_regs for efficiency. Provide compat 32-bit
personality via SUPPORTED_PERSONALITIES, PERSONALITY0_WORDSIZE,
PERSONALITY1_WORDSIZE, and DEFAULT_PERSONALITY.
* linux/tile/errnoent1.h: New file, includes linux/errnoent.h.
* linux/tile/ioctlent1.h: New file, includes linux/ioctlent.h.
* linux/tile/signalent1.h: New file, includes linux/signalent.h.
* linux/tile/syscallent.h: Update with new asm-generic syscalls.
The version previously committed was the from the first tile patch
to LKML, which subsequently was changed to use <asm-generic/unistd.h>.
* linux/tile/syscallent1.h: Copy from linux/tile/syscallent.h.
* mem.c (addtileflags) [TILE]: use %ld properly for a "long" variable.
* process.c [TILE]: Choose clone arguments correctly and properly
suppress all "struct user" related offsets in user_struct_offsets.
* signal.c [TILE]: Use tile_regs not upeek.
* syscall.c (update_personality) [TILE]: Print mode.
(PT_FLAGS_COMPAT) [TILE]: Provide if not in system headers.
(tile_regs) [TILE]: Define 'struct pt_regs' variable to hold state.
(get_regs) [TILE]: use PTRACE_GETREGS to set tile_regs rather than using upeek.
(get_scno) [TILE]: Set personality.
(get_syscall_args) [TILE]: Use tile_regs.
(get_syscall_result) [TILE]: Update tile_regs.
(get_error) [TILE]: Use tile_regs.
(printcall) [TILE]: Print pc.
(arg0_offset, arg1_offset, restore_arg0, restore_arg1) [TILE]:
Properly handle tile call semantics and support tilegx.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 20:48:33 +04:00
/*
* The standard tile calling convention returns the value ( or negative
* errno ) in r0 , and zero ( or positive errno ) in r1 .
* Until at least kernel 3.8 , however , the r1 value is not reflected
* in ptregs at this point , so we use r0 here .
*/
if ( check_errno & & is_negated_errno ( tile_regs . regs [ 0 ] ) ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
Add tilegx support to strace
tilegx support has been in the kernel since 3.0.
In addition, fix some issues with the tilepro support already
present in strace, primarily the decision to use the
<asm/unistd.h> numbering space for system calls.
* defs.h [TILE]: Include <asm/ptrace.h> and provide an extern
struct pt_regs tile_regs for efficiency. Provide compat 32-bit
personality via SUPPORTED_PERSONALITIES, PERSONALITY0_WORDSIZE,
PERSONALITY1_WORDSIZE, and DEFAULT_PERSONALITY.
* linux/tile/errnoent1.h: New file, includes linux/errnoent.h.
* linux/tile/ioctlent1.h: New file, includes linux/ioctlent.h.
* linux/tile/signalent1.h: New file, includes linux/signalent.h.
* linux/tile/syscallent.h: Update with new asm-generic syscalls.
The version previously committed was the from the first tile patch
to LKML, which subsequently was changed to use <asm-generic/unistd.h>.
* linux/tile/syscallent1.h: Copy from linux/tile/syscallent.h.
* mem.c (addtileflags) [TILE]: use %ld properly for a "long" variable.
* process.c [TILE]: Choose clone arguments correctly and properly
suppress all "struct user" related offsets in user_struct_offsets.
* signal.c [TILE]: Use tile_regs not upeek.
* syscall.c (update_personality) [TILE]: Print mode.
(PT_FLAGS_COMPAT) [TILE]: Provide if not in system headers.
(tile_regs) [TILE]: Define 'struct pt_regs' variable to hold state.
(get_regs) [TILE]: use PTRACE_GETREGS to set tile_regs rather than using upeek.
(get_scno) [TILE]: Set personality.
(get_syscall_args) [TILE]: Use tile_regs.
(get_syscall_result) [TILE]: Update tile_regs.
(get_error) [TILE]: Use tile_regs.
(printcall) [TILE]: Print pc.
(arg0_offset, arg1_offset, restore_arg0, restore_arg1) [TILE]:
Properly handle tile call semantics and support tilegx.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 20:48:33 +04:00
u_error = - tile_regs . regs [ 0 ] ;
} else {
tcp - > u_rval = tile_regs . regs [ 0 ] ;
2011-08-24 20:07:22 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(MICROBLAZE)
2013-02-07 16:14:48 +04:00
if ( check_errno & & is_negated_errno ( microblaze_r3 ) ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2013-02-07 16:14:48 +04:00
u_error = - microblaze_r3 ;
2011-08-24 20:07:22 +04:00
}
else {
2013-02-07 16:14:48 +04:00
tcp - > u_rval = microblaze_r3 ;
2011-08-24 20:07:22 +04:00
}
2013-02-14 16:26:27 +04:00
# elif defined(OR1K)
if ( check_errno & & is_negated_errno ( or1k_regs . gpr [ 11 ] ) ) {
tcp - > u_rval = - 1 ;
u_error = - or1k_regs . gpr [ 11 ] ;
}
else {
tcp - > u_rval = or1k_regs . gpr [ 11 ] ;
}
2013-03-25 21:22:07 +04:00
# elif defined(XTENSA)
if ( check_errno & & is_negated_errno ( xtensa_a2 ) ) {
tcp - > u_rval = - 1 ;
u_error = - xtensa_a2 ;
}
else {
tcp - > u_rval = xtensa_a2 ;
}
2013-08-16 11:17:06 +04:00
# elif defined(ARC)
if ( check_errno & & is_negated_errno ( arc_regs . scratch . r0 ) ) {
tcp - > u_rval = - 1 ;
u_error = - arc_regs . scratch . r0 ;
}
else {
tcp - > u_rval = arc_regs . scratch . r0 ;
}
2012-02-25 05:44:25 +04:00
# endif
2011-08-24 20:07:22 +04:00
tcp - > u_error = u_error ;
}
2011-08-22 13:54:06 +04:00
2011-08-24 20:07:22 +04:00
static void
dumpio ( struct tcb * tcp )
{
2013-02-21 19:13:47 +04:00
int ( * func ) ( ) ;
2011-08-24 20:07:22 +04:00
if ( syserror ( tcp ) )
return ;
2013-02-22 16:37:36 +04:00
if ( ( unsigned long ) tcp - > u_arg [ 0 ] > = num_quals )
2011-08-24 20:07:22 +04:00
return ;
2013-02-21 19:13:47 +04:00
func = tcp - > s_ent - > sys_func ;
if ( func = = printargs )
2011-08-24 20:07:22 +04:00
return ;
if ( qual_flags [ tcp - > u_arg [ 0 ] ] & QUAL_READ ) {
2013-02-21 19:13:47 +04:00
if ( func = = sys_read | |
func = = sys_pread | |
func = = sys_recv | |
2015-02-01 01:57:00 +03:00
func = = sys_recvfrom ) {
2011-08-24 20:07:22 +04:00
dumpstr ( tcp , tcp - > u_arg [ 1 ] , tcp - > u_rval ) ;
2015-02-01 01:57:00 +03:00
return ;
} else if ( func = = sys_readv ) {
2011-08-24 20:07:22 +04:00
dumpiov ( tcp , tcp - > u_arg [ 2 ] , tcp - > u_arg [ 1 ] ) ;
2015-02-01 01:57:00 +03:00
return ;
2014-10-15 17:11:43 +04:00
# if HAVE_SENDMSG
2015-02-01 01:57:00 +03:00
} else if ( func = = sys_recvmsg ) {
2014-10-15 17:11:43 +04:00
dumpiov_in_msghdr ( tcp , tcp - > u_arg [ 1 ] ) ;
2015-02-01 01:57:00 +03:00
return ;
} else if ( func = = sys_recvmmsg ) {
2014-11-06 19:23:26 +03:00
dumpiov_in_mmsghdr ( tcp , tcp - > u_arg [ 1 ] ) ;
2015-02-01 01:57:00 +03:00
return ;
2014-10-15 17:11:43 +04:00
# endif
2015-02-01 01:57:00 +03:00
}
2011-08-22 13:54:06 +04:00
}
2011-08-24 20:07:22 +04:00
if ( qual_flags [ tcp - > u_arg [ 0 ] ] & QUAL_WRITE ) {
2013-02-21 19:13:47 +04:00
if ( func = = sys_write | |
func = = sys_pwrite | |
func = = sys_send | |
func = = sys_sendto )
2011-08-24 20:07:22 +04:00
dumpstr ( tcp , tcp - > u_arg [ 1 ] , tcp - > u_arg [ 2 ] ) ;
2013-02-21 19:13:47 +04:00
else if ( func = = sys_writev )
2011-08-24 20:07:22 +04:00
dumpiov ( tcp , tcp - > u_arg [ 2 ] , tcp - > u_arg [ 1 ] ) ;
2014-10-15 17:11:43 +04:00
# if HAVE_SENDMSG
else if ( func = = sys_sendmsg )
dumpiov_in_msghdr ( tcp , tcp - > u_arg [ 1 ] ) ;
2014-11-06 19:23:26 +03:00
else if ( func = = sys_sendmmsg )
dumpiov_in_mmsghdr ( tcp , tcp - > u_arg [ 1 ] ) ;
2014-10-15 17:11:43 +04:00
# endif
2011-08-22 13:54:06 +04:00
}
}
2010-03-29 21:51:02 +04:00
static int
trace_syscall_exiting ( struct tcb * tcp )
2000-02-01 20:58:41 +03:00
{
int sys_res ;
struct timeval tv ;
2011-08-25 02:29:56 +04:00
int res ;
2010-03-29 21:51:02 +04:00
long u_error ;
2000-02-01 20:58:41 +03:00
2010-03-29 21:51:02 +04:00
/* Measure the exit time as early as possible to avoid errors. */
Tidy up order of includes; make bool variables explicit.
Bool variables are more compact in data and (on x86) on code too:
text data bss dec hex filename
237950 676 19044 257670 3ee86 strace.before
237838 676 19012 257526 3edf6 strace
* defs.h: Group library includes at the top of the file.
Rename dtime to Tflag, debug to debug_flag.
Change debug_flag,Tflag,qflag,not_failing_only,show_fd_path,tracing_paths
variable declarations from int to bool.
* strace.c: Change corresponding definitions. Do the same for static
variables iflag,rflag,print_pid_pfx.
Rename dtime to Tflag, debug to debug_flag.
* syscall.c: Rename dtime to Tflag, debug to debug_flag.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-03-15 15:49:52 +04:00
if ( Tflag | | cflag )
2010-03-29 21:51:02 +04:00
gettimeofday ( & tv , NULL ) ;
2008-12-17 22:21:59 +03:00
2014-04-16 10:33:35 +04:00
# ifdef USE_LIBUNWIND
if ( stack_trace_enabled ) {
if ( tcp - > s_ent - > sys_flags & STACKTRACE_INVALIDATE_CACHE )
unwind_cache_invalidate ( tcp ) ;
}
# endif
2011-12-23 04:50:49 +04:00
# if SUPPORTED_PERSONALITIES > 1
update_personality ( tcp , tcp - > currpers ) ;
# endif
Optimize out PTRACE_PEEKUSER with -i
strace -i was fetching PC with a separate PEEKUSER
despite having GETREGS data:
ptrace(PTRACE_GETREGS, 22331, 0, 0x8087f00) = 0
ptrace(PTRACE_PEEKUSER, 22331, 4*EIP, [0x80dd7b7]) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22331, 0, SIG_0) = 0
Now it does this:
ptrace(PTRACE_GETREGS, 22549, 0, 0x8087ea0) = 0
write(3, "[080dd7b7] ioctl(0, SNDCTL_TMR_T"..., 82) = 82
ptrace(PTRACE_SYSCALL, 22549, 0, SIG_0) = 0
Analogous improvement in sys_sigreturn() is also implemented.
* defs.h: Declare extern struct pt_regs regs for SPARC[64] and ARM.
Declare clear_regs(), get_regs() and get_regs_error flag variable.
* strace.c (trace): Call get_regs(pid) as soon as we know the tcb
and that it is stopped.
* syscall.c (get_regs): New function. Used to fetch registers early,
just after tracee has stopped.
(printcall): Move it here from util.c. Use global regs.REG data,
if available on the arch, instead of re-fetching it.
(get_scno): Use global regs.REG data.
(get_syscall_result): Likewise.
* signal.c (sys_sigreturn): Likewise.
* util.c (printcall): Moved to syscall.c.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-02-05 19:36:13 +04:00
res = ( get_regs_error ? - 1 : get_syscall_result ( tcp ) ) ;
2012-03-20 20:10:35 +04:00
if ( res = = 1 ) {
2013-02-16 17:25:56 +04:00
get_error ( tcp ) ; /* never fails */
2013-05-14 18:07:46 +04:00
if ( filtered ( tcp ) | | hide_log_until_execve )
2013-02-16 17:25:56 +04:00
goto ret ;
2010-03-29 21:51:02 +04:00
}
2000-02-01 20:58:41 +03:00
2010-03-29 21:51:02 +04:00
if ( cflag ) {
2014-05-29 22:10:00 +04:00
count_syscall ( tcp , & tv ) ;
2011-06-22 16:32:43 +04:00
if ( cflag = = CFLAG_ONLY_STATS ) {
Fix -z display.
Before this patch, the following:
open("qwerty", O_RDONLY) = -1 ENOENT
write(2, "wc: qwerty: No such file or dire"..., 38) = 38
was shown totally wrongly with -z:
open("qwerty", O_RDONLY) = 38
(yes, that's right, write syscall is lost!)
Now it is shown "less wrongly" as:
open("qwerty", O_RDONLY <unfinished ...>
write(2, "wc: qwerty: No such file or dire"..., 38) = 38
* syscall.c (trace_syscall_exiting): Use common TCB_INSYSCALL clearing
via "goto ret". This fixes totally broken display of -z, but even now
it is not working as intended. Add a comment about that.
(trace_syscall_entering): Use common TCB_INSYSCALL setting
via "goto ret".
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
2011-08-22 04:06:35 +04:00
goto ret ;
2008-12-17 22:21:59 +03:00
}
2010-03-29 21:51:02 +04:00
}
2008-12-17 22:21:59 +03:00
2012-03-21 14:06:20 +04:00
/* If not in -ff mode, and printing_tcp != tcp,
* then the log currently does not end with output
* of _our syscall entry_ , but with something else .
* We need to say which syscall ' s return is this .
*
* Forced reprinting via TCB_REPRINT is used only by
* " strace -ff -oLOG test/threaded_execve " corner case .
* It ' s the only case when - ff mode needs reprinting .
*/
if ( ( followfork < 2 & & printing_tcp ! = tcp ) | | ( tcp - > flags & TCB_REPRINT ) ) {
tcp - > flags & = ~ TCB_REPRINT ;
printleader ( tcp ) ;
2013-02-21 19:13:47 +04:00
if ( tcp - > qual_flg & UNDEFINED_SCNO )
2013-02-21 18:46:34 +04:00
tprintf ( " <... %s resumed> " , undefined_scno_name ( tcp ) ) ;
2012-03-21 14:06:20 +04:00
else
2013-02-21 19:13:47 +04:00
tprintf ( " <... %s resumed> " , tcp - > s_ent - > sys_name ) ;
2012-03-21 14:06:20 +04:00
}
printing_tcp = tcp ;
2010-03-29 21:51:02 +04:00
if ( res ! = 1 ) {
2012-03-21 14:06:20 +04:00
/* There was error in one of prior ptrace ops */
2011-09-01 12:00:28 +04:00
tprints ( " ) " ) ;
2011-08-25 03:27:59 +04:00
tabto ( ) ;
2012-01-28 04:25:03 +04:00
tprints ( " = ? <unavailable> \n " ) ;
2012-03-13 14:44:31 +04:00
line_ended ( ) ;
2010-03-29 21:51:02 +04:00
tcp - > flags & = ~ TCB_INSYSCALL ;
return res ;
}
2012-03-21 14:06:20 +04:00
sys_res = 0 ;
2013-02-21 19:13:47 +04:00
if ( tcp - > qual_flg & QUAL_RAW ) {
2012-03-21 14:06:20 +04:00
/* sys_res = printargs(tcp); - but it's nop on sysexit */
2012-03-13 14:44:31 +04:00
} else {
Fix -z display.
Before this patch, the following:
open("qwerty", O_RDONLY) = -1 ENOENT
write(2, "wc: qwerty: No such file or dire"..., 38) = 38
was shown totally wrongly with -z:
open("qwerty", O_RDONLY) = 38
(yes, that's right, write syscall is lost!)
Now it is shown "less wrongly" as:
open("qwerty", O_RDONLY <unfinished ...>
write(2, "wc: qwerty: No such file or dire"..., 38) = 38
* syscall.c (trace_syscall_exiting): Use common TCB_INSYSCALL clearing
via "goto ret". This fixes totally broken display of -z, but even now
it is not working as intended. Add a comment about that.
(trace_syscall_entering): Use common TCB_INSYSCALL setting
via "goto ret".
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
2011-08-22 04:06:35 +04:00
/* FIXME: not_failing_only (IOW, option -z) is broken:
* failure of syscall is known only after syscall return .
* Thus we end up with something like this on , say , ENOENT :
* open ( " doesnt_exist " , O_RDONLY < unfinished . . . >
* { next syscall decode }
* whereas the intended result is that open ( . . . ) line
* is not shown at all .
*/
2010-03-29 21:51:02 +04:00
if ( not_failing_only & & tcp - > u_error )
Fix -z display.
Before this patch, the following:
open("qwerty", O_RDONLY) = -1 ENOENT
write(2, "wc: qwerty: No such file or dire"..., 38) = 38
was shown totally wrongly with -z:
open("qwerty", O_RDONLY) = 38
(yes, that's right, write syscall is lost!)
Now it is shown "less wrongly" as:
open("qwerty", O_RDONLY <unfinished ...>
write(2, "wc: qwerty: No such file or dire"..., 38) = 38
* syscall.c (trace_syscall_exiting): Use common TCB_INSYSCALL clearing
via "goto ret". This fixes totally broken display of -z, but even now
it is not working as intended. Add a comment about that.
(trace_syscall_entering): Use common TCB_INSYSCALL setting
via "goto ret".
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
2011-08-22 04:06:35 +04:00
goto ret ; /* ignore failed syscalls */
2013-02-21 19:13:47 +04:00
sys_res = tcp - > s_ent - > sys_func ( tcp ) ;
2010-03-29 21:51:02 +04:00
}
2011-09-01 12:00:28 +04:00
tprints ( " ) " ) ;
2011-08-25 03:27:59 +04:00
tabto ( ) ;
Fix -z display.
Before this patch, the following:
open("qwerty", O_RDONLY) = -1 ENOENT
write(2, "wc: qwerty: No such file or dire"..., 38) = 38
was shown totally wrongly with -z:
open("qwerty", O_RDONLY) = 38
(yes, that's right, write syscall is lost!)
Now it is shown "less wrongly" as:
open("qwerty", O_RDONLY <unfinished ...>
write(2, "wc: qwerty: No such file or dire"..., 38) = 38
* syscall.c (trace_syscall_exiting): Use common TCB_INSYSCALL clearing
via "goto ret". This fixes totally broken display of -z, but even now
it is not working as intended. Add a comment about that.
(trace_syscall_entering): Use common TCB_INSYSCALL setting
via "goto ret".
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
2011-08-22 04:06:35 +04:00
u_error = tcp - > u_error ;
2013-02-21 19:13:47 +04:00
if ( tcp - > qual_flg & QUAL_RAW ) {
2010-03-29 21:51:02 +04:00
if ( u_error )
tprintf ( " = -1 (errno %ld) " , u_error ) ;
else
tprintf ( " = %#lx " , tcp - > u_rval ) ;
}
else if ( ! ( sys_res & RVAL_NONE ) & & u_error ) {
switch ( u_error ) {
2012-01-12 14:26:34 +04:00
/* Blocked signals do not interrupt any syscalls.
* In this case syscalls don ' t return ERESTARTfoo codes .
*
* Deadly signals set to SIG_DFL interrupt syscalls
* and kill the process regardless of which of the codes below
* is returned by the interrupted syscall .
* In some cases , kernel forces a kernel - generated deadly
* signal to be unblocked and set to SIG_DFL ( and thus cause
* death ) if it is blocked or SIG_IGNed : for example , SIGSEGV
* or SIGILL . ( The alternative is to leave process spinning
* forever on the faulty instruction - not useful ) .
*
* SIG_IGNed signals and non - deadly signals set to SIG_DFL
* ( for example , SIGCHLD , SIGWINCH ) interrupt syscalls ,
* but kernel will always restart them .
*/
2010-03-29 21:51:02 +04:00
case ERESTARTSYS :
2012-01-12 14:26:34 +04:00
/* Most common type of signal-interrupted syscall exit code.
* The system call will be restarted with the same arguments
* if SA_RESTART is set ; otherwise , it will fail with EINTR .
*/
tprints ( " = ? ERESTARTSYS (To be restarted if SA_RESTART is set) " ) ;
2010-03-29 21:51:02 +04:00
break ;
case ERESTARTNOINTR :
2012-01-12 14:26:34 +04:00
/* Rare. For example, fork() returns this if interrupted.
* SA_RESTART is ignored ( assumed set ) : the restart is unconditional .
*/
2011-09-01 12:00:28 +04:00
tprints ( " = ? ERESTARTNOINTR (To be restarted) " ) ;
2010-03-29 21:51:02 +04:00
break ;
case ERESTARTNOHAND :
2012-01-12 14:26:34 +04:00
/* pause(), rt_sigsuspend() etc use this code.
* SA_RESTART is ignored ( assumed not set ) :
* syscall won ' t restart ( will return EINTR instead )
2013-02-19 19:59:26 +04:00
* even after signal with SA_RESTART set . However ,
* after SIG_IGN or SIG_DFL signal it will restart
* ( thus the name " restart only if has no handler " ) .
2012-01-12 14:26:34 +04:00
*/
2013-03-05 19:56:35 +04:00
tprints ( " = ? ERESTARTNOHAND (To be restarted if no handler) " ) ;
2010-03-29 21:51:02 +04:00
break ;
case ERESTART_RESTARTBLOCK :
2012-01-12 14:26:34 +04:00
/* Syscalls like nanosleep(), poll() which can't be
* restarted with their original arguments use this
* code . Kernel will execute restart_syscall ( ) instead ,
* which changes arguments before restarting syscall .
* SA_RESTART is ignored ( assumed not set ) similarly
* to ERESTARTNOHAND . ( Kernel can ' t honor SA_RESTART
* since restart data is saved in " restart block "
* in task struct , and if signal handler uses a syscall
* which in turn saves another such restart block ,
* old data is lost and restart becomes impossible )
*/
tprints ( " = ? ERESTART_RESTARTBLOCK (Interrupted by signal) " ) ;
2010-03-29 21:51:02 +04:00
break ;
default :
2015-02-23 06:10:25 +03:00
if ( ( unsigned long ) u_error < nerrnos
& & errnoent [ u_error ] )
2011-08-21 19:26:55 +04:00
tprintf ( " = -1 %s (%s) " , errnoent [ u_error ] ,
2010-03-29 21:51:02 +04:00
strerror ( u_error ) ) ;
2000-02-01 20:58:41 +03:00
else
2015-02-23 06:10:25 +03:00
tprintf ( " = -1 ERRNO_%lu (%s) " , u_error ,
2010-03-29 21:51:02 +04:00
strerror ( u_error ) ) ;
break ;
2000-02-01 20:58:41 +03:00
}
2010-03-29 21:51:02 +04:00
if ( ( sys_res & RVAL_STR ) & & tcp - > auxstr )
tprintf ( " (%s) " , tcp - > auxstr ) ;
}
else {
if ( sys_res & RVAL_NONE )
2011-09-01 12:00:28 +04:00
tprints ( " = ? " ) ;
2010-03-29 21:51:02 +04:00
else {
switch ( sys_res & RVAL_MASK ) {
case RVAL_HEX :
2015-03-01 02:41:11 +03:00
# if SUPPORTED_PERSONALITIES > 1
if ( current_wordsize < sizeof ( long ) )
tprintf ( " = %#x " ,
( unsigned int ) tcp - > u_rval ) ;
else
# endif
tprintf ( " = %#lx " , tcp - > u_rval ) ;
2000-02-01 20:58:41 +03:00
break ;
2010-03-29 21:51:02 +04:00
case RVAL_OCTAL :
tprintf ( " = %#lo " , tcp - > u_rval ) ;
2000-02-01 20:58:41 +03:00
break ;
2010-03-29 21:51:02 +04:00
case RVAL_UDECIMAL :
tprintf ( " = %lu " , tcp - > u_rval ) ;
2003-07-05 Richard Henderson <rth@twiddle.net>
* process.c (sys_clone): Order arguments for alpha the same as x86_64.
* syscall.c (ERESTART_RESTARTBLOCK): New.
(trace_syscall): Print it.
* linux/alpha/syscallent.h (osf_syscall): Name properly.
(osf_set_program_attributes): Fix typo.
(osf_nfssvc): Likewise.
(osf_sigsendset): Likewise.
(getdents64, gettid, readahead, tkill, setxattr, lsetxattr, fsetxattr,
getxattr, lgetxattr, fgetxattr, listxattr, llistxattr, flistxattr,
removexattr, lremovexattr, fremovexattr, futex, sched_setaffinity,
sched_getaffinity, tuxcall, io_setup, io_destroy, io_getevents,
io_submit, io_cancel, exit_group, lookup_dcookie, epoll_create,
epoll_ctl, epoll_wait, remap_file_pages, set_tid_address,
restart_syscall, fadvise, timer_create, timer_settime, timer_gettime,
timer_getoverrun, timer_delete, clock_settime, clock_gettime,
clock_getres, clock_nanosleep, semtimedop): New.
2003-07-09 13:47:59 +04:00
break ;
2010-03-29 21:51:02 +04:00
case RVAL_DECIMAL :
tprintf ( " = %ld " , tcp - > u_rval ) ;
2000-02-01 20:58:41 +03:00
break ;
2014-06-04 07:00:41 +04:00
case RVAL_FD :
if ( show_fd_path ) {
tprints ( " = " ) ;
printfd ( tcp , tcp - > u_rval ) ;
}
else
tprintf ( " = %ld " , tcp - > u_rval ) ;
break ;
2012-04-16 14:16:45 +04:00
# if defined(LINUX_MIPSN32) || defined(X32)
/*
case RVAL_LHEX :
tprintf ( " = %#llx " , tcp - > u_lrval ) ;
break ;
case RVAL_LOCTAL :
tprintf ( " = %#llo " , tcp - > u_lrval ) ;
break ;
*/
case RVAL_LUDECIMAL :
tprintf ( " = %llu " , tcp - > u_lrval ) ;
break ;
/*
case RVAL_LDECIMAL :
tprintf ( " = %lld " , tcp - > u_lrval ) ;
break ;
*/
# endif
2010-03-29 21:51:02 +04:00
default :
fprintf ( stderr ,
" invalid rval format \n " ) ;
break ;
2000-02-01 20:58:41 +03:00
}
}
2010-03-29 21:51:02 +04:00
if ( ( sys_res & RVAL_STR ) & & tcp - > auxstr )
tprintf ( " (%s) " , tcp - > auxstr ) ;
}
Tidy up order of includes; make bool variables explicit.
Bool variables are more compact in data and (on x86) on code too:
text data bss dec hex filename
237950 676 19044 257670 3ee86 strace.before
237838 676 19012 257526 3edf6 strace
* defs.h: Group library includes at the top of the file.
Rename dtime to Tflag, debug to debug_flag.
Change debug_flag,Tflag,qflag,not_failing_only,show_fd_path,tracing_paths
variable declarations from int to bool.
* strace.c: Change corresponding definitions. Do the same for static
variables iflag,rflag,print_pid_pfx.
Rename dtime to Tflag, debug to debug_flag.
* syscall.c: Rename dtime to Tflag, debug to debug_flag.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2012-03-15 15:49:52 +04:00
if ( Tflag ) {
2010-03-29 21:51:02 +04:00
tv_sub ( & tv , & tv , & tcp - > etime ) ;
tprintf ( " <%ld.%06ld> " ,
( long ) tv . tv_sec , ( long ) tv . tv_usec ) ;
2000-02-01 20:58:41 +03:00
}
2012-01-28 04:25:03 +04:00
tprints ( " \n " ) ;
2010-03-29 21:51:02 +04:00
dumpio ( tcp ) ;
2012-03-13 14:44:31 +04:00
line_ended ( ) ;
2013-07-23 11:11:35 +04:00
# ifdef USE_LIBUNWIND
if ( stack_trace_enabled )
2014-04-16 10:33:02 +04:00
unwind_print_stacktrace ( tcp ) ;
2013-07-23 11:11:35 +04:00
# endif
Fix -z display.
Before this patch, the following:
open("qwerty", O_RDONLY) = -1 ENOENT
write(2, "wc: qwerty: No such file or dire"..., 38) = 38
was shown totally wrongly with -z:
open("qwerty", O_RDONLY) = 38
(yes, that's right, write syscall is lost!)
Now it is shown "less wrongly" as:
open("qwerty", O_RDONLY <unfinished ...>
write(2, "wc: qwerty: No such file or dire"..., 38) = 38
* syscall.c (trace_syscall_exiting): Use common TCB_INSYSCALL clearing
via "goto ret". This fixes totally broken display of -z, but even now
it is not working as intended. Add a comment about that.
(trace_syscall_entering): Use common TCB_INSYSCALL setting
via "goto ret".
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
2011-08-22 04:06:35 +04:00
ret :
2010-03-29 21:51:02 +04:00
tcp - > flags & = ~ TCB_INSYSCALL ;
return 0 ;
}
int
trace_syscall ( struct tcb * tcp )
{
return exiting ( tcp ) ?
trace_syscall_exiting ( tcp ) : trace_syscall_entering ( tcp ) ;
}