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/user.h>
# include <sys/param.h>
1999-06-24 17:55:29 +04:00
1999-07-14 02:20:16 +04:00
# ifdef HAVE_SYS_REG_H
2012-02-25 05:44:25 +04:00
# include <sys / reg.h>
# ifndef PTRACE_PEEKUSR
# define PTRACE_PEEKUSR PTRACE_PEEKUSER
# endif
2000-02-20 02:59:03 +03:00
# elif defined(HAVE_LINUX_PTRACE_H)
2012-02-25 05:44:25 +04:00
# undef PTRACE_SYSCALL
2004-03-02 00:29:22 +03:00
# ifdef HAVE_STRUCT_IA64_FPREG
# define ia64_fpreg XXX_ia64_fpreg
# endif
# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
# define pt_all_user_regs XXX_pt_all_user_regs
# endif
2012-02-25 05:44:25 +04:00
# include <linux / ptrace.h>
2004-03-02 00:29:22 +03:00
# undef ia64_fpreg
# undef pt_all_user_regs
1999-10-06 17:06:34 +04:00
# endif
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
2012-02-25 05:38:52 +04:00
# if defined(IA64)
2000-02-04 00:58:30 +03:00
# include <asm / ptrace_offsets.h>
# include <asm / rse.h>
# endif
2012-10-24 20:58:16 +04:00
# if defined(AARCH64)
# include <asm / ptrace.h>
# include <sys / uio.h>
# include <elf.h>
# 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 defined(TILE)
# ifndef PT_FLAGS_COMPAT
# define PT_FLAGS_COMPAT 0x10000 /* from Linux 3.8 on */
# endif
# endif
1999-02-19 03:21:36 +03:00
# ifndef ERESTARTSYS
2012-02-25 05:44:25 +04:00
# define ERESTARTSYS 512
1999-02-19 03:21:36 +03:00
# endif
2012-03-17 06:17:15 +04:00
# ifndef ERESTARTNOINTR
2012-02-25 05:44:25 +04:00
# define ERESTARTNOINTR 513
1999-02-19 03:21:36 +03:00
# endif
2012-03-17 06:17:15 +04:00
# ifndef ERESTARTNOHAND
# define ERESTARTNOHAND 514 /* restart if no handler */
1999-02-19 03:21:36 +03:00
# endif
2012-03-17 06:17:15 +04:00
# ifndef ERESTART_RESTARTBLOCK
2012-02-25 05:44:25 +04:00
# define ERESTART_RESTARTBLOCK 516 /* restart by calling sys_restart_syscall */
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
# endif
2012-02-25 05:44:25 +04:00
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
# ifdef ARM
2011-08-18 14:48:56 +04:00
/* Ugh. Is this really correct? ARM has no RT signals?! */
2012-02-25 05:44:25 +04:00
# undef NSIG
# 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
1999-02-19 03:21:36 +03:00
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 struct sysent sysent0 [ ] = {
1999-02-19 03:21:36 +03:00
# include "syscallent.h"
} ;
# 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 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
# if SUPPORTED_PERSONALITIES >= 3
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 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
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
/*
* ` ioctlent . h ' may be generated from ` ioctlent . raw ' by the auxiliary
* 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 " .
*/
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 errnoent0 [ ] = {
1999-02-19 03:21:36 +03:00
# include "errnoent.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
static const char * const signalent0 [ ] = {
# include "signalent.h"
} ;
static const struct ioctlent ioctlent0 [ ] = {
# include "ioctlent.h"
} ;
enum { nsyscalls0 = ARRAY_SIZE ( sysent0 ) } ;
enum { nerrnos0 = ARRAY_SIZE ( errnoent0 ) } ;
enum { nsignals0 = ARRAY_SIZE ( signalent0 ) } ;
enum { nioctlents0 = ARRAY_SIZE ( ioctlent0 ) } ;
int qual_flags0 [ MAX_QUALS ] ;
1999-02-19 03:21:36 +03: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 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
} ;
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
} ;
enum { nsyscalls1 = ARRAY_SIZE ( sysent1 ) } ;
enum { nerrnos1 = ARRAY_SIZE ( errnoent1 ) } ;
enum { nsignals1 = ARRAY_SIZE ( signalent1 ) } ;
enum { nioctlents1 = ARRAY_SIZE ( ioctlent1 ) } ;
int qual_flags1 [ MAX_QUALS ] ;
# endif
1999-02-19 03:21:36 +03:00
# if SUPPORTED_PERSONALITIES >= 3
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
} ;
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
} ;
enum { nsyscalls2 = ARRAY_SIZE ( sysent2 ) } ;
enum { nerrnos2 = ARRAY_SIZE ( errnoent2 ) } ;
enum { nsignals2 = ARRAY_SIZE ( signalent2 ) } ;
enum { nioctlents2 = ARRAY_SIZE ( ioctlent2 ) } ;
int qual_flags2 [ MAX_QUALS ] ;
# endif
2012-03-19 12:36:42 +04:00
const struct sysent * sysent = sysent0 ;
const char * const * errnoent = errnoent0 ;
const char * const * signalent = signalent0 ;
const struct ioctlent * ioctlent = ioctlent0 ;
unsigned nsyscalls = nsyscalls0 ;
unsigned nerrnos = nerrnos0 ;
unsigned nsignals = nsignals0 ;
unsigned nioctlents = nioctlents0 ;
int * qual_flags = qual_flags0 ;
1999-02-19 03:21:36 +03:00
2012-03-19 12:36:42 +04:00
# if SUPPORTED_PERSONALITIES > 1
1999-02-19 03:21:36 +03:00
int current_personality ;
2006-01-12 13:18:53 +03:00
const int personality_wordsize [ SUPPORTED_PERSONALITIES ] = {
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
} ;
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
{
switch ( personality ) {
case 0 :
errnoent = errnoent0 ;
nerrnos = nerrnos0 ;
sysent = sysent0 ;
nsyscalls = nsyscalls0 ;
ioctlent = ioctlent0 ;
nioctlents = nioctlents0 ;
signalent = signalent0 ;
nsignals = nsignals0 ;
2006-01-12 12:50:49 +03:00
qual_flags = qual_flags0 ;
1999-02-19 03:21:36 +03:00
break ;
case 1 :
errnoent = errnoent1 ;
nerrnos = nerrnos1 ;
sysent = sysent1 ;
nsyscalls = nsyscalls1 ;
ioctlent = ioctlent1 ;
nioctlents = nioctlents1 ;
signalent = signalent1 ;
nsignals = nsignals1 ;
2006-01-12 12:50:49 +03:00
qual_flags = qual_flags1 ;
1999-02-19 03:21:36 +03:00
break ;
2012-03-19 12:36:42 +04:00
# if SUPPORTED_PERSONALITIES >= 3
1999-02-19 03:21:36 +03:00
case 2 :
errnoent = errnoent2 ;
nerrnos = nerrnos2 ;
sysent = sysent2 ;
nsyscalls = nsyscalls2 ;
ioctlent = ioctlent2 ;
nioctlents = nioctlents2 ;
signalent = signalent2 ;
nsignals = nsignals2 ;
2006-01-12 12:50:49 +03:00
qual_flags = qual_flags2 ;
1999-02-19 03:21:36 +03:00
break ;
2012-03-19 12:36:42 +04:00
# endif
1999-02-19 03:21:36 +03:00
}
current_personality = personality ;
}
2011-12-23 04:50:49 +04:00
static void
update_personality ( struct tcb * tcp , int personality )
{
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 ) {
static const char * const names [ ] = { " 32-bit ARM " , " AArch64 " } ;
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
2002-12-30 13:23:00 +03:00
static int qual_syscall ( ) , qual_signal ( ) , qual_fault ( ) , qual_desc ( ) ;
1999-02-19 03:21:36 +03:00
2004-09-04 08:20:43 +04:00
static const struct qual_options {
1999-02-19 03:21:36 +03:00
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_FAULT , " fault " , qual_fault , " fault " } ,
{ QUAL_FAULT , " faults " , qual_fault , " fault " } ,
{ QUAL_FAULT , " m " , qual_fault , " fault " } ,
{ 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 } ,
} ;
2002-12-30 13:23:00 +03:00
static void
2010-09-15 20:18:20 +04:00
qualify_one ( int n , int bitflag , int not , int pers )
2002-12-30 13:23:00 +03:00
{
2006-01-12 12:50:49 +03:00
if ( pers = = 0 | | pers < 0 ) {
if ( not )
2010-09-15 20:18:20 +04:00
qual_flags0 [ n ] & = ~ bitflag ;
2006-01-12 12:50:49 +03:00
else
2010-09-15 20:18:20 +04:00
qual_flags0 [ n ] | = bitflag ;
2006-01-12 12:50:49 +03:00
}
# if SUPPORTED_PERSONALITIES >= 2
if ( pers = = 1 | | pers < 0 ) {
if ( not )
2010-09-15 20:18:20 +04:00
qual_flags1 [ n ] & = ~ bitflag ;
2006-01-12 12:50:49 +03:00
else
2010-09-15 20:18:20 +04:00
qual_flags1 [ n ] | = bitflag ;
2006-01-12 12:50:49 +03:00
}
2012-02-25 05:44:25 +04:00
# endif
2006-01-12 12:50:49 +03:00
# if SUPPORTED_PERSONALITIES >= 3
if ( pers = = 2 | | pers < 0 ) {
if ( not )
2010-09-15 20:18:20 +04:00
qual_flags2 [ n ] & = ~ bitflag ;
2006-01-12 12:50:49 +03:00
else
2010-09-15 20:18:20 +04:00
qual_flags2 [ n ] | = bitflag ;
2006-01-12 12:50:49 +03:00
}
2012-02-25 05:44:25 +04:00
# endif
2002-12-30 13:23:00 +03:00
}
1999-02-19 03:21:36 +03:00
static int
2010-09-15 20:18:20 +04:00
qual_syscall ( const char * s , int bitflag , int not )
1999-02-19 03:21:36 +03:00
{
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 ' ) {
2012-03-26 01:49:48 +04:00
int i = string_to_uint ( s ) ;
2007-08-23 01:43:30 +04:00
if ( i < 0 | | i > = MAX_QUALS )
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
}
2007-08-23 01:43:30 +04:00
for ( i = 0 ; i < nsyscalls0 ; i + + )
2012-03-26 18:14:50 +04:00
if ( sysent0 [ i ] . sys_name & &
strcmp ( s , sysent0 [ i ] . sys_name ) = = 0 ) {
2010-09-15 20:18:20 +04:00
qualify_one ( i , bitflag , not , 0 ) ;
2006-01-12 12:50:49 +03:00
rc = 0 ;
}
# if SUPPORTED_PERSONALITIES >= 2
2007-08-23 01:43:30 +04:00
for ( i = 0 ; i < nsyscalls1 ; i + + )
2012-03-26 18:14:50 +04:00
if ( sysent1 [ i ] . sys_name & &
strcmp ( s , sysent1 [ i ] . sys_name ) = = 0 ) {
2010-09-15 20:18:20 +04:00
qualify_one ( i , bitflag , not , 1 ) ;
2005-02-02 07:40:11 +03:00
rc = 0 ;
2002-12-30 13:23:00 +03:00
}
2012-02-25 05:44:25 +04:00
# endif
2006-01-12 12:50:49 +03:00
# if SUPPORTED_PERSONALITIES >= 3
2007-08-23 01:43:30 +04:00
for ( i = 0 ; i < nsyscalls2 ; i + + )
2012-03-26 18:14:50 +04:00
if ( sysent2 [ i ] . sys_name & &
strcmp ( s , sysent2 [ i ] . sys_name ) = = 0 ) {
2010-09-15 20:18:20 +04:00
qualify_one ( i , bitflag , not , 2 ) ;
2006-01-12 12:50:49 +03:00
rc = 0 ;
}
2012-02-25 05:44:25 +04:00
# endif
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
2010-09-15 20:18:20 +04:00
qual_signal ( const char * s , int bitflag , int not )
1999-02-19 03:21:36 +03:00
{
int i ;
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 ) ;
2009-02-27 23:32:52 +03:00
if ( signo < 0 | | signo > = MAX_QUALS )
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
2010-09-15 20:18:20 +04:00
qual_fault ( const char * s , int bitflag , int not )
1999-02-19 03:21:36 +03:00
{
return - 1 ;
}
static int
2010-09-15 20:18:20 +04:00
qual_desc ( const char * s , int bitflag , 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 ) ;
2005-02-02 07:40:11 +03:00
if ( desc < 0 | | desc > = MAX_QUALS )
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 ;
1999-02-19 03:21:36 +03:00
int not ;
2010-09-07 02:08:24 +04:00
char * copy ;
const char * p ;
1999-02-19 03:21:36 +03:00
int i , n ;
opt = & qual_options [ 0 ] ;
for ( i = 0 ; ( p = qual_options [ i ] . option_name ) ; i + + ) {
n = strlen ( p ) ;
if ( strncmp ( s , p , n ) = = 0 & & s [ n ] = = ' = ' ) {
opt = & qual_options [ i ] ;
s + = n + 1 ;
break ;
}
}
not = 0 ;
if ( * s = = ' ! ' ) {
not = 1 ;
s + + ;
}
if ( strcmp ( s , " none " ) = = 0 ) {
not = 1 - not ;
s = " all " ;
}
if ( strcmp ( s , " all " ) = = 0 ) {
for ( i = 0 ; i < MAX_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 ;
}
for ( i = 0 ; i < MAX_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 , " , " ) ) {
1999-02-19 03:21:36 +03:00
if ( opt - > bitflag = = QUAL_TRACE & & ( n = lookup_class ( p ) ) > 0 ) {
2007-08-23 01:43:30 +04:00
for ( i = 0 ; i < nsyscalls0 ; i + + )
2006-01-12 12:50:49 +03:00
if ( sysent0 [ i ] . sys_flags & n )
2010-09-15 20:18:20 +04:00
qualify_one ( i , opt - > bitflag , not , 0 ) ;
2006-01-12 12:50:49 +03:00
# if SUPPORTED_PERSONALITIES >= 2
2007-08-23 01:43:30 +04:00
for ( i = 0 ; i < nsyscalls1 ; i + + )
2006-01-12 12:50:49 +03:00
if ( sysent1 [ i ] . sys_flags & n )
2010-09-15 20:18:20 +04:00
qualify_one ( i , opt - > bitflag , not , 1 ) ;
2012-02-25 05:44:25 +04:00
# endif
2006-01-12 12:50:49 +03:00
# if SUPPORTED_PERSONALITIES >= 3
2007-08-23 01:43:30 +04:00
for ( i = 0 ; i < nsyscalls2 ; i + + )
2006-01-12 12:50:49 +03:00
if ( sysent2 [ i ] . sys_flags & n )
2010-09-15 20:18:20 +04:00
qualify_one ( i , opt - > bitflag , not , 2 ) ;
2012-02-25 05:44:25 +04:00
# endif
2007-08-23 01:43:30 +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 ;
unsigned int i , size ;
if ( tcp - > u_arg [ 0 ] < 0 | | tcp - > u_arg [ 0 ] > = SYS_socket_nsubcalls )
return ;
tcp - > scno = SYS_socket_subcall + tcp - > u_arg [ 0 ] ;
addr = tcp - > u_arg [ 1 ] ;
tcp - > u_nargs = sysent [ tcp - > scno ] . nargs ;
2012-03-19 12:36:42 +04:00
size = current_wordsize ;
2012-03-16 02:08:55 +04:00
for ( i = 0 ; i < tcp - > u_nargs ; + + i ) {
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 )
{
unsigned int i ;
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 ] ;
tcp - > u_nargs = sysent [ tcp - > scno ] . nargs ;
for ( i = 0 ; i < tcp - > u_nargs ; i + + )
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 ;
1999-02-19 03:21:36 +03:00
2011-08-24 20:07:22 +04:00
for ( i = 0 ; i < tcp - > u_nargs ; i + + )
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 ;
for ( i = 0 ; i < tcp - > u_nargs ; i + + )
tprintf ( " %s%lu " , i ? " , " : " " , tcp - > u_arg [ i ] ) ;
}
return 0 ;
}
int
printargs_ld ( struct tcb * tcp )
{
if ( entering ( tcp ) ) {
int i ;
for ( i = 0 ; i < tcp - > u_nargs ; i + + )
tprintf ( " %s%ld " , i ? " , " : " " , tcp - > u_arg [ i ] ) ;
}
return 0 ;
}
2013-02-05 19:55:23 +04:00
# if defined(SPARC) || defined(SPARC64) || defined(IA64) || defined(SH)
2011-08-24 20:07:22 +04:00
long
getrval2 ( struct tcb * tcp )
{
2013-02-05 19:55:23 +04:00
long val ;
2006-12-21 14:44:28 +03:00
2013-02-05 19:55:23 +04:00
# if defined(SPARC) || defined(SPARC64)
2011-08-24 20:07:22 +04:00
val = regs . u_regs [ U_REG_O1 ] ;
2013-02-05 19:55:23 +04:00
# elif defined(SH)
2011-08-24 20:07:22 +04:00
if ( upeek ( tcp , 4 * ( REG_REG0 + 1 ) , & val ) < 0 )
return - 1 ;
2013-02-05 19:55:23 +04:00
# elif defined(IA64)
2011-08-24 20:07:22 +04:00
if ( upeek ( tcp , PT_R9 , & val ) < 0 )
return - 1 ;
2013-02-05 19:55:23 +04:00
# endif
2006-12-21 14:44:28 +03:00
2012-02-25 05:24:03 +04:00
return val ;
2011-08-24 20:07:22 +04:00
}
2013-02-05 19:55:23 +04:00
# endif
2012-02-25 05:24:03 +04:00
2011-08-24 20:07:22 +04:00
int
is_restart_error ( struct tcb * tcp )
{
switch ( tcp - > u_error ) {
case ERESTARTSYS :
case ERESTARTNOINTR :
case ERESTARTNOHAND :
case ERESTART_RESTARTBLOCK :
return 1 ;
default :
break ;
}
1999-02-19 03:21:36 +03:00
return 0 ;
}
2012-02-25 05:44:25 +04:00
# if defined(I386)
Display mask on enter to sigreturn, not on exit
sys_sigreturn() performs ugly manipulations in order to show
signal mask which is restored by this syscall: on syscall entry,
fetches it from the stack, saves it in tcp->u_arg[]
(where it used to overflow this array - fixed sometime ago),
then retrieves the mask and displays it on syscall exit.
Apparently, the motivation is to make it slightly more obvious
to user that signal mask is restored only when this syscall returns.
IMO, this hardly justifies the necessary hacks. It is much easier
to display the mask at the point when we fetch it - on syscall entry.
While at it, I made it so that we do display returned value/errno.
I see no point in hiding it and showing uninformative "= ?" instead.
Example of pause() being interrupted by ALRM which has installed handler
which re-arms ALRM:
Before the patch:
rt_sigsuspend([INT]) = ? ERESTARTNOHAND (To be restarted)
--- {si_signo=SIGALRM, si_code=SI_KERNEL} (Alarm clock) ---
alarm(1) = 0
sigreturn() = ? (mask now [INT])
After:
rt_sigsuspend([INT]) = ? ERESTARTNOHAND (To be restarted)
--- {si_signo=SIGALRM, si_code=SI_KERNEL} (Alarm clock) ---
alarm(1) = 0
sigreturn() (mask [INT]) = -1 EINTR (Interrupted system call)
* defs.h: Declare struct pt_regs i386_regs and struct pt_regs x86_64_regs.
* syscall.c: Remove "static" keywork from these structures' definitions.
* signal.c (sys_sigreturn): Display mask on enter, not on exit.
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
2012-01-10 19:40:35 +04:00
struct pt_regs 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
/*
* On 32 bits , pt_regs and user_regs_struct are the same ,
* but on 64 bits , user_regs_struct has six more fields :
* fs_base , gs_base , ds , es , fs , gs .
* PTRACE_GETREGS fills them too , so struct pt_regs would overflow .
*/
static struct user_regs_struct x86_64_regs ;
2012-02-25 05:44:25 +04:00
# elif defined(IA64)
2013-02-06 21:09:31 +04:00
long r8 , r10 ; /* TODO: make static? */
2011-06-07 14:13:24 +04:00
long ia32 = 0 ; /* not static */
2012-02-25 05:44:25 +04:00
# elif defined(POWERPC)
2012-03-21 03:07:25 +04:00
static long ppc_result ;
2012-02-25 05:44:25 +04:00
# elif defined(M68K)
2011-06-07 14:13:24 +04:00
static long d0 ;
2012-02-25 05:44:25 +04:00
# elif defined(BFIN)
2011-06-07 14:13:24 +04:00
static long r0 ;
2012-02-25 05:44:25 +04:00
# elif defined(ARM)
2013-02-06 21:24:39 +04:00
struct pt_regs arm_regs ; /* not static */
2012-10-24 20:58:16 +04:00
# elif defined(AARCH64)
2012-11-10 15:24:48 +04:00
static struct user_pt_regs aarch64_regs ;
2013-02-06 21:24:39 +04:00
static struct arm_pt_regs arm_regs ;
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 = {
. iov_base = & aarch64_regs
} ;
2012-02-25 05:44:25 +04:00
# elif defined(ALPHA)
2011-06-07 14:13:24 +04:00
static long r0 ;
static long a3 ;
2012-02-25 05:44:25 +04:00
# elif defined(AVR32)
2011-06-07 14:13:24 +04:00
static struct pt_regs regs ;
2012-02-25 05:44:25 +04:00
# elif defined(SPARC) || defined(SPARC64)
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
struct pt_regs regs ; /* not static */
2012-02-25 05:44:25 +04:00
# elif defined(LINUX_MIPSN32)
2011-06-07 14:13:24 +04:00
static long long a3 ;
static long long r2 ;
2012-02-25 05:44:25 +04:00
# elif defined(MIPS)
2011-06-07 14:13:24 +04:00
static long a3 ;
static long r2 ;
2012-02-25 05:44:25 +04:00
# elif defined(S390) || defined(S390X)
2011-06-07 14:13:24 +04:00
static long gpr2 ;
static long pc ;
static long syscall_mode ;
2012-02-25 05:44:25 +04:00
# elif defined(HPPA)
2011-06-07 14:13:24 +04:00
static long r28 ;
2012-02-25 05:44:25 +04:00
# elif defined(SH)
2011-06-07 14:13:24 +04:00
static long r0 ;
2012-02-25 05:44:25 +04:00
# elif defined(SH64)
2011-06-07 14:13:24 +04:00
static long r9 ;
2012-02-25 05:44:25 +04:00
# elif defined(CRISV10) || defined(CRISV32)
2011-06-07 14:13:24 +04:00
static long 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)
struct pt_regs tile_regs ;
2012-02-25 05:44:25 +04:00
# elif defined(MICROBLAZE)
2011-06-07 14:13:24 +04:00
static long r3 ;
2012-02-25 05:44:25 +04:00
# endif
2000-04-11 02:22:31 +04: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
void
printcall ( struct tcb * tcp )
{
# define PRINTBADPC tprintf(sizeof(long) == 4 ? "[????????] " : \
sizeof ( long ) = = 8 ? " [????????????????] " : \
NULL /* crash */ )
if ( get_regs_error ) {
PRINTBADPC ;
return ;
}
# if defined(I386)
tprintf ( " [%08lx] " , i386_regs . eip ) ;
# elif defined(S390) || defined(S390X)
long psw ;
if ( upeek ( tcp , PT_PSWADDR , & psw ) < 0 ) {
PRINTBADPC ;
return ;
}
# ifdef S390
tprintf ( " [%08lx] " , psw ) ;
# elif S390X
2013-02-05 23:01:58 +04:00
tprintf ( " [%016lx] " , psw ) ;
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
# elif defined(X86_64) || defined(X32)
2013-02-05 23:01:58 +04:00
tprintf ( " [%016lx] " , ( 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(IA64)
long ip ;
if ( upeek ( tcp , PT_B0 , & ip ) < 0 ) {
PRINTBADPC ;
return ;
}
tprintf ( " [%08lx] " , ip ) ;
# elif defined(POWERPC)
long pc ;
if ( upeek ( tcp , sizeof ( unsigned long ) * PT_NIP , & pc ) < 0 ) {
PRINTBADPC ;
return ;
}
# ifdef POWERPC64
tprintf ( " [%016lx] " , pc ) ;
# else
tprintf ( " [%08lx] " , pc ) ;
# endif
# elif defined(M68K)
long pc ;
if ( upeek ( tcp , 4 * PT_PC , & pc ) < 0 ) {
tprints ( " [????????] " ) ;
return ;
}
tprintf ( " [%08lx] " , pc ) ;
# elif defined(ALPHA)
long pc ;
if ( upeek ( tcp , REG_PC , & pc ) < 0 ) {
tprints ( " [????????????????] " ) ;
return ;
}
tprintf ( " [%08lx] " , pc ) ;
# elif defined(SPARC)
tprintf ( " [%08lx] " , regs . pc ) ;
# elif defined(SPARC64)
tprintf ( " [%08lx] " , regs . tpc ) ;
# elif defined(HPPA)
long pc ;
if ( upeek ( tcp , PT_IAOQ0 , & pc ) < 0 ) {
tprints ( " [????????] " ) ;
return ;
}
tprintf ( " [%08lx] " , pc ) ;
# elif defined(MIPS)
long pc ;
if ( upeek ( tcp , REG_EPC , & pc ) < 0 ) {
tprints ( " [????????] " ) ;
return ;
}
tprintf ( " [%08lx] " , pc ) ;
# elif defined(SH)
long pc ;
if ( upeek ( tcp , 4 * REG_PC , & pc ) < 0 ) {
tprints ( " [????????] " ) ;
return ;
}
tprintf ( " [%08lx] " , pc ) ;
# elif defined(SH64)
long pc ;
if ( upeek ( tcp , REG_PC , & pc ) < 0 ) {
tprints ( " [????????????????] " ) ;
return ;
}
tprintf ( " [%08lx] " , pc ) ;
# elif defined(ARM)
2013-02-06 21:24:39 +04:00
tprintf ( " [%08lx] " , 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(AARCH64) ??? */
# elif defined(AVR32)
tprintf ( " [%08lx] " , regs . pc ) ;
# elif defined(BFIN)
long pc ;
if ( upeek ( tcp , PT_PC , & pc ) < 0 ) {
PRINTBADPC ;
return ;
}
tprintf ( " [%08lx] " , pc ) ;
# elif defined(CRISV10)
long pc ;
if ( upeek ( tcp , 4 * PT_IRP , & pc ) < 0 ) {
PRINTBADPC ;
return ;
}
tprintf ( " [%08lx] " , pc ) ;
# elif defined(CRISV32)
long pc ;
if ( upeek ( tcp , 4 * PT_ERP , & pc ) < 0 ) {
PRINTBADPC ;
return ;
}
tprintf ( " [%08lx] " , 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)
# ifdef _LP64
2013-02-05 22:02:42 +04:00
tprintf ( " [%016lx] " , ( unsigned long ) tile_regs . 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
# else
2013-02-05 22:02:42 +04:00
tprintf ( " [%08lx] " , ( unsigned long ) tile_regs . 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
# 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
# endif /* architecture */
}
# ifndef get_regs
long get_regs_error ;
void get_regs ( pid_t pid )
{
# if defined(AVR32)
get_regs_error = ptrace ( PTRACE_GETREGS , pid , NULL , & regs ) ;
# elif defined(I386)
get_regs_error = ptrace ( PTRACE_GETREGS , pid , NULL , ( long ) & i386_regs ) ;
# elif defined(X86_64) || defined(X32)
get_regs_error = ptrace ( PTRACE_GETREGS , pid , NULL , ( long ) & x86_64_regs ) ;
2013-02-06 21:24:39 +04:00
# elif defined(ARM)
get_regs_error = ptrace ( PTRACE_GETREGS , pid , NULL , ( void * ) & arm_regs ) ;
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(AARCH64)
/*aarch64_io.iov_base = &aarch64_regs; - already is */
aarch64_io . iov_len = sizeof ( aarch64_regs ) ;
get_regs_error = ptrace ( PTRACE_GETREGSET , pid , NT_PRSTATUS , ( void * ) & aarch64_io ) ;
if ( get_regs_error )
return ;
switch ( aarch64_io . iov_len ) {
case sizeof ( regs ) :
/* We are in 32-bit mode */
2013-02-06 21:24:39 +04:00
memcpy ( & arm_regs , & aarch64_regs , sizeof ( arm_regs ) ) ;
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
break ;
case sizeof ( aarch64_regs ) :
/* We are in 64-bit mode */
/* Data is already in aarch64_regs */
break ;
default :
get_regs_error = - 1 ;
break ;
}
# elif defined(SPARC) || defined(SPARC64)
get_regs_error = ptrace ( PTRACE_GETREGS , pid , ( char * ) & regs , 0 ) ;
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)
2013-02-05 22:02:42 +04:00
get_regs_error = ptrace ( PTRACE_GETREGS , pid , NULL , ( long ) & tile_regs ) ;
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
}
# endif
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)
2008-12-16 21:18:40 +03:00
if ( upeek ( tcp , PT_GPR2 , & syscall_mode ) < 0 )
2011-06-07 14:13:24 +04:00
return - 1 ;
2003-06-27 02:23:28 +04:00
if ( syscall_mode ! = - ENOSYS ) {
/*
2009-02-27 23:32:52 +03:00
* Since kernel version 2.5 .44 the scno gets passed in gpr2 .
2003-06-27 02:23:28 +04:00
*/
scno = syscall_mode ;
} else {
2009-02-27 23:32:52 +03:00
/*
2002-11-11 15:50:47 +03:00
* Old style of " passing " the scno via the SVC instruction .
*/
long opcode , offset_reg , tmp ;
2011-08-24 18:52:57 +04:00
void * svc_addr ;
2011-08-19 21:46:32 +04:00
static const int gpr_offset [ 16 ] = {
PT_GPR0 , PT_GPR1 , PT_ORIGGPR2 , PT_GPR3 ,
PT_GPR4 , PT_GPR5 , PT_GPR6 , PT_GPR7 ,
PT_GPR8 , PT_GPR9 , PT_GPR10 , PT_GPR11 ,
PT_GPR12 , PT_GPR13 , PT_GPR14 , PT_GPR15
} ;
2002-12-16 02:58:31 +03:00
2008-12-16 21:18:40 +03:00
if ( upeek ( tcp , PT_PSWADDR , & pc ) < 0 )
2002-11-11 15:50:47 +03:00
return - 1 ;
2003-01-20 13:23:04 +03:00
errno = 0 ;
2009-01-23 19:30:26 +03:00
opcode = ptrace ( PTRACE_PEEKTEXT , tcp - > pid , ( char * ) ( pc - sizeof ( long ) ) , 0 ) ;
2003-01-20 13:23:04 +03:00
if ( errno ) {
2012-09-18 03:20:54 +04:00
perror_msg ( " %s " , " peektext(pc-oneword) " ) ;
2002-11-11 15:50:47 +03:00
return - 1 ;
2003-01-20 13:23:04 +03:00
}
2002-11-11 15:50:47 +03:00
/*
* We have to check if the SVC got executed directly or via an
* EXECUTE instruction . In case of EXECUTE it is necessary to do
* instruction decoding to derive the system call number .
* Unfortunately the opcode sizes of EXECUTE and SVC are differently ,
* so that this doesn ' t work if a SVC opcode is part of an EXECUTE
* opcode . Since there is no way to find out the opcode size this
* is the best we can do . . .
*/
if ( ( opcode & 0xff00 ) = = 0x0a00 ) {
/* SVC opcode */
scno = opcode & 0xff ;
2002-12-16 02:58:31 +03:00
}
2002-11-11 15:50:47 +03:00
else {
/* SVC got executed by EXECUTE instruction */
/*
* Do instruction decoding of EXECUTE . If you really want to
* understand this , read the Principles of Operations .
*/
svc_addr = ( void * ) ( opcode & 0xfff ) ;
tmp = 0 ;
offset_reg = ( opcode & 0x000f0000 ) > > 16 ;
2008-12-16 21:18:40 +03:00
if ( offset_reg & & ( upeek ( tcp , gpr_offset [ offset_reg ] , & tmp ) < 0 ) )
2002-11-11 15:50:47 +03:00
return - 1 ;
svc_addr + = tmp ;
tmp = 0 ;
offset_reg = ( opcode & 0x0000f000 ) > > 12 ;
2008-12-16 21:18:40 +03:00
if ( offset_reg & & ( upeek ( tcp , gpr_offset [ offset_reg ] , & tmp ) < 0 ) )
2002-11-11 15:50:47 +03:00
return - 1 ;
svc_addr + = tmp ;
2009-01-23 19:30:26 +03:00
scno = ptrace ( PTRACE_PEEKTEXT , tcp - > pid , svc_addr , 0 ) ;
2002-11-11 15:50:47 +03:00
if ( errno )
return - 1 ;
2012-02-25 05:44:25 +04:00
# if defined(S390X)
2002-11-11 15:50:47 +03:00
scno > > = 48 ;
2012-02-25 05:44:25 +04:00
# else
2002-11-11 15:50:47 +03:00
scno > > = 16 ;
2012-02-25 05:44:25 +04:00
# endif
2002-11-11 15:50:47 +03:00
tmp = 0 ;
offset_reg = ( opcode & 0x00f00000 ) > > 20 ;
2008-12-16 21:18:40 +03:00
if ( offset_reg & & ( upeek ( tcp , gpr_offset [ offset_reg ] , & tmp ) < 0 ) )
2002-11-11 15:50:47 +03:00
return - 1 ;
scno = ( scno | tmp ) & 0xff ;
}
}
2012-02-25 05:44:25 +04:00
# elif defined(POWERPC)
2008-12-16 21:18:40 +03:00
if ( upeek ( tcp , sizeof ( unsigned long ) * PT_R0 , & scno ) < 0 )
1999-02-19 03:21:36 +03:00
return - 1 ;
2012-02-25 05:44:25 +04:00
# ifdef POWERPC64
2011-08-24 18:52:57 +04:00
/* TODO: speed up strace by not doing this at every syscall.
* We only need to do it after execve .
*/
int currpers ;
long val ;
2010-07-12 23:39:57 +04:00
2011-08-24 18:52:57 +04:00
/* Check for 64/32 bit mode. */
if ( upeek ( tcp , sizeof ( unsigned long ) * PT_MSR , & val ) < 0 )
return - 1 ;
/* SF is bit 0 of MSR */
if ( val < 0 )
currpers = 0 ;
else
currpers = 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)
2011-08-24 18:52:57 +04:00
scno = regs . r8 ;
2012-02-25 05:44:25 +04:00
# elif defined(BFIN)
2008-12-16 21:18:40 +03:00
if ( upeek ( tcp , 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
# ifndef __X32_SYSCALL_MASK
# define __X32_SYSCALL_MASK __X32_SYSCALL_BIT
# endif
2011-08-24 18:52:57 +04:00
int currpers ;
2011-08-30 20:53:49 +04:00
scno = x86_64_regs . orig_rax ;
2011-08-24 18:52:57 +04:00
/* Check CS register value. On x86-64 linux it is:
* 0x33 for long mode ( 64 bit )
* 0x23 for compatibility mode ( 32 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
* Check DS register value . On x86 - 64 linux it is :
* 0x2b for x32 mode ( x86 - 64 in 32 bit )
2011-08-24 18:52:57 +04:00
*/
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 ;
scno & = ~ __X32_SYSCALL_MASK ;
} 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 ;
}
2012-02-25 05:44:25 +04:00
# if 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 )
* It works , but is too complicated .
*/
unsigned long val , rip , i ;
2011-08-30 20:53:49 +04:00
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
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
2012-04-17 22:05:04 +04:00
/* Value of currpers:
* 0 : 64 bit
* 1 : 32 bit
* 2 : X32
* Value of current_personality :
* 0 : X32
* 1 : 32 bit
*/
switch ( currpers ) {
case 0 :
fprintf ( stderr , " syscall_%lu (...) in unsupported "
" 64-bit mode of process PID=%d \n " ,
scno , tcp - > pid ) ;
return 0 ;
case 2 :
currpers = 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
}
# endif
2012-04-17 22:05:04 +04:00
update_personality ( tcp , currpers ) ;
2012-02-25 05:44:25 +04:00
# elif defined(IA64)
2001-10-10 03:47:38 +04:00
# define IA64_PSR_IS ((long)1 << 34)
2013-02-06 21:09:31 +04:00
long psr ;
2011-06-07 14:13:24 +04:00
if ( upeek ( tcp , PT_CR_IPSR , & psr ) > = 0 )
2001-10-10 03:47:38 +04:00
ia32 = ( psr & IA64_PSR_IS ) ! = 0 ;
2011-08-24 18:52:57 +04:00
if ( ia32 ) {
2011-08-30 20:53:49 +04:00
if ( upeek ( tcp , PT_R1 , & scno ) < 0 )
2000-02-04 00:58:30 +03:00
return - 1 ;
2011-08-24 18:52:57 +04:00
} else {
if ( upeek ( tcp , PT_R15 , & scno ) < 0 )
2000-02-04 00:58:30 +03:00
return - 1 ;
}
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 ;
case sizeof ( regs ) :
/* We are in 32-bit mode */
2013-02-06 21:24:39 +04:00
scno = arm_regs . uregs [ 7 ] ;
2012-11-10 15:24:48 +04:00
update_personality ( tcp , 0 ) ;
break ;
}
2012-02-25 05:44:25 +04:00
# elif defined(ARM)
2003-06-04 03:29:04 +04:00
/*
* We only need to grab the syscall number on syscall entry .
*/
2013-02-06 21:24:39 +04:00
if ( arm_regs . ARM_ip = = 0 ) {
2003-06-04 03:29:04 +04:00
/*
2013-02-06 21:24:39 +04:00
* Note : we only deal with 32 - bit CPUs here
2003-06-04 03:29:04 +04:00
*/
2013-02-06 21:24:39 +04:00
if ( arm_regs . ARM_cpsr & 0x20 ) {
2003-06-04 03:29:04 +04:00
/*
* Get the Thumb - mode system call number
*/
2013-02-06 21:24:39 +04:00
scno = arm_regs . ARM_r7 ;
2003-06-04 03:29:04 +04:00
} else {
/*
* Get the ARM - mode system call number
*/
errno = 0 ;
2013-02-06 21:24:39 +04:00
scno = ptrace ( PTRACE_PEEKTEXT , tcp - > pid , ( void * ) ( arm_regs . ARM_pc - 4 ) , NULL ) ;
2003-06-04 03:29:04 +04:00
if ( errno )
return - 1 ;
2006-04-25 11:34:41 +04:00
/* Handle the EABI syscall convention. We do not
bother converting structures between the two
ABIs , but basic functionality should work even
if strace and the traced program have different
ABIs . */
if ( scno = = 0xef000000 ) {
2013-02-06 21:24:39 +04:00
scno = arm_regs . ARM_r7 ;
2006-04-25 11:34:41 +04:00
} else {
if ( ( scno & 0x0ff00000 ) ! = 0x0f900000 ) {
fprintf ( stderr , " syscall: unknown syscall trap 0x%08lx \n " ,
scno ) ;
return - 1 ;
}
/*
* Fixup the syscall number
*/
scno & = 0x000fffff ;
2003-06-04 03:29:04 +04:00
}
}
2008-05-20 05:35:55 +04:00
if ( scno & 0x0f0000 ) {
/*
* Handle ARM specific syscall
*/
2011-12-23 04:50:49 +04:00
update_personality ( tcp , 1 ) ;
2008-05-20 05:35:55 +04:00
scno & = 0x0000ffff ;
} else
2011-12-23 04:50:49 +04:00
update_personality ( tcp , 0 ) ;
2003-06-04 03:29:04 +04:00
} else {
2011-08-24 18:52:57 +04:00
fprintf ( stderr , " pid %d stray syscall entry \n " , tcp - > pid ) ;
tcp - > flags | = TCB_INSYSCALL ;
1999-02-19 03:21:36 +03:00
}
2012-02-25 05:44:25 +04:00
# elif defined(M68K)
2008-12-16 21:18:40 +03:00
if ( upeek ( tcp , 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(LINUX_MIPSN32)
2008-05-20 05:11:56 +04:00
unsigned long long regs [ 38 ] ;
2011-06-07 14:13:24 +04:00
if ( ptrace ( PTRACE_GETREGS , tcp - > pid , NULL , ( long ) & regs ) < 0 )
2008-05-20 05:11:56 +04:00
return - 1 ;
a3 = regs [ REG_A3 ] ;
r2 = regs [ REG_V0 ] ;
2011-08-24 18:52:57 +04:00
scno = r2 ;
2011-08-25 03:13:43 +04:00
if ( ! SCNO_IN_RANGE ( scno ) ) {
2011-08-24 18:52:57 +04:00
if ( a3 = = 0 | | 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: v0 = %ld \n " , scno ) ;
return 0 ;
2008-05-20 05:11:56 +04:00
}
}
2012-02-25 05:44:25 +04:00
# elif defined(MIPS)
2008-12-16 21:18:40 +03:00
if ( upeek ( tcp , REG_A3 , & a3 ) < 0 )
2009-02-27 23:32:52 +03:00
return - 1 ;
2011-08-24 18:52:57 +04:00
if ( upeek ( tcp , REG_V0 , & scno ) < 0 )
return - 1 ;
1999-11-01 00:15:38 +03:00
2011-08-25 03:13:43 +04:00
if ( ! SCNO_IN_RANGE ( scno ) ) {
2011-08-24 18:52:57 +04:00
if ( a3 = = 0 | | 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: 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)
2008-12-16 21:18:40 +03:00
if ( upeek ( tcp , REG_A3 , & a3 ) < 0 )
1999-02-19 03:21:36 +03:00
return - 1 ;
2011-08-24 18:52:57 +04:00
if ( upeek ( tcp , REG_R0 , & scno ) < 0 )
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
*/
2011-08-25 03:13:43 +04:00
if ( ! SCNO_IN_RANGE ( scno ) ) {
2011-08-24 18:52:57 +04:00
if ( a3 = = 0 | | 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)
2011-08-24 18:52:57 +04:00
trap = ptrace ( PTRACE_PEEKTEXT , tcp - > pid , ( char * ) regs . tpc , 0 ) ;
trap > > = 32 ;
2012-02-25 05:44:25 +04:00
# else
2011-08-24 18:52:57 +04:00
trap = ptrace ( PTRACE_PEEKTEXT , tcp - > pid , ( char * ) 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)
2011-08-24 18:52:57 +04:00
fprintf ( stderr , " syscall: unknown syscall trap %08lx %016lx \n " , trap , regs . tpc ) ;
2012-02-25 05:44:25 +04:00
# else
2011-08-24 18:52:57 +04:00
fprintf ( stderr , " syscall: unknown syscall trap %08lx %08lx \n " , trap , 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
scno = regs . u_regs [ U_REG_G1 ] ;
if ( scno = = 0 ) {
scno = regs . u_regs [ U_REG_O0 ] ;
memmove ( & regs . u_regs [ U_REG_O0 ] , & regs . u_regs [ U_REG_O1 ] , 7 * sizeof ( regs . u_regs [ 0 ] ) ) ;
1999-02-19 03:21:36 +03:00
}
2012-02-25 05:44:25 +04:00
# elif defined(HPPA)
2008-12-16 21:18:40 +03:00
if ( upeek ( tcp , 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 .
*/
if ( upeek ( tcp , 4 * ( REG_REG0 + 3 ) , & scno ) < 0 )
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)
2008-12-16 21:18:40 +03:00
if ( upeek ( tcp , 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)
2009-02-25 20:08:40 +03:00
if ( upeek ( tcp , 4 * PT_R9 , & scno ) < 0 )
return - 1 ;
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
int currpers ;
scno = tile_regs . regs [ 10 ] ;
# ifdef __tilepro__
currpers = 1 ;
# else
if ( tile_regs . flags & PT_FLAGS_COMPAT )
currpers = 1 ;
else
currpers = 0 ;
# endif
update_personality ( tcp , currpers ) ;
if ( ! ( tcp - > flags & TCB_INSYSCALL ) ) {
/* Check if we return from execve. */
if ( tcp - > flags & TCB_WAITEXECVE ) {
tcp - > flags & = ~ TCB_WAITEXECVE ;
return 0 ;
}
}
2012-02-25 05:44:25 +04:00
# elif defined(MICROBLAZE)
2010-07-06 16:21:07 +04:00
if ( upeek ( tcp , 0 , & scno ) < 0 )
return - 1 ;
2012-02-25 05:44:25 +04:00
# endif
2009-02-25 20:08:40 +03:00
2012-02-25 05:44:25 +04:00
# if defined(SH)
2008-12-30 21:47:55 +03:00
/* new syscall ABI returns result in R0 */
if ( upeek ( tcp , 4 * REG_REG0 , ( long * ) & r0 ) < 0 )
return - 1 ;
2003-06-27 02:40:42 +04:00
# elif defined(SH64)
2008-12-30 21:47:55 +03:00
/* ABI defines result returned in r9 */
if ( upeek ( tcp , REG_GENERAL ( 9 ) , ( long * ) & r9 ) < 0 )
return - 1 ;
1999-02-19 03:21:36 +03:00
# endif
2009-02-25 20:08:40 +03:00
2011-08-24 18:52:57 +04:00
tcp - > scno = scno ;
2000-02-01 20:58:41 +03:00
return 1 ;
}
2011-08-25 12:23:00 +04:00
/* Called at each syscall entry.
2009-01-02 21:02:45 +03: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
2009-01-02 21:02:45 +03:00
* ( " ???? " etc ) and bail out .
*/
2005-06-09 00:45:28 +04:00
static int
2011-08-25 12:40:14 +04:00
syscall_fixup_on_sysenter ( struct tcb * tcp )
2000-02-01 20:58:41 +03:00
{
2011-08-21 20:03:23 +04:00
/* A common case of "not a syscall entry" is post-execve SIGTRAP */
2012-02-25 05:44:25 +04:00
# if defined(I386)
2011-08-30 20:53:49 +04:00
if ( i386_regs . eax ! = - ENOSYS ) {
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-30 20:53:49 +04:00
fprintf ( stderr , " not a syscall entry (eax = %ld) \n " , i386_regs . eax ) ;
return 0 ;
1999-02-19 03:21:36 +03: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
# elif defined(X86_64) || defined(X32)
2011-08-30 20:53:49 +04:00
{
long rax = x86_64_regs . rax ;
2011-08-24 18:59:23 +04:00
if ( current_personality = = 1 )
2011-08-30 20:53:49 +04:00
rax = ( int ) rax ; /* sign extend from 32 bits */
if ( rax ! = - ENOSYS ) {
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:59:23 +04:00
fprintf ( stderr , " not a syscall entry (rax = %ld) \n " , rax ) ;
return 0 ;
}
2002-09-23 19:41:01 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(S390) || defined(S390X)
2011-08-25 12:31:24 +04:00
/* TODO: we already fetched PT_GPR2 in get_scno
* and stored it in syscall_mode , reuse it here
* instead of re - fetching ?
*/
2008-12-16 21:18:40 +03:00
if ( upeek ( tcp , PT_GPR2 , & gpr2 ) < 0 )
2000-02-14 19:23:40 +03:00
return - 1 ;
2002-11-11 15:50:47 +03:00
if ( syscall_mode ! = - ENOSYS )
syscall_mode = tcp - > scno ;
2011-08-25 12:25:35 +04:00
if ( gpr2 ! = syscall_mode ) {
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-21 20:03:23 +04:00
fprintf ( stderr , " not a syscall entry (gpr2 = %ld) \n " , gpr2 ) ;
2000-02-14 19:23:40 +03:00
return 0 ;
}
2012-02-25 05:44:25 +04:00
# elif defined(M68K)
2011-08-25 12:31:24 +04:00
/* TODO? Eliminate upeek's in arches below like we did in x86 */
2008-12-16 21:18:40 +03:00
if ( upeek ( tcp , 4 * PT_D0 , & d0 ) < 0 )
1999-02-19 03:21:36 +03:00
return - 1 ;
2011-08-25 12:25:35 +04:00
if ( d0 ! = - ENOSYS ) {
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-21 20:03:23 +04:00
fprintf ( stderr , " not a syscall entry (d0 = %ld) \n " , d0 ) ;
1999-02-19 03:21:36 +03:00
return 0 ;
}
2001-10-10 03:47:38 +04:00
# elif defined(IA64)
2008-12-16 21:18:40 +03:00
if ( upeek ( tcp , PT_R10 , & r10 ) < 0 )
2001-10-10 03:47:38 +04:00
return - 1 ;
2008-12-16 21:18:40 +03:00
if ( upeek ( tcp , PT_R8 , & r8 ) < 0 )
2001-10-10 03:47:38 +04:00
return - 1 ;
2011-08-25 12:25:35 +04:00
if ( ia32 & & r8 ! = - ENOSYS ) {
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-21 20:03:23 +04:00
fprintf ( stderr , " not a syscall entry (r8 = %ld) \n " , r8 ) ;
2001-10-10 03:47:38 +04:00
return 0 ;
}
2009-02-25 20:08:40 +03:00
# elif defined(CRISV10) || defined(CRISV32)
2009-10-05 18:41:02 +04:00
if ( upeek ( tcp , 4 * PT_R10 , & r10 ) < 0 )
2009-02-25 20:08:40 +03:00
return - 1 ;
2011-08-25 12:25:35 +04:00
if ( r10 ! = - ENOSYS ) {
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-21 20:03:23 +04:00
fprintf ( stderr , " not a syscall entry (r10 = %ld) \n " , r10 ) ;
2009-02-25 20:08:40 +03:00
return 0 ;
}
2010-07-06 16:21:07 +04:00
# elif defined(MICROBLAZE)
if ( upeek ( tcp , 3 * 4 , & r3 ) < 0 )
return - 1 ;
2011-08-25 12:25:35 +04:00
if ( r3 ! = - ENOSYS ) {
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-21 20:03:23 +04:00
fprintf ( stderr , " not a syscall entry (r3 = %ld) \n " , r3 ) ;
2010-07-06 16:21:07 +04:00
return 0 ;
}
1999-02-19 03:21:36 +03:00
# endif
2000-02-01 20:58:41 +03:00
return 1 ;
}
1999-02-19 03:21:36 +03:00
2012-03-19 01:10:48 +04:00
static void
internal_fork ( struct tcb * tcp )
{
# if defined S390 || defined S390X || defined CRISV10 || defined CRISV32
# define ARG_FLAGS 1
# else
# define ARG_FLAGS 0
# endif
# ifndef CLONE_UNTRACED
# define CLONE_UNTRACED 0x00800000
# endif
if ( ( ptrace_setoptions
& ( PTRACE_O_TRACECLONE | PTRACE_O_TRACEFORK | PTRACE_O_TRACEVFORK ) )
= = ( PTRACE_O_TRACECLONE | PTRACE_O_TRACEFORK | PTRACE_O_TRACEVFORK ) )
return ;
if ( ! followfork )
return ;
if ( entering ( tcp ) ) {
/*
* We won ' t see the new child if clone is called with
* CLONE_UNTRACED , so we keep the same logic with that option
* and don ' t trace it .
*/
if ( ( sysent [ tcp - > scno ] . sys_func = = sys_clone ) & &
( tcp - > u_arg [ ARG_FLAGS ] & CLONE_UNTRACED ) )
return ;
setbpt ( tcp ) ;
} else {
if ( tcp - > flags & TCB_BPTSET )
clearbpt ( tcp ) ;
}
}
# if defined(TCB_WAITEXECVE)
static void
internal_exec ( struct tcb * tcp )
{
/* Maybe we have post-execve SIGTRAP suppressed? */
if ( ptrace_setoptions & PTRACE_O_TRACEEXEC )
return ; /* yes, no need to do anything */
if ( exiting ( tcp ) & & syserror ( tcp ) )
/* Error in execve, no post-execve SIGTRAP expected */
tcp - > flags & = ~ TCB_WAITEXECVE ;
else
tcp - > flags | = TCB_WAITEXECVE ;
}
# endif
static void
2013-02-06 16:18:42 +04:00
syscall_fixup_for_fork_exec ( struct tcb * tcp )
2008-05-28 03:18:29 +04:00
{
2011-08-24 20:07:22 +04:00
/*
* We must always trace a few critical system calls in order to
* correctly support following forks in the presence of tracing
* qualifiers .
*/
int ( * func ) ( ) ;
2011-08-25 03:13:43 +04:00
if ( ! SCNO_IN_RANGE ( tcp - > scno ) )
2012-03-19 01:10:48 +04:00
return ;
2011-08-24 20:07:22 +04:00
func = sysent [ tcp - > scno ] . sys_func ;
if ( sys_fork = = func
| | sys_vfork = = func
| | sys_clone = = func
2012-03-19 01:10:48 +04:00
) {
internal_fork ( tcp ) ;
return ;
}
2011-08-24 20:07:22 +04:00
2012-02-25 05:38:52 +04:00
# if defined(TCB_WAITEXECVE)
2011-08-24 20:07:22 +04:00
if ( sys_execve = = func
2012-02-25 05:38:52 +04:00
# if defined(SPARC) || defined(SPARC64)
2011-08-24 20:07:22 +04:00
| | sys_execv = = func
# endif
2012-03-19 01:10:48 +04:00
) {
internal_exec ( tcp ) ;
return ;
}
2008-05-28 03:18:29 +04:00
# endif
2011-08-24 20:07:22 +04: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 ;
2011-08-25 03:13:43 +04:00
if ( SCNO_IN_RANGE ( tcp - > scno ) )
2011-08-24 20:07:22 +04:00
nargs = tcp - > u_nargs = sysent [ tcp - > scno ] . nargs ;
else
nargs = tcp - > u_nargs = MAX_ARGS ;
2012-02-25 05:44:25 +04:00
# if defined(S390) || defined(S390X)
2011-08-24 20:07:22 +04:00
for ( i = 0 ; i < nargs ; + + i )
if ( upeek ( tcp , i = = 0 ? PT_ORIGGPR2 : PT_GPR2 + i * sizeof ( long ) , & tcp - > u_arg [ i ] ) < 0 )
return - 1 ;
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 )
if ( upeek ( tcp , REG_A0 + i , & tcp - > u_arg [ i ] ) < 0 )
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(IA64)
2011-08-24 20:07:22 +04:00
if ( ! ia32 ) {
unsigned long * out0 , cfm , sof , sol ;
long rbs_end ;
/* be backwards compatible with kernel < 2.4.4... */
# ifndef PT_RBS_END
# define PT_RBS_END PT_AR_BSP
# endif
2008-05-28 03:18:29 +04:00
2011-08-24 20:07:22 +04:00
if ( upeek ( tcp , PT_RBS_END , & rbs_end ) < 0 )
return - 1 ;
if ( upeek ( tcp , PT_CFM , ( long * ) & cfm ) < 0 )
return - 1 ;
sof = ( cfm > > 0 ) & 0x7f ;
sol = ( cfm > > 7 ) & 0x7f ;
out0 = ia64_rse_skip_regs ( ( unsigned long * ) rbs_end , - sof + sol ) ;
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 {
2011-08-24 20:07:22 +04:00
static const int argreg [ MAX_ARGS ] = { PT_R11 /* EBX = out0 */ ,
PT_R9 /* ECX = out1 */ ,
PT_R10 /* EDX = out2 */ ,
PT_R14 /* ESI = out3 */ ,
PT_R15 /* EDI = out4 */ ,
PT_R13 /* EBP = out5 */ } ;
for ( i = 0 ; i < nargs ; + + i ) {
if ( upeek ( tcp , argreg [ i ] , & tcp - > u_arg [ i ] ) < 0 )
return - 1 ;
/* truncate away IVE sign-extension */
tcp - > u_arg [ i ] & = 0xffffffff ;
2000-02-04 00:58:30 +03:00
}
2008-05-28 03:18:29 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(LINUX_MIPSN32) || defined(LINUX_MIPSN64)
2011-08-24 20:07:22 +04:00
/* N32 and N64 both use up to six registers. */
unsigned long long regs [ 38 ] ;
if ( ptrace ( PTRACE_GETREGS , tcp - > pid , NULL , ( long ) & regs ) < 0 )
return - 1 ;
for ( i = 0 ; i < nargs ; + + i ) {
tcp - > u_arg [ i ] = regs [ REG_A0 + i ] ;
2012-02-25 05:44:25 +04:00
# if defined(LINUX_MIPSN32)
2011-08-24 20:07:22 +04:00
tcp - > ext_arg [ i ] = regs [ REG_A0 + i ] ;
2012-02-25 05:44:25 +04:00
# endif
2011-08-24 20:07:22 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(MIPS)
2011-08-24 20:07:22 +04:00
if ( nargs > 4 ) {
long sp ;
if ( upeek ( tcp , REG_SP , & sp ) < 0 )
return - 1 ;
for ( i = 0 ; i < 4 ; + + i )
if ( upeek ( tcp , REG_A0 + i , & tcp - > u_arg [ i ] ) < 0 )
return - 1 ;
umoven ( tcp , sp + 16 , ( nargs - 4 ) * sizeof ( tcp - > u_arg [ 0 ] ) ,
( char * ) ( tcp - > u_arg + 4 ) ) ;
2011-06-07 14:13:24 +04:00
} else {
2011-08-24 20:07:22 +04:00
for ( i = 0 ; i < nargs ; + + i )
if ( upeek ( tcp , REG_A0 + i , & tcp - > u_arg [ i ] ) < 0 )
return - 1 ;
2011-06-07 14:13:24 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(POWERPC)
# ifndef PT_ORIG_R3
# define PT_ORIG_R3 34
# endif
2011-08-24 20:07:22 +04:00
for ( i = 0 ; i < nargs ; + + i ) {
if ( upeek ( tcp , ( i = = 0 ) ?
( sizeof ( unsigned long ) * PT_ORIG_R3 ) :
( ( i + PT_R3 ) * sizeof ( unsigned long ) ) ,
& tcp - > u_arg [ i ] ) < 0 )
return - 1 ;
2011-06-07 14:13:24 +04:00
}
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 )
tcp - > u_arg [ i ] = 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 )
if ( upeek ( tcp , PT_GR26 - 4 * i , & tcp - > u_arg [ i ] ) < 0 )
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
# endif /* AARCH64 */
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 ;
tcp - > u_arg [ 0 ] = regs . r12 ;
tcp - > u_arg [ 1 ] = regs . r11 ;
tcp - > u_arg [ 2 ] = regs . r10 ;
tcp - > u_arg [ 3 ] = regs . r9 ;
tcp - > u_arg [ 4 ] = regs . r5 ;
tcp - > u_arg [ 5 ] = 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 )
if ( upeek ( tcp , argreg [ i ] , & tcp - > u_arg [ i ] ) < 0 )
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 )
if ( upeek ( tcp , syscall_regs [ i ] , & tcp - > u_arg [ i ] ) < 0 )
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 )
if ( upeek ( tcp , REG_GENERAL ( syscall_regs [ i ] ) , & tcp - > u_arg [ i ] ) < 0 )
return - 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
# elif defined(X86_64) || defined(X32)
2011-08-30 20:53:49 +04:00
( void ) i ;
( void ) nargs ;
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 ( current_personality ! = 1 ) { /* 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
2011-08-30 20:53:49 +04:00
} else { /* i386 ABI */
/* Sign-extend lower 32 bits */
tcp - > u_arg [ 0 ] = ( long ) ( int ) x86_64_regs . rbx ;
tcp - > u_arg [ 1 ] = ( long ) ( int ) x86_64_regs . rcx ;
tcp - > u_arg [ 2 ] = ( long ) ( int ) x86_64_regs . rdx ;
tcp - > u_arg [ 3 ] = ( long ) ( int ) x86_64_regs . rsi ;
tcp - > u_arg [ 4 ] = ( long ) ( int ) x86_64_regs . rdi ;
tcp - > u_arg [ 5 ] = ( long ) ( int ) x86_64_regs . rbp ;
}
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 )
if ( upeek ( tcp , ( 5 + i ) * 4 , & tcp - > u_arg [ i ] ) < 0 )
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 )
if ( upeek ( tcp , crisregs [ i ] , & tcp - > u_arg [ i ] ) < 0 )
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 )
if ( upeek ( tcp , ( i < 5 ? i : i + 2 ) * 4 , & tcp - > u_arg [ i ] ) < 0 )
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(I386)
2011-08-30 20:53:49 +04:00
( 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 ;
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 )
if ( upeek ( tcp , i * 4 , & tcp - > u_arg [ i ] ) < 0 )
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 ;
2011-08-24 19:25:32 +04:00
# if defined TCB_WAITEXECVE
if ( tcp - > flags & TCB_WAITEXECVE ) {
/* This is the post-execve SIGTRAP. */
tcp - > flags & = ~ TCB_WAITEXECVE ;
return 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
scno_good = res = ( get_regs_error ? - 1 : get_scno ( tcp ) ) ;
2011-08-22 13:54:06 +04:00
if ( res = = 0 )
return res ;
2012-03-21 03:23:16 +04:00
if ( res = = 1 ) {
2011-08-25 12:40:14 +04:00
res = syscall_fixup_on_sysenter ( tcp ) ;
2012-03-21 03:23:16 +04:00
if ( res = = 0 )
return res ;
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 */ " ( " ) ;
2011-08-25 03:13:43 +04:00
else if ( ! SCNO_IN_RANGE ( tcp - > scno ) )
2011-08-22 13:54:06 +04:00
tprintf ( " syscall_%lu( " , tcp - > scno ) ;
else
tprintf ( " %s( " , sysent [ tcp - > scno ] . sys_name ) ;
/*
* " <unavailable> " will be added later by the code which
* detects ptrace errors .
*/
goto ret ;
}
2012-02-20 21:02:38 +04:00
# if defined(SYS_socket_subcall) || defined(SYS_ipc_subcall)
while ( SCNO_IN_RANGE ( tcp - > scno ) ) {
2012-02-25 05:44:25 +04:00
# ifdef SYS_socket_subcall
2012-02-20 21:02:38 +04:00
if ( sysent [ tcp - > scno ] . 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
2012-02-20 21:02:38 +04:00
if ( sysent [ tcp - > scno ] . 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 ;
}
# endif /* SYS_socket_subcall || SYS_ipc_subcall */
2013-02-06 16:18:42 +04:00
if ( need_fork_exec_workarounds )
syscall_fixup_for_fork_exec ( tcp ) ;
2011-08-24 20:07:22 +04:00
2011-08-25 03:13:43 +04:00
if ( ( SCNO_IN_RANGE ( tcp - > scno ) & &
2011-08-24 20:07:22 +04:00
! ( qual_flags [ tcp - > scno ] & QUAL_TRACE ) ) | |
( tracing_paths & & ! pathtrace_match ( tcp ) ) ) {
tcp - > flags | = TCB_INSYSCALL | TCB_FILTERED ;
return 0 ;
}
tcp - > flags & = ~ TCB_FILTERED ;
if ( cflag = = CFLAG_ONLY_STATS ) {
res = 0 ;
goto ret ;
}
printleader ( tcp ) ;
2011-08-25 03:13:43 +04:00
if ( ! SCNO_IN_RANGE ( tcp - > scno ) )
2011-08-24 20:07:22 +04:00
tprintf ( " syscall_%lu( " , tcp - > scno ) ;
else
tprintf ( " %s( " , sysent [ tcp - > scno ] . sys_name ) ;
2011-08-25 03:13:43 +04:00
if ( ! SCNO_IN_RANGE ( tcp - > scno ) | |
2011-08-24 20:07:22 +04:00
( ( qual_flags [ tcp - > scno ] & QUAL_RAW ) & &
sysent [ tcp - > scno ] . sys_func ! = sys_exit ) )
res = printargs ( tcp ) ;
else
res = ( * sysent [ tcp - > scno ] . sys_func ) ( tcp ) ;
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 )
{
2012-02-25 05:44:25 +04:00
# if defined(S390) || defined(S390X)
2011-08-25 12:31:24 +04:00
if ( upeek ( tcp , PT_GPR2 , & gpr2 ) < 0 )
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(POWERPC)
2011-08-25 12:31:24 +04:00
# define SO_MASK 0x10000000
{
long flags ;
if ( upeek ( tcp , sizeof ( unsigned long ) * PT_CCR , & flags ) < 0 )
return - 1 ;
2012-03-21 03:07:25 +04:00
if ( upeek ( tcp , sizeof ( unsigned long ) * PT_R3 , & ppc_result ) < 0 )
2011-08-25 12:31:24 +04:00
return - 1 ;
if ( flags & SO_MASK )
2012-03-21 03:07:25 +04:00
ppc_result = - ppc_result ;
2011-08-25 12:31:24 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(AVR32)
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
/* already done by get_regs */
2012-02-25 05:44:25 +04:00
# elif defined(BFIN)
2011-08-25 12:31:24 +04:00
if ( upeek ( tcp , PT_R0 , & r0 ) < 0 )
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(I386)
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
/* already done by get_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)
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
/* already done by get_regs */
2012-02-25 05:44:25 +04:00
# elif defined(IA64)
2011-08-24 20:07:22 +04:00
# define IA64_PSR_IS ((long)1 << 34)
2013-02-06 21:09:31 +04:00
long psr ;
2011-08-24 20:07:22 +04:00
if ( upeek ( tcp , PT_CR_IPSR , & psr ) > = 0 )
ia32 = ( psr & IA64_PSR_IS ) ! = 0 ;
if ( upeek ( tcp , PT_R8 , & r8 ) < 0 )
return - 1 ;
if ( upeek ( tcp , PT_R10 , & r10 ) < 0 )
return - 1 ;
2012-10-24 20:58:16 +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
/* FIXME: uh, why do we do it on syscall *exit*? We did it on entry already... */
/* We are in 64-bit mode (personality 1) if register struct is aarch64_regs,
* else it ' s personality 0.
*/
update_personality ( tcp , aarch64_io . iov_len = = sizeof ( aarch64_regs ) ) ;
2012-11-10 15:24:48 +04:00
# elif defined(ARM)
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
/* already done by get_regs */
2012-02-25 05:44:25 +04:00
# elif defined(M68K)
2011-08-25 12:31:24 +04:00
if ( upeek ( tcp , 4 * PT_D0 , & d0 ) < 0 )
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(LINUX_MIPSN32)
2011-08-24 20:07:22 +04:00
unsigned long long regs [ 38 ] ;
if ( ptrace ( PTRACE_GETREGS , tcp - > pid , NULL , ( long ) & regs ) < 0 )
return - 1 ;
a3 = regs [ REG_A3 ] ;
r2 = regs [ REG_V0 ] ;
2012-02-25 05:44:25 +04:00
# elif defined(MIPS)
2011-08-24 20:07:22 +04:00
if ( upeek ( tcp , REG_A3 , & a3 ) < 0 )
return - 1 ;
if ( upeek ( tcp , REG_V0 , & r2 ) < 0 )
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(ALPHA)
2011-08-24 20:07:22 +04:00
if ( upeek ( tcp , REG_A3 , & a3 ) < 0 )
return - 1 ;
if ( upeek ( tcp , REG_R0 , & r0 ) < 0 )
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(SPARC) || defined(SPARC64)
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
/* already done by get_regs */
2012-02-25 05:44:25 +04:00
# elif defined(HPPA)
2011-08-25 12:31:24 +04:00
if ( upeek ( tcp , PT_GR28 , & r28 ) < 0 )
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 */
if ( upeek ( tcp , 4 * REG_REG0 , ( long * ) & r0 ) < 0 )
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 */
if ( upeek ( tcp , REG_GENERAL ( 9 ) , ( long * ) & r9 ) < 0 )
return - 1 ;
2012-02-25 05:44:25 +04:00
# elif defined(CRISV10) || defined(CRISV32)
2011-08-25 12:31:24 +04:00
if ( upeek ( tcp , 4 * PT_R10 , & r10 ) < 0 )
return - 1 ;
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
/* already done by get_regs */
2012-02-25 05:44:25 +04:00
# elif defined(MICROBLAZE)
2011-08-25 12:31:24 +04:00
if ( upeek ( tcp , 3 * 4 , & r3 ) < 0 )
return - 1 ;
2012-02-25 05:44:25 +04:00
# endif
2011-08-24 20:07:22 +04:00
return 1 ;
}
2012-03-20 20:10:35 +04:00
/* Called at each syscall exit */
static void
2011-08-25 12:23:00 +04:00
syscall_fixup_on_sysexit ( struct tcb * tcp )
{
2012-02-25 05:44:25 +04:00
# if defined(S390) || defined(S390X)
2011-08-25 12:23:00 +04:00
if ( syscall_mode ! = - ENOSYS )
syscall_mode = tcp - > scno ;
2011-08-25 12:25:35 +04:00
if ( ( tcp - > flags & TCB_WAITEXECVE )
2011-08-25 12:23:00 +04:00
& & ( gpr2 = = - ENOSYS | | gpr2 = = tcp - > scno ) ) {
/*
* Return from execve .
* Fake a return value of zero . We leave the TCB_WAITEXECVE
* flag set for the post - execve SIGTRAP to see and reset .
*/
gpr2 = 0 ;
}
2012-02-25 05:44:25 +04:00
# endif
2011-08-25 12:23:00 +04:00
}
2011-08-24 20:07:22 +04:00
/*
* 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 int
is_negated_errno ( unsigned long int val )
{
unsigned long int max = - ( long int ) nerrnos ;
2012-02-25 05:44:25 +04:00
# if SUPPORTED_PERSONALITIES > 1
2012-03-19 12:36:42 +04:00
if ( current_wordsize < sizeof ( val ) ) {
2011-08-24 20:07:22 +04:00
val = ( unsigned int ) val ;
max = ( unsigned int ) max ;
}
2012-02-25 05:44:25 +04:00
# endif
2011-08-24 20:07:22 +04:00
return val > max ;
}
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 .
*/
2011-08-24 20:07:22 +04:00
static int
get_error ( struct tcb * tcp )
{
int u_error = 0 ;
int check_errno = 1 ;
2011-08-25 03:13:43 +04:00
if ( SCNO_IN_RANGE ( tcp - > scno ) & &
2011-08-24 20:07:22 +04:00
sysent [ tcp - > scno ] . sys_flags & SYSCALL_NEVER_FAILS ) {
check_errno = 0 ;
}
2012-02-25 05:44:25 +04:00
# if defined(S390) || defined(S390X)
2011-08-24 20:07:22 +04:00
if ( check_errno & & is_negated_errno ( gpr2 ) ) {
tcp - > u_rval = - 1 ;
u_error = - gpr2 ;
}
else {
tcp - > u_rval = gpr2 ;
}
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
}
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
if ( check_errno & & is_negated_errno ( x86_64_regs . rax ) ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2011-08-30 20:53:49 +04:00
u_error = - x86_64_regs . rax ;
2011-08-24 20:07:22 +04:00
}
else {
2011-08-30 20:53:49 +04:00
tcp - > u_rval = x86_64_regs . rax ;
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(X32)
tcp - > u_lrval = x86_64_regs . rax ;
# endif
2011-08-24 20:07:22 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(IA64)
2011-08-24 20:07:22 +04:00
if ( ia32 ) {
int err ;
err = ( int ) r8 ;
if ( check_errno & & is_negated_errno ( err ) ) {
tcp - > u_rval = - 1 ;
u_error = - err ;
}
else {
tcp - > u_rval = err ;
}
} else {
if ( check_errno & & r10 ) {
tcp - > u_rval = - 1 ;
u_error = r8 ;
} else {
tcp - > u_rval = r8 ;
}
}
2012-02-25 05:44:25 +04:00
# elif defined(MIPS)
2011-08-24 20:07:22 +04:00
if ( check_errno & & a3 ) {
tcp - > u_rval = - 1 ;
u_error = r2 ;
} else {
tcp - > u_rval = r2 ;
2012-04-16 14:16:45 +04:00
# if defined(LINUX_MIPSN32)
tcp - > u_lrval = r2 ;
# endif
2011-08-24 20:07:22 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(POWERPC)
2012-03-21 03:07:25 +04:00
if ( check_errno & & is_negated_errno ( ppc_result ) ) {
2011-08-24 20:07:22 +04:00
tcp - > u_rval = - 1 ;
2012-03-21 03:07:25 +04:00
u_error = - ppc_result ;
2011-08-24 20:07:22 +04:00
}
else {
2012-03-21 03:07:25 +04:00
tcp - > u_rval = ppc_result ;
2011-08-24 20:07:22 +04:00
}
2012-02-25 05:44:25 +04:00
# elif defined(M68K)
2011-08-24 20:07:22 +04:00
if ( check_errno & & is_negated_errno ( d0 ) ) {
tcp - > u_rval = - 1 ;
u_error = - d0 ;
}
else {
tcp - > u_rval = d0 ;
}
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
# endif /* AARCH64 */
{
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)
2011-08-24 20:07:22 +04:00
if ( check_errno & & regs . r12 & & ( unsigned ) - regs . r12 < nerrnos ) {
tcp - > u_rval = - 1 ;
u_error = - regs . r12 ;
}
else {
tcp - > u_rval = regs . r12 ;
}
2012-02-25 05:44:25 +04:00
# elif defined(BFIN)
2011-08-24 20:07:22 +04:00
if ( check_errno & & is_negated_errno ( r0 ) ) {
tcp - > u_rval = - 1 ;
u_error = - r0 ;
} else {
tcp - > u_rval = r0 ;
}
2012-02-25 05:44:25 +04:00
# elif defined(ALPHA)
2011-08-24 20:07:22 +04:00
if ( check_errno & & a3 ) {
tcp - > u_rval = - 1 ;
u_error = r0 ;
}
else {
tcp - > u_rval = r0 ;
}
2012-02-25 05:44:25 +04:00
# elif defined(SPARC)
2011-08-24 20:07:22 +04:00
if ( check_errno & & regs . psr & PSR_C ) {
tcp - > u_rval = - 1 ;
u_error = regs . u_regs [ U_REG_O0 ] ;
}
else {
tcp - > u_rval = regs . u_regs [ U_REG_O0 ] ;
}
2012-02-25 05:44:25 +04:00
# elif defined(SPARC64)
2011-08-24 20:07:22 +04:00
if ( check_errno & & regs . tstate & 0x1100000000UL ) {
tcp - > u_rval = - 1 ;
u_error = regs . u_regs [ U_REG_O0 ] ;
}
else {
tcp - > u_rval = regs . u_regs [ U_REG_O0 ] ;
}
2012-02-25 05:44:25 +04:00
# elif defined(HPPA)
2011-08-24 20:07:22 +04:00
if ( check_errno & & is_negated_errno ( r28 ) ) {
tcp - > u_rval = - 1 ;
u_error = - r28 ;
}
else {
tcp - > u_rval = r28 ;
}
2012-02-25 05:44:25 +04:00
# elif defined(SH)
2011-08-24 20:07:22 +04:00
if ( check_errno & & is_negated_errno ( r0 ) ) {
tcp - > u_rval = - 1 ;
u_error = - r0 ;
}
else {
tcp - > u_rval = r0 ;
}
2012-02-25 05:44:25 +04:00
# elif defined(SH64)
2011-08-24 20:07:22 +04:00
if ( check_errno & & is_negated_errno ( r9 ) ) {
tcp - > u_rval = - 1 ;
u_error = - r9 ;
}
else {
tcp - > u_rval = r9 ;
}
2012-02-25 05:44:25 +04:00
# elif defined(CRISV10) || defined(CRISV32)
2011-08-24 20:07:22 +04:00
if ( check_errno & & r10 & & ( unsigned ) - r10 < nerrnos ) {
tcp - > u_rval = - 1 ;
u_error = - r10 ;
}
else {
tcp - > u_rval = r10 ;
}
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)
2011-08-24 20:07:22 +04:00
if ( check_errno & & is_negated_errno ( r3 ) ) {
tcp - > u_rval = - 1 ;
u_error = - r3 ;
}
else {
tcp - > u_rval = r3 ;
}
2012-02-25 05:44:25 +04:00
# endif
2011-08-24 20:07:22 +04:00
tcp - > u_error = u_error ;
return 1 ;
}
2011-08-22 13:54:06 +04:00
2011-08-24 20:07:22 +04:00
static void
dumpio ( struct tcb * tcp )
{
if ( syserror ( tcp ) )
return ;
if ( tcp - > u_arg [ 0 ] < 0 | | tcp - > u_arg [ 0 ] > = MAX_QUALS )
return ;
2011-08-25 03:13:43 +04:00
if ( ! SCNO_IN_RANGE ( tcp - > scno ) )
2011-08-24 20:07:22 +04:00
return ;
if ( sysent [ tcp - > scno ] . sys_func = = printargs )
return ;
if ( qual_flags [ tcp - > u_arg [ 0 ] ] & QUAL_READ ) {
if ( sysent [ tcp - > scno ] . sys_func = = sys_read | |
sysent [ tcp - > scno ] . sys_func = = sys_pread | |
sysent [ tcp - > scno ] . sys_func = = sys_recv | |
sysent [ tcp - > scno ] . sys_func = = sys_recvfrom )
dumpstr ( tcp , tcp - > u_arg [ 1 ] , tcp - > u_rval ) ;
else if ( sysent [ tcp - > scno ] . sys_func = = sys_readv )
dumpiov ( tcp , tcp - > u_arg [ 2 ] , tcp - > u_arg [ 1 ] ) ;
return ;
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 ) {
if ( sysent [ tcp - > scno ] . sys_func = = sys_write | |
sysent [ tcp - > scno ] . sys_func = = sys_pwrite | |
sysent [ tcp - > scno ] . sys_func = = sys_send | |
sysent [ tcp - > scno ] . sys_func = = sys_sendto )
dumpstr ( tcp , tcp - > u_arg [ 1 ] , tcp - > u_arg [ 2 ] ) ;
else if ( sysent [ tcp - > scno ] . sys_func = = sys_writev )
dumpiov ( tcp , tcp - > u_arg [ 2 ] , tcp - > u_arg [ 1 ] ) ;
return ;
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
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 ) {
syscall_fixup_on_sysexit ( tcp ) ; /* never fails */
2012-03-21 03:23:16 +04:00
res = get_error ( tcp ) ; /* returns 1 or -1 */
if ( res = = 1 ) {
2013-02-06 16:18:42 +04:00
if ( need_fork_exec_workarounds )
syscall_fixup_for_fork_exec ( tcp ) ;
2012-03-21 03:23:16 +04:00
if ( filtered ( tcp ) ) {
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 ) {
struct timeval t = tv ;
2011-08-21 19:47:40 +04:00
count_syscall ( tcp , & t ) ;
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 ) ;
if ( ! SCNO_IN_RANGE ( tcp - > scno ) )
tprintf ( " <... syscall_%lu resumed> " , tcp - > scno ) ;
else
tprintf ( " <... %s resumed> " , sysent [ tcp - > scno ] . sys_name ) ;
}
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 ;
2011-08-25 03:13:43 +04:00
if ( ! SCNO_IN_RANGE ( tcp - > scno )
2012-03-13 14:44:31 +04:00
| | ( qual_flags [ tcp - > scno ] & 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 */
2010-03-29 21:51:02 +04:00
sys_res = ( * sysent [ tcp - > scno ] . sys_func ) ( tcp ) ;
}
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 ;
2011-08-25 03:13:43 +04:00
if ( ! SCNO_IN_RANGE ( tcp - > scno ) | |
2010-03-29 21:51:02 +04:00
qual_flags [ tcp - > scno ] & QUAL_RAW ) {
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 )
* even after signal with SA_RESTART set .
* However , after SIG_IGN or SIG_DFL signal it will .
*/
tprints ( " = ? ERESTARTNOHAND (Interrupted by signal) " ) ;
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 :
if ( u_error < 0 )
2011-08-21 19:26:55 +04:00
tprintf ( " = -1 E??? (errno %ld) " , u_error ) ;
2010-03-29 21:51:02 +04:00
else if ( u_error < nerrnos )
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
2011-08-21 19:26:55 +04:00
tprintf ( " = -1 ERRNO_%ld (%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 :
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 ;
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 ( ) ;
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 ) ;
}