LTTng 0.6.36 for 2.6.18 : Userspace tracing
Subsystems (4)
PATCH 15/16 LTTng 0.6.36 for 2.6.18 : Userspace tracing
Userspace tracing : facility registration and event logging through system call.
patch15-2.6.18-lttng-core-0.6.36-userspace-tracing.diff
--BEGIN--
include/linux/sched.h +4 -0
@@ -82,6 +82,7 @@ #include <linux/timer.h>#include <linux/hrtimer.h> #include <asm/processor.h> +#include <linux/ltt-facilities.h> struct exec_domain ;struct futex_pi_state ;
@@ -996,6 +997,9 @@ #endif#ifdef CONFIG_TASK_DELAY_ACCT struct task_delay_info *delays;#endif +#ifdef CONFIG_LTT_USERSPACE_GENERIC +ltt_facility_t ltt_facilities[LTT_FAC_PER_PROCESS ]; +#endif //CONFIG_LTT_USERSPACE_GENERIC };static inline pid_t process_group (struct task_struct *tsk)
kernel/sys_ni.c +2 -0
@@ -111,6 +111,8 @@ cond_syscall(sys_vm86old);cond_syscall (sys_vm86);cond_syscall (compat_sys_ipc);cond_syscall (compat_sys_sysctl); +cond_syscall (sys_ltt_trace_generic); +cond_syscall (sys_ltt_register_generic);/* arch-specific weak syscall entries */ cond_syscall (sys_pciconfig_read);
ltt/ltt-syscall.c new file +184 -0
184 lines not on this page · raw message
kernel/exit.c +17 -0
@@ -38,6 +38,7 @@ #include <linux/compat.h>#include <linux/pipe_fs_i.h> #include <linux/audit.h> /* for audit_free() */ #include <linux/resource.h> +#include <linux/ltt-facilities.h> #include <asm/uaccess.h> #include <asm/unistd.h>
@@ -59,6 +60,17 @@ static void __unhash_process(struct tasklist_del_rcu (&p->tasks);__get_cpu_var (process_counts)--; +#ifdef CONFIG_LTT_USERSPACE_GENERIC + { +int i; +for (i =0 ; i <LTT_FAC_PER_PROCESS ; i++) { +if (p->ltt_facilities[i] ==0 ) +break ; +WARN_ON (ltt_facility_unregister ( + p->ltt_facilities[i])); + } + } +#endif //CONFIG_LTT_USERSPACE_GENERIC }list_del_rcu (&p->thread_group);remove_parent (p);
@@ -170,6 +182,7 @@ repeat:write_unlock_irq (&tasklist_lock);proc_flush_task (p);release_thread (p); +MARK (kernel_process_free,"%d" , p->pid);call_rcu (&p->rcu, delayed_put_task_struct); p = leader;
@@ -913,6 +926,8 @@ #endifif (group_dead)acct_process (); +MARK (kernel_process_exit,"%d" , tsk->pid); +exit_sem (tsk);__exit_files (tsk);__exit_fs (tsk);
@@ -1440,6 +1455,8 @@ static long do_wait(pid_t pid, int optiostruct task_struct *tsk;int flag, retval; +MARK (kernel_process_wait,"%d" , pid); +add_wait_queue (¤t->signal->wait_chldexit,&wait); repeat:/*
kernel/fork.c +39 -1
@@ -45,6 +45,7 @@ #include <linux/acct.h>#include <linux/cn_proc.h> #include <linux/delayacct.h> #include <linux/taskstats_kern.h> +#include <linux/ltt-facilities.h> #include <asm/pgtable.h> #include <asm/pgalloc.h>
@@ -64,6 +65,7 @@ int max_threads; /* tunable limit on nr DEFINE_PER_CPU(unsigned long, process_counts) = 0;__cacheline_aligned DEFINE_RWLOCK (tasklist_lock );/* outer */ +EXPORT_SYMBOL (tasklist_lock);int nr_processes (void ) {
@@ -1133,6 +1135,13 @@ #endif* of CLONE_PTRACE. */ clear_tsk_thread_flag (p,TIF_SYSCALL_TRACE ); +#ifdef CONFIG_MARKERS +/* +* Syscall tracing must always be turned on when markers are enabled. +* Use the syscall audit thread flag for now, as it is never cleared. +*/ +set_tsk_thread_flag (p,TIF_SYSCALL_AUDIT ); +#endif #ifdef TIF_SYSCALL_EMU clear_tsk_thread_flag (p,TIF_SYSCALL_EMU );#endif
@@ -1142,6 +1151,20 @@ #endif p->parent_exec_id = p->self_exec_id; +#ifdef CONFIG_LTT_USERSPACE_GENERIC +if (clone_flags &CLONE_THREAD ) +memset (p->ltt_facilities,0 ,sizeof (p->ltt_facilities)); +else { +int i; +for (i =0 ; i <LTT_FAC_PER_PROCESS ; i++) { + p->ltt_facilities[i] = current->ltt_facilities[i]; +if (p->ltt_facilities[i] !=0 ) +ltt_facility_ref (p->ltt_facilities[i]); + } + } + +#endif //CONFIG_LTT_USERSPACE_GENERIC +/* ok, now we should be set up.. */ p->exit_signal = (clone_flags &CLONE_THREAD ) ?-1 : (clone_flags &CSIGNAL ); p->pdeath_signal =0 ;
@@ -1198,7 +1221,7 @@ #endifspin_unlock (¤t->sighand->siglock);write_unlock_irq (&tasklist_lock); retval = -ERESTARTNOINTR ; - goto bad_fork_cleanup_namespace; + goto bad_fork_cleanup_ltt_facilities; }if (clone_flags &CLONE_THREAD ) {
@@ -1251,6 +1274,18 @@ #endifproc_fork_connector (p);return p; +bad_fork_cleanup_ltt_facilities: +#ifdef CONFIG_LTT_USERSPACE_GENERIC + { +int i; +for (i =0 ; i <LTT_FAC_PER_PROCESS ; i++) { +if (p->ltt_facilities[i] ==0 ) +break ; +WARN_ON (ltt_facility_unregister ( + p->ltt_facilities[i])); + } + } +#endif //CONFIG_LTT_USERSPACE_GENERIC bad_fork_cleanup_namespace:exit_namespace (p); bad_fork_cleanup_keys:
@@ -1364,6 +1399,9 @@ long do_fork(unsigned long clone_flags,if (!IS_ERR (p)) {struct completion vfork; +MARK (kernel_process_fork,"%d %d %d" , + current->pid, p->pid, p->tgid); +if (clone_flags &CLONE_VFORK ) { p->vfork_done = &vfork;init_completion (&vfork);
include/asm-arm/unistd.h +2 -0
@@ -347,6 +347,8 @@ #define __NR_inotify_rm_watch (__NR_SYS#define __NR_mbind (__NR_SYSCALL_BASE+319)#define __NR_get_mempolicy (__NR_SYSCALL_BASE+320)#define __NR_set_mempolicy (__NR_SYSCALL_BASE+321) +#define __NR_ltt_trace_generic (__NR_SYSCALL_BASE+322) +#define __NR_ltt_register_generic (__NR_SYSCALL_BASE+323)/* * The following SWIs are ARM private.
include/asm-i386/unistd.h +3 -1
@@ -323,10 +323,12 @@ #define __NR_sync_file_range 314#define __NR_tee 315#define __NR_vmsplice 316#define __NR_move_pages 317 +#define __NR_ltt_trace_generic 318 +#define __NR_ltt_register_generic 319#ifdef __KERNEL__ -#define NR_syscalls 318 +#define NR_syscalls 320/* * user-visible error numbers are in the range -1 - -128: see
include/asm-mips/unistd.h +13 -6
@@ -329,16 +329,18 @@ #define __NR_sync_file_range (__NR_Linu#define __NR_tee (__NR_Linux + 306)#define __NR_vmsplice (__NR_Linux + 307)#define __NR_move_pages (__NR_Linux + 308) +#define __NR_ltt_trace_generic (__NR_Linux + 309) +#define __NR_ltt_register_generic (__NR_Linux + 310)/* * Offset of the last Linux o32 flavoured syscall */ -#define __NR_Linux_syscalls 308 +#define __NR_Linux_syscalls 310#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ #define __NR_O32_Linux 4000 -#define __NR_O32_Linux_syscalls 308 +#define __NR_O32_Linux_syscalls 310#if _MIPS_SIM == _MIPS_SIM_ABI64
@@ -614,16 +616,18 @@ #define __NR_sync_file_range (__NR_Linu#define __NR_tee (__NR_Linux + 265)#define __NR_vmsplice (__NR_Linux + 266)#define __NR_move_pages (__NR_Linux + 267) +#define __NR_ltt_trace_generic (__NR_Linux + 268) +#define __NR_ltt_register_generic (__NR_Linux + 269)/* * Offset of the last Linux 64-bit flavoured syscall */ -#define __NR_Linux_syscalls 267 +#define __NR_Linux_syscalls 269#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ #define __NR_64_Linux 5000 -#define __NR_64_Linux_syscalls 267 +#define __NR_64_Linux_syscalls 269#if _MIPS_SIM == _MIPS_SIM_NABI32
@@ -903,16 +907,19 @@ #define __NR_sync_file_range (__NR_Linu#define __NR_tee (__NR_Linux + 269)#define __NR_vmsplice (__NR_Linux + 270)#define __NR_move_pages (__NR_Linux + 271) +#define __NR_ltt_trace_generic (__NR_Linux + 272) +#define __NR_ltt_register_generic (__NR_Linux + 273) +/* * Offset of the last N32 flavoured syscall */ -#define __NR_Linux_syscalls 271 +#define __NR_Linux_syscalls 273#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ #define __NR_N32_Linux 6000 -#define __NR_N32_Linux_syscalls 271 +#define __NR_N32_Linux_syscalls 273#ifdef __KERNEL__
include/asm-powerpc/unistd.h +3 -1
@@ -323,10 +323,12 @@ #define __NR_fchmodat 297#define __NR_faccessat 298#define __NR_get_robust_list 299#define __NR_set_robust_list 300 +#define __NR_ltt_trace_generic 301 +#define __NR_ltt_register_generic 302#ifdef __KERNEL__ -#define __NR_syscalls 301 +#define __NR_syscalls 303#define __NR__exit __NR_exit#define NR_syscalls __NR_syscalls
include/asm-powerpc/systbl.h +2 -0
@@ -304,3 +304,5 @@ SYSCALL_SPU(fchmodat) SYSCALL_SPU(faccessat) COMPAT_SYS_SPU(get_robust_list) COMPAT_SYS_SPU(set_robust_list) +SYSCALL(ltt_trace_generic) +SYSCALL(ltt_register_generic)
include/asm-x86_64/unistd.h +5 -1
@@ -619,10 +619,14 @@ #define __NR_vmsplice 278 __SYSCALL(__NR_vmsplice, sys_vmsplice)#define __NR_move_pages 279 __SYSCALL(__NR_move_pages, sys_move_pages) +#define __NR_ltt_trace_generic 280 +__SYSCALL(__NR_ltt_trace_generic, sys_ltt_trace_generic) +#define __NR_ltt_register_generic 281 +__SYSCALL(__NR_ltt_register_generic, sys_ltt_register_generic)#ifdef __KERNEL__ -#define __NR_syscall_max __NR_move_pages +#define __NR_syscall_max __NR_ltt_register_generic#ifndef __NO_STUBS
--END--
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
Quoted 2 lines · Mathieu Desnoyers
Userspace tracing : facility registration and event logging through system call.
The patch defines the syscall numbers for several architectures but doesn't change arch/i386/kernel/syscall_table.S, arch/mips/kernel/scall*.S etc.
Ralf
Quoted 11 lines · * Ralf Baechle ([email protected]) wrote:
Quoted 2 lines · Mathieu Desnoyers
Userspace tracing : facility registration and event logging through system call.
The patch defines the syscall numbers for several architectures but doesn't change
arch/i386/kernel/syscall_table.S,arch/mips/kernel/scall*.Setc.Ralf
Hi Ralf,
I stripped them from my complete version (it is in my instrumentation patches). Only tracing from user space application is affected. As this is a minor issue, I will only fix it in my next post.
Thanks,
Mathieu
OpenPGP public key: http://krystal.dyndns.org:8080/key/compudj.gpg Key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68