diff options
| -rw-r--r-- | tapset/LKET/Changelog | 8 | ||||
| -rwxr-xr-x | tapset/LKET/iosyscall.stp | 112 | ||||
| -rwxr-xr-x | tapset/LKET/netdev.stp | 3 | ||||
| -rwxr-xr-x | tapset/LKET/nfs.stp | 72 | ||||
| -rwxr-xr-x | tapset/LKET/nfs_proc.stp | 157 | ||||
| -rwxr-xr-x | tapset/LKET/nfsd.stp | 82 | ||||
| -rwxr-xr-x | tapset/LKET/pagefault.stp | 7 | ||||
| -rwxr-xr-x | tapset/LKET/process.stp | 10 | ||||
| -rwxr-xr-x | tapset/LKET/syscalls.stp | 7 |
9 files changed, 223 insertions, 235 deletions
diff --git a/tapset/LKET/Changelog b/tapset/LKET/Changelog index ef175aef..0bb71f14 100644 --- a/tapset/LKET/Changelog +++ b/tapset/LKET/Changelog @@ -1,3 +1,11 @@ +2006-09-15 Li Guanglei <guanglei@cn.ibm.com> + + * *.stp: Make sure all integers passed into _lket_trace() + are casted into int64_t explicitly. Delete calling to + filter_by_pid() + * nfs*.stp: change addevent.*.entries to addevent.*.entry. + Reformating of some calls to _lket_trace(). + 2006-09-12 Li Guanglei <guanglei@cn.ibm.com> * iosyscall.stp: change log_iosyscall_sync() be sync diff --git a/tapset/LKET/iosyscall.stp b/tapset/LKET/iosyscall.stp index 480c51a1..bfc61131 100755 --- a/tapset/LKET/iosyscall.stp +++ b/tapset/LKET/iosyscall.stp @@ -69,9 +69,7 @@ probe addevent.iosyscall.open.entry probe _addevent.iosyscall.open.entry = syscall.open { - if(filter_by_pid() == 1 ) - log_iosyscall_open(HOOKID_IOSYSCALL_OPEN_ENTRY, - filename, flags, mode) + log_iosyscall_open(HOOKID_IOSYSCALL_OPEN_ENTRY, filename, flags, mode) } probe addevent.iosyscall.open.return @@ -83,8 +81,7 @@ probe addevent.iosyscall.open.return probe _addevent.iosyscall.open.return = syscall.open.return { - if(filter_by_pid() == 1 ) - log_iosyscall_return(HOOKID_IOSYSCALL_OPEN_RETURN, $return) + log_iosyscall_return(HOOKID_IOSYSCALL_OPEN_RETURN, $return) } function log_iosyscall_open(hookid:long, filename:string, flags:long, mode:long) @@ -110,8 +107,7 @@ probe addevent.iosyscall.close.entry probe _addevent.iosyscall.close.entry = syscall.close { - if(filter_by_pid() == 1 ) - log_iosyscall_close(HOOKID_IOSYSCALL_CLOSE_ENTRY,fd) + log_iosyscall_close(HOOKID_IOSYSCALL_CLOSE_ENTRY,fd) } probe addevent.iosyscall.close.return @@ -123,8 +119,7 @@ probe addevent.iosyscall.close.return probe _addevent.iosyscall.close.return = syscall.close.return { - if(filter_by_pid() == 1 ) - log_iosyscall_return(HOOKID_IOSYSCALL_CLOSE_RETURN, $return) + log_iosyscall_return(HOOKID_IOSYSCALL_CLOSE_RETURN, $return) } function log_iosyscall_close(hookid:long, fd:long) @@ -144,9 +139,7 @@ probe addevent.iosyscall.read.entry probe _addevent.iosyscall.read.entry = syscall.read { - if(filter_by_pid() == 1 ) - log_iosyscall_read_write(HOOKID_IOSYSCALL_READ_ENTRY, fd, - buf_uaddr, count) + log_iosyscall_read_write(HOOKID_IOSYSCALL_READ_ENTRY, fd, buf_uaddr, count) } probe addevent.iosyscall.read.return @@ -158,8 +151,7 @@ probe addevent.iosyscall.read.return probe _addevent.iosyscall.read.return = syscall.read.return { - if(filter_by_pid() == 1 ) - log_iosyscall_return(HOOKID_IOSYSCALL_READ_RETURN, $return) + log_iosyscall_return(HOOKID_IOSYSCALL_READ_RETURN, $return) } /* @@ -174,9 +166,7 @@ probe addevent.iosyscall.write.entry probe _addevent.iosyscall.write.entry = syscall.write { - if(filter_by_pid() == 1 ) - log_iosyscall_read_write(HOOKID_IOSYSCALL_WRITE_ENTRY, fd, - buf_uaddr, count) + log_iosyscall_read_write(HOOKID_IOSYSCALL_WRITE_ENTRY, fd, buf_uaddr, count) } probe addevent.iosyscall.write.return @@ -188,8 +178,7 @@ probe addevent.iosyscall.write.return probe _addevent.iosyscall.write.return = syscall.write.return { - if(filter_by_pid() == 1 ) - log_iosyscall_return(HOOKID_IOSYSCALL_WRITE_RETURN, $return) + log_iosyscall_return(HOOKID_IOSYSCALL_WRITE_RETURN, $return) } function log_iosyscall_read_write(hookid:long, fd:long, buf_uaddr:long, @@ -211,9 +200,7 @@ probe addevent.iosyscall.readv.entry probe _addevent.iosyscall.readv.entry = syscall.readv { - if(filter_by_pid() == 1 ) - log_iosyscall_readv_writev(HOOKID_IOSYSCALL_READV_ENTRY, - fd, vector_uaddr, count) + log_iosyscall_readv_writev(HOOKID_IOSYSCALL_READV_ENTRY, fd, vector_uaddr, count) } probe addevent.iosyscall.readv.return @@ -225,8 +212,7 @@ probe addevent.iosyscall.readv.return probe _addevent.iosyscall.readv.return = syscall.readv.return { - if(filter_by_pid() == 1 ) - log_iosyscall_return(HOOKID_IOSYSCALL_READV_RETURN, $return) + log_iosyscall_return(HOOKID_IOSYSCALL_READV_RETURN, $return) } /* @@ -241,9 +227,7 @@ probe addevent.iosyscall.writev.entry probe _addevent.iosyscall.writev.entry = syscall.writev { - if(filter_by_pid() == 1 ) - log_iosyscall_readv_writev(HOOKID_IOSYSCALL_WRITEV_ENTRY, - fd, vector_uaddr, count) + log_iosyscall_readv_writev(HOOKID_IOSYSCALL_WRITEV_ENTRY, fd, vector_uaddr, count) } probe addevent.iosyscall.writev.return @@ -255,8 +239,7 @@ probe addevent.iosyscall.writev.return probe _addevent.iosyscall.writev.return = syscall.writev.return { - if(filter_by_pid() == 1 ) - log_iosyscall_return(HOOKID_IOSYSCALL_WRITEV_RETURN, $return) + log_iosyscall_return(HOOKID_IOSYSCALL_WRITEV_RETURN, $return) } function log_iosyscall_readv_writev(hookid:long, fd:long, @@ -278,9 +261,8 @@ probe addevent.iosyscall.pread64.entry probe _addevent.iosyscall.pread64.entry = syscall.pread64 { - if(filter_by_pid() == 1 ) - log_iosyscall_pread64_pwrite64(HOOKID_IOSYSCALL_PREAD64_ENTRY, - fd, buf_uaddr, count, offset) + log_iosyscall_pread64_pwrite64(HOOKID_IOSYSCALL_PREAD64_ENTRY, + fd, buf_uaddr, count, offset) } probe addevent.iosyscall.pread64.return @@ -292,8 +274,7 @@ probe addevent.iosyscall.pread64.return probe _addevent.iosyscall.pread64.return = syscall.pread64.return { - if(filter_by_pid() == 1 ) - log_iosyscall_return(HOOKID_IOSYSCALL_PREAD64_RETURN, $return) + log_iosyscall_return(HOOKID_IOSYSCALL_PREAD64_RETURN, $return) } /* @@ -308,9 +289,8 @@ probe addevent.iosyscall.pwrite64.entry probe _addevent.iosyscall.pwrite64.entry = syscall.pwrite64 { - if(filter_by_pid() == 1 ) - log_iosyscall_pread64_pwrite64(HOOKID_IOSYSCALL_PWRITE64_ENTRY, - fd, buf_uaddr, count, offset); + log_iosyscall_pread64_pwrite64(HOOKID_IOSYSCALL_PWRITE64_ENTRY, + fd, buf_uaddr, count, offset); } probe addevent.iosyscall.pwrite64.return @@ -322,8 +302,7 @@ probe addevent.iosyscall.pwrite64.return probe _addevent.iosyscall.pwrite64.return = syscall.pwrite64.return { - if(filter_by_pid() == 1 ) - log_iosyscall_return(HOOKID_IOSYSCALL_PWRITE64_RETURN, $return) + log_iosyscall_return(HOOKID_IOSYSCALL_PWRITE64_RETURN, $return) } function log_iosyscall_pread64_pwrite64(hookid:long, fd:long, @@ -345,9 +324,7 @@ probe addevent.iosyscall.readahead.entry probe _addevent.iosyscall.readahead.entry = syscall.readahead { - if(filter_by_pid() == 1 ) - log_iosyscall_readahead(HOOKID_IOSYSCALL_READAHEAD_ENTRY, - fd, offset, count) + log_iosyscall_readahead(HOOKID_IOSYSCALL_READAHEAD_ENTRY, fd, offset, count) } probe addevent.iosyscall.readahead.return @@ -359,8 +336,7 @@ probe addevent.iosyscall.readahead.return probe _addevent.iosyscall.readahead.return = syscall.readahead.return { - if(filter_by_pid() == 1 ) - log_iosyscall_return(HOOKID_IOSYSCALL_READAHEAD_RETURN, $return) + log_iosyscall_return(HOOKID_IOSYSCALL_READAHEAD_RETURN, $return) } @@ -382,9 +358,8 @@ probe addevent.iosyscall.sendfile.entry probe _addevent.iosyscall.sendfile.entry = syscall.sendfile { - if(filter_by_pid() == 1 ) - log_iosyscall_sendfile(HOOKID_IOSYSCALL_SENDFILE_ENTRY, - out_fd, in_fd, offset_uaddr, count) + log_iosyscall_sendfile(HOOKID_IOSYSCALL_SENDFILE_ENTRY, + out_fd, in_fd, offset_uaddr, count) } probe addevent.iosyscall.sendfile.return @@ -396,8 +371,7 @@ probe addevent.iosyscall.sendfile.return probe _addevent.iosyscall.sendfile.return = syscall.sendfile.return { - if(filter_by_pid() == 1 ) - log_iosyscall_return(HOOKID_IOSYSCALL_SENDFILE_RETURN, $return) + log_iosyscall_return(HOOKID_IOSYSCALL_SENDFILE_RETURN, $return) } function log_iosyscall_sendfile(hookid:long, out_fd:long, in_fd:long, @@ -421,9 +395,7 @@ probe addevent.iosyscall.lseek.entry probe _addevent.iosyscall.lseek.entry = syscall.lseek { - if(filter_by_pid() == 1 ) - log_iosyscall_lseek(HOOKID_IOSYSCALL_LSEEK_ENTRY, - fildes, offset, whence) + log_iosyscall_lseek(HOOKID_IOSYSCALL_LSEEK_ENTRY, fildes, offset, whence) } probe addevent.iosyscall.lseek.return @@ -435,8 +407,7 @@ probe addevent.iosyscall.lseek.return probe _addevent.iosyscall.lseek.return = syscall.lseek.return { - if(filter_by_pid() == 1 ) - log_iosyscall_return(HOOKID_IOSYSCALL_LSEEK_RETURN, $return) + log_iosyscall_return(HOOKID_IOSYSCALL_LSEEK_RETURN, $return) } function log_iosyscall_lseek(hookid:long, fd:long, offset:long, whence:long) @@ -457,9 +428,8 @@ probe addevent.iosyscall.llseek.entry probe _addevent.iosyscall.llseek.entry = syscall.llseek { - if(filter_by_pid() == 1 ) - log_iosyscall_llseek(HOOKID_IOSYSCALL_LLSEEK_ENTRY, - fd, offset_high, offset_low, result_uaddr, whence) + log_iosyscall_llseek(HOOKID_IOSYSCALL_LLSEEK_ENTRY, + fd, offset_high, offset_low, result_uaddr, whence) } probe addevent.iosyscall.llseek.return @@ -471,8 +441,7 @@ probe addevent.iosyscall.llseek.return probe _addevent.iosyscall.llseek.return = syscall.llseek.return { - if(filter_by_pid() == 1 ) - log_iosyscall_return(HOOKID_IOSYSCALL_LLSEEK_RETURN, $return) + log_iosyscall_return(HOOKID_IOSYSCALL_LLSEEK_RETURN, $return) } function log_iosyscall_llseek(hookid:long, fd:long, offset_high:long, @@ -496,8 +465,7 @@ probe addevent.iosyscall.sync.entry probe _addevent.iosyscall.sync.entry = syscall.sync { - if(filter_by_pid() == 1 ) - log_iosyscall_sync(HOOKID_IOSYSCALL_SYNC_ENTRY) + log_iosyscall_sync(HOOKID_IOSYSCALL_SYNC_ENTRY) } probe addevent.iosyscall.sync.return @@ -509,8 +477,7 @@ probe addevent.iosyscall.sync.return probe _addevent.iosyscall.sync.return = syscall.sync.return { - if(filter_by_pid() == 1 ) - log_iosyscall_return(HOOKID_IOSYSCALL_SYNC_RETURN, $return) + log_iosyscall_return(HOOKID_IOSYSCALL_SYNC_RETURN, $return) } function log_iosyscall_sync(hookid:long) @@ -565,8 +532,7 @@ probe addevent.iosyscall.fsync.entry probe _addevent.iosyscall.fsync.entry = syscall.fsync { - if(filter_by_pid() == 1 ) - log_iosyscall_fsync(HOOKID_IOSYSCALL_FSYNC_ENTRY, fd) + log_iosyscall_fsync(HOOKID_IOSYSCALL_FSYNC_ENTRY, fd) } probe addevent.iosyscall.fsync.return @@ -578,8 +544,7 @@ probe addevent.iosyscall.fsync.return probe _addevent.iosyscall.fsync.return = syscall.fsync.return { - if(filter_by_pid() == 1 ) - log_iosyscall_return(HOOKID_IOSYSCALL_FSYNC_RETURN, $return) + log_iosyscall_return(HOOKID_IOSYSCALL_FSYNC_RETURN, $return) } /* @@ -595,8 +560,7 @@ probe addevent.iosyscall.fdatasync.entry probe _addevent.iosyscall.fdatasync.entry = syscall.fdatasync { - if(filter_by_pid() == 1 ) - log_iosyscall_fsync(HOOKID_IOSYSCALL_FDATASYNC_ENTRY, fd) + log_iosyscall_fsync(HOOKID_IOSYSCALL_FDATASYNC_ENTRY, fd) } probe addevent.iosyscall.fdatasync.return @@ -608,8 +572,7 @@ probe addevent.iosyscall.fdatasync.return probe _addevent.iosyscall.fdatasync.return = syscall.fdatasync.return { - if(filter_by_pid() == 1 ) - log_iosyscall_return(HOOKID_IOSYSCALL_FDATASYNC_RETURN, $return) + log_iosyscall_return(HOOKID_IOSYSCALL_FDATASYNC_RETURN, $return) } function log_iosyscall_fsync(hookid:long, fd:long) @@ -630,9 +593,7 @@ probe addevent.iosyscall.flock.entry probe _addevent.iosyscall.flock.entry = syscall.flock { - if(filter_by_pid() == 1 ) - log_iosyscall_flock(HOOKID_IOSYSCALL_FLOCK_ENTRY, - fd, operation) + log_iosyscall_flock(HOOKID_IOSYSCALL_FLOCK_ENTRY, fd, operation) } probe addevent.iosyscall.flock.return @@ -644,8 +605,7 @@ probe addevent.iosyscall.flock.return probe _addevent.iosyscall.flock.return = syscall.flock.return { - if(filter_by_pid() == 1 ) - log_iosyscall_return(HOOKID_IOSYSCALL_FLOCK_RETURN, $return) + log_iosyscall_return(HOOKID_IOSYSCALL_FLOCK_RETURN, $return) } function log_iosyscall_flock(hookid:long, fd:long, operation:long) diff --git a/tapset/LKET/netdev.stp b/tapset/LKET/netdev.stp index e7211fdb..2b8acee0 100755 --- a/tapset/LKET/netdev.stp +++ b/tapset/LKET/netdev.stp @@ -38,8 +38,7 @@ probe addevent.netdev.transmit probe _addevent.netdev.transmit = netdev.transmit { - if(filter_by_pid() == 1 ) - log_netdev_extra(HOOKID_NETDEV_TRANSMIT, $skb) + log_netdev_extra(HOOKID_NETDEV_TRANSMIT, $skb) } function log_netdev_extra(var_id:long, var:long) diff --git a/tapset/LKET/nfs.stp b/tapset/LKET/nfs.stp index 924b2c28..2aabbd95 100755 --- a/tapset/LKET/nfs.stp +++ b/tapset/LKET/nfs.stp @@ -3,14 +3,14 @@ probe never printf("%d",GROUP_NFS) } probe addevent.nfs - = addevent.nfs.entries, + = addevent.nfs.entry, addevent.nfs.return {} -probe addevent.nfs.entries - = addevent.nfs.fop.entries, - addevent.nfs.aop.entries, - addevent.nfs.proc.entries +probe addevent.nfs.entry + = addevent.nfs.fop.entry, + addevent.nfs.aop.entry, + addevent.nfs.proc.entry {} probe addevent.nfs.return @@ -20,11 +20,11 @@ probe addevent.nfs.return {} probe addevent.nfs.fop - = addevent.nfs.fop.entries, + = addevent.nfs.fop.entry, addevent.nfs.fop.return {} -probe addevent.nfs.fop.entries +probe addevent.nfs.fop.entry = addevent.nfs.fop.llseek.entry, addevent.nfs.fop.read.entry, @@ -227,8 +227,9 @@ function log_fop_mmap(s_id:long,ino:long,vm_start:long, int major,minor; getdevice(s_id,&major,&minor); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_FOP_MMAP_ENTRY,"%1b%1b%8b%8b%8b%4b",(_FMT_)major,(_FMT_)minor, - THIS->ino,THIS->vm_start,THIS->vm_end,THIS->vm_flags); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_FOP_MMAP_ENTRY,"%1b%1b%8b%8b%8b%4b", + (_FMT_)major,(_FMT_)minor, THIS->ino,THIS->vm_start, + THIS->vm_end,THIS->vm_flags); %} probe addevent.nfs.fop.mmap.return @@ -261,7 +262,8 @@ function log_fop_open(s_id:long,ino:long,flag :long , filename:string) int major,minor; getdevice(s_id,&major,&minor); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_FOP_OPEN_ENTRY,"%1b%1b%8b%4b%0s",(_FMT_)major,(_FMT_)minor, + _lket_trace(_GROUP_NFS,_HOOKID_NFS_FOP_OPEN_ENTRY,"%1b%1b%8b%4b%0s", + (_FMT_)major,(_FMT_)minor, THIS->ino,THIS->flag,THIS->filename); %} @@ -295,8 +297,8 @@ function log_fop_flush(s_id:long,ino:long,ndirty:long) int major,minor; getdevice(s_id,&major,&minor); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_FOP_FLUSH_ENTRY,"%1b%1b%8b%4b",(_FMT_)major,(_FMT_)minor, - THIS->ino,THIS->ndirty); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_FOP_FLUSH_ENTRY,"%1b%1b%8b%4b", + (_FMT_)major,(_FMT_)minor, THIS->ino,THIS->ndirty); %} probe addevent.nfs.fop.flush.return @@ -329,8 +331,9 @@ function log_fop_release(s_id:long,ino:long,mode:long) int major,minor; getdevice(s_id,&major,&minor); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_FOP_RELEASE_ENTRY,"%1b%1b%8b%2b",(_FMT_)major,(_FMT_)minor, - THIS->ino,THIS->mode); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_FOP_RELEASE_ENTRY,"%1b%1b%8b%2b", + (_FMT_)major,(_FMT_)minor, + THIS->ino,THIS->mode); %} probe addevent.nfs.fop.release.return @@ -363,8 +366,8 @@ function log_fop_fsync(s_id:long,ino:long,ndirty:long) int major,minor; getdevice(s_id,&major,&minor); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_FOP_FSYNC_ENTRY,"%1b%1b%8b%4b",(_FMT_)major,(_FMT_)minor, - THIS->ino,THIS->ndirty); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_FOP_FSYNC_ENTRY,"%1b%1b%8b%4b", + (_FMT_)major,(_FMT_)minor, THIS->ino,THIS->ndirty); %} probe addevent.nfs.fop.fsync.return @@ -397,9 +400,9 @@ function log_fop_lock(s_id:long,ino:long,fl_start:long,fl_end:long,fl_type:long, int major,minor; getdevice(s_id,&major,&minor); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_FOP_LOCK_ENTRY,"%1b%1b%8b%8b%8b%1b%1b%4b",(_FMT_)major,(_FMT_)minor, - THIS->ino,THIS->fl_start,THIS->fl_end, - THIS->fl_type,THIS->fl_flag,THIS->cmd); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_FOP_LOCK_ENTRY,"%1b%1b%8b%8b%8b%1b%1b%4b", + (_FMT_)major,(_FMT_)minor, THIS->ino,THIS->fl_start,THIS->fl_end, + THIS->fl_type,THIS->fl_flag,THIS->cmd); %} probe addevent.nfs.fop.lock.return @@ -432,8 +435,8 @@ function log_fop_sendfile(s_id:long,ino:long,count:long,ppos:long) int major,minor; getdevice(s_id,&major,&minor); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_FOP_SENDFILE_ENTRY,"%1b%1b%8b%8b%8b",(_FMT_)major,(_FMT_)minor, - THIS->ino,THIS->count,THIS->ppos); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_FOP_SENDFILE_ENTRY,"%1b%1b%8b%8b%8b", + (_FMT_)major,(_FMT_)minor, THIS->ino,THIS->count,THIS->ppos); %} probe addevent.nfs.fop.sendfile.return @@ -483,7 +486,7 @@ probe addevent.nfs.aop addevent.nfs.aop.return {} -probe addevent.nfs.aop.entries +probe addevent.nfs.aop.entry = addevent.nfs.aop.readpage.entry, addevent.nfs.aop.readpages.entry, @@ -521,7 +524,8 @@ probe _addevent.nfs.aop.readpages.entry function log_aop_readpages(ino:long,rpages:long,nr_pages:long) %{/*pure*/ - _lket_trace(_GROUP_NFS,_HOOKID_NFS_AOP_READPAGES_ENTRY,"%8b%4b%4b",THIS->ino,THIS->rpages,THIS->nr_pages); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_AOP_READPAGES_ENTRY,"%8b%4b%4b", + THIS->ino,THIS->rpages,THIS->nr_pages); %} probe addevent.nfs.aop.readpages.return @@ -550,7 +554,8 @@ probe _addevent.nfs.aop.readpage.entry function log_aop_readpage(ino:long,rsize:long,__page:long,page_index:long) %{/*pure*/ - _lket_trace(_GROUP_NFS,_HOOKID_NFS_AOP_READPAGE_ENTRY,"%8b%4b%8b%8b",THIS->ino,THIS->rsize,THIS->__page,THIS->page_index); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_AOP_READPAGE_ENTRY,"%8b%4b%8b%8b", + THIS->ino,THIS->rsize,THIS->__page,THIS->page_index); %} probe addevent.nfs.aop.readpage.return @@ -579,7 +584,8 @@ probe _addevent.nfs.aop.writepage.entry function log_aop_writepage(ino:long,wsize:long,__page:long,page_index:long) %{/*pure*/ - _lket_trace(_GROUP_NFS,_HOOKID_NFS_AOP_WRITEPAGE_ENTRY,"%8b%4b%8b%8b",THIS->ino,THIS->wsize,THIS->__page,THIS->page_index); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_AOP_WRITEPAGE_ENTRY,"%8b%4b%8b%8b", + THIS->ino,THIS->wsize,THIS->__page,THIS->page_index); %} probe addevent.nfs.aop.writepage.return @@ -608,7 +614,8 @@ probe _addevent.nfs.aop.writepages.entry function log_aop_writepages(ino:long,wpages:long,nr_to_write:long) %{/*pure*/ - _lket_trace(_GROUP_NFS,_HOOKID_NFS_AOP_WRITEPAGES_ENTRY,"%8b%4b%8b",THIS->ino,THIS->wpages,THIS->nr_to_write); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_AOP_WRITEPAGES_ENTRY,"%8b%4b%8b", + THIS->ino,THIS->wpages,THIS->nr_to_write); %} probe addevent.nfs.aop.writepages.return @@ -637,7 +644,8 @@ probe _addevent.nfs.aop.prepare_write.entry function log_aop_prepare_write(ino:long,__page:long,page_index:long) %{/*pure*/ - _lket_trace(_GROUP_NFS,_HOOKID_NFS_AOP_PREPAREWRITE_ENTRY,"%8b%8b%8b",THIS->ino,THIS->__page,THIS->page_index); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_AOP_PREPAREWRITE_ENTRY,"%8b%8b%8b", + THIS->ino,THIS->__page,THIS->page_index); %} probe addevent.nfs.aop.prepare_write.return @@ -666,8 +674,8 @@ probe _addevent.nfs.aop.commit_write.entry function log_aop_commit_write(ino:long,__page:long,page_index:long,offset:long,count:long) %{/*pure*/ - _lket_trace(_GROUP_NFS,_HOOKID_NFS_AOP_COMMITWRITE_ENTRY,"%8b%8b%8b%4b%4b",THIS->ino,THIS->__page, - THIS->page_index,THIS->offset,THIS->count); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_AOP_COMMITWRITE_ENTRY,"%8b%8b%8b%4b%4b", + THIS->ino,THIS->__page, THIS->page_index,THIS->offset,THIS->count); %} probe addevent.nfs.aop.commit_write.return @@ -696,7 +704,8 @@ probe _addevent.nfs.aop.set_page_dirty.entry function log_aop_set_page_dirty(__page:long,page_flag:long) %{/*pure*/ - _lket_trace(_GROUP_NFS,_HOOKID_NFS_AOP_SETPAGEDIRTY_ENTRY,"%8b%1b",THIS->__page,THIS->page_flag); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_AOP_SETPAGEDIRTY_ENTRY,"%8b%1b", + THIS->__page,THIS->page_flag); %} probe addevent.nfs.aop.set_page_dirty.return @@ -725,7 +734,8 @@ probe _addevent.nfs.aop.release_page.entry function log_aop_release_page(__page:long,page_index:long) %{/*pure*/ - _lket_trace(_GROUP_NFS,_HOOKID_NFS_AOP_RELEASEPAGE_ENTRY,"%8b%8b",THIS->__page,THIS->page_index); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_AOP_RELEASEPAGE_ENTRY,"%8b%8b", + THIS->__page,THIS->page_index); %} probe addevent.nfs.aop.release_page.return diff --git a/tapset/LKET/nfs_proc.stp b/tapset/LKET/nfs_proc.stp index 82623bc5..75d8e6ff 100755 --- a/tapset/LKET/nfs_proc.stp +++ b/tapset/LKET/nfs_proc.stp @@ -9,44 +9,44 @@ #include <linux/nfs_fs.h> %} %{ - void getdevice(char *sid,int * major,int* min) - { - char c; - char * minor, *p; - int i = 0; - - c = ':'; - minor = strchr(sid,c); - minor++; - - p = sid; - c = *p; - p++; - while(c != ':') - { - if(c > '0' || c < '9') - i = i << 4 | (c - 48); - else if (c > 'a' || c < 'f') - i = i<< 4 | (c-87); - c = *p; - p++; - } - *major = i; - - p = minor; - c = *minor; - p++; - while(c != 0) - { - if(c > '0' || c < '9') - i = i << 4 | (c - 48); - else if (c > 'a' || c < 'f') - i = i<< 4 | (c-87); - c = *p; - p++; - } - *min = i; - } +void getdevice(char *sid,int * major,int* min) +{ + char c; + char * minor, *p; + int i = 0; + + c = ':'; + minor = strchr(sid,c); + minor++; + + p = sid; + c = *p; + p++; + while(c != ':') + { + if(c > '0' || c < '9') + i = i << 4 | (c - 48); + else if (c > 'a' || c < 'f') + i = i<< 4 | (c-87); + c = *p; + p++; + } + *major = i; + + p = minor; + c = *minor; + p++; + while(c != 0) + { + if(c > '0' || c < '9') + i = i << 4 | (c - 48); + else if (c > 'a' || c < 'f') + i = i<< 4 | (c-87); + c = *p; + p++; + } + *min = i; +} %} probe never @@ -54,11 +54,11 @@ probe never printf("%d",GROUP_NFS) } probe addevent.nfs.proc - = addevent.nfs.proc.entries, + = addevent.nfs.proc.entry, addevent.nfs.proc.return {} -probe addevent.nfs.proc.entries +probe addevent.nfs.proc.entry = addevent.nfs.proc.lookup.entry, addevent.nfs.proc.read.entry, addevent.nfs.proc.write.entry, @@ -110,8 +110,9 @@ function log_proc_lookup(version:long,dir:long,filename:string) int major_device,minor_device; getdevice(sb->s_id,&major_device,&minor_device); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_LOOKUP_ENTRY,"%1b%1b%8b%1b%0s",(_FMT_)major_device,(_FMT_)minor_device, - NFS_FILEID(dir),THIS->version,THIS->filename); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_LOOKUP_ENTRY,"%1b%1b%8b%1b%0s", + (_FMT_)major_device,(_FMT_)minor_device, + NFS_FILEID(dir),THIS->version,THIS->filename); %} probe addevent.nfs.proc.lookup.return @@ -146,8 +147,9 @@ function log_proc_read(version:long,rdata:long,count:long,offset:long) int major_device,minor_device; getdevice(sb->s_id,&major_device,&minor_device); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_READ_ENTRY,"%1b%1b%8b%1b%4b%8b",major_device,minor_device, - NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_READ_ENTRY,"%1b%1b%8b%1b%4b%8b", + (_FMT_)major_device,(_FMT_)minor_device, + NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset); %} probe addevent.nfs.proc.read.return @@ -182,8 +184,9 @@ function log_proc_write(version:long,wdata:long,count:long,offset:long) int major_device,minor_device; getdevice(sb->s_id,&major_device,&minor_device); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_WRITE_ENTRY,"%1b%1b%8b%1b%4b%8b",(_FMT_)major_device,(_FMT_)minor_device, - NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_WRITE_ENTRY,"%1b%1b%8b%1b%4b%8b", + (_FMT_)major_device,(_FMT_)minor_device, + NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset); %} probe addevent.nfs.proc.write.return @@ -219,8 +222,9 @@ function log_proc_commit(version:long,cdata:long,count:long,offset:long) getdevice(sb->s_id,&major_device,&minor_device); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_COMMIT_ENTRY,"%1b%1b%8b%1b%4b%8b",(_FMT_)major_device,(_FMT_)minor_device, - NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_COMMIT_ENTRY,"%1b%1b%8b%1b%4b%8b", + (_FMT_)major_device,(_FMT_)minor_device, + NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset); %} probe addevent.nfs.proc.commit.return @@ -256,8 +260,9 @@ function log_proc_read_setup(version:long,data:long,count:long,offset:long) getdevice(sb->s_id,&major_device,&minor_device); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_READSETUP_ENTRY,"%1b%1b%8b%1b%4b%8b",(_FMT_)major_device,(_FMT_)minor_device, - NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_READSETUP_ENTRY,"%1b%1b%8b%1b%4b%8b", + (_FMT_)major_device,(_FMT_)minor_device, + NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset); %} probe addevent.nfs.proc.write_setup.entry @@ -281,8 +286,9 @@ function log_proc_write_setup(version:long,data:long,count:long,offset:long,how: getdevice(sb->s_id,&major_device,&minor_device); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_WRITESETUP_ENTRY,"%1b%1b%8b%1b%1b%4b%8b",(_FMT_)major_device,(_FMT_)minor_device, - NFS_FILEID(inode),THIS->version,THIS->how,THIS->count,THIS->offset); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_WRITESETUP_ENTRY,"%1b%1b%8b%1b%1b%4b%8b", + (_FMT_)major_device,(_FMT_)minor_device, + NFS_FILEID(inode),THIS->version,THIS->how,THIS->count,THIS->offset); %} @@ -307,8 +313,9 @@ function log_proc_commit_setup(version:long,data:long,count:long,offset:long) getdevice(sb->s_id,&major_device,&minor_device); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_COMMITSETUP_ENTRY,"%1b%1b%8b%1b%4b%8b",(_FMT_)major_device,(_FMT_)minor_device, - NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_COMMITSETUP_ENTRY,"%1b%1b%8b%1b%4b%8b", + (_FMT_)major_device,(_FMT_)minor_device, + NFS_FILEID(inode),THIS->version,THIS->count,THIS->offset); %} @@ -333,8 +340,9 @@ function log_proc_read_done(version:long,data:long,count:long,status:long) getdevice(sb->s_id,&major_device,&minor_device); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_READDONE_ENTRY,"%1b%1b%8b%1b%4b%4b",(_FMT_)major_device,(_FMT_)minor_device, - NFS_FILEID(inode),THIS->version,THIS->status,THIS->count); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_READDONE_ENTRY,"%1b%1b%8b%1b%4b%4b", + (_FMT_)major_device,(_FMT_)minor_device, + NFS_FILEID(inode),THIS->version,THIS->status,THIS->count); %} probe addevent.nfs.proc.read_done.return @@ -370,8 +378,9 @@ function log_proc_write_done(version:long,data:long,count:long,status:long) getdevice(sb->s_id,&major_device,&minor_device); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_WRITEDONE_ENTRY,"%1b%1b%8b%1b%4b%4b",(_FMT_)major_device,(_FMT_)minor_device, - NFS_FILEID(inode),THIS->version,THIS->status,THIS->count); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_WRITEDONE_ENTRY,"%1b%1b%8b%1b%4b%4b", + (_FMT_)major_device,(_FMT_)minor_device, + NFS_FILEID(inode),THIS->version,THIS->status,THIS->count); %} probe addevent.nfs.proc.write_done.return @@ -407,8 +416,9 @@ function log_proc_commit_done(version:long,data:long,count:long,status:long) getdevice(sb->s_id,&major_device,&minor_device); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_COMMITDONE_ENTRY,"%1b%1b%8b%1b%4b%4b",(_FMT_)major_device,(_FMT_)minor_device, - NFS_FILEID(inode),THIS->version,THIS->status,THIS->count); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_COMMITDONE_ENTRY,"%1b%1b%8b%1b%4b%4b", + (_FMT_)major_device,(_FMT_)minor_device, + NFS_FILEID(inode),THIS->version,THIS->status,THIS->count); %} probe addevent.nfs.proc.commit_done.return @@ -444,8 +454,9 @@ function log_proc_open(version:long,inode:long, getdevice(sb->s_id,&major_device,&minor_device); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_OPEN_ENTRY,"%1b%1b%8b%1b%0s%4b%4b",(_FMT_)major_device,(_FMT_)minor_device, - NFS_FILEID(inode),THIS->version,THIS->filename,THIS->flag,THIS->mode); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_OPEN_ENTRY,"%1b%1b%8b%1b%0s%4b%4b", + (_FMT_)major_device,(_FMT_)minor_device, + NFS_FILEID(inode),THIS->version,THIS->filename,THIS->flag,THIS->mode); %} probe addevent.nfs.proc.open.return @@ -481,8 +492,9 @@ function log_proc_release(version:long,inode:long, getdevice(sb->s_id,&major_device,&minor_device); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_RELEASE_ENTRY,"%1b%1b%8b%1b%0s%4b%4b",(_FMT_)major_device,(_FMT_)minor_device, - NFS_FILEID(inode),THIS->version,THIS->filename,THIS->flag,THIS->mode); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_RELEASE_ENTRY,"%1b%1b%8b%1b%0s%4b%4b", + (_FMT_)major_device,(_FMT_)minor_device, + NFS_FILEID(inode),THIS->version,THIS->filename,THIS->flag,THIS->mode); %} probe addevent.nfs.proc.release.return @@ -516,8 +528,9 @@ function log_proc_create(version:long,inode:long,filename:string,mode:long) int major_device,minor_device; getdevice(sb->s_id,&major_device,&minor_device); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_CREATE_ENTRY,"%1b%1b%8b%1b%0s%4b",(_FMT_)major_device,(_FMT_)minor_device, - NFS_FILEID(inode),THIS->version,THIS->filename,THIS->mode); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_CREATE_ENTRY,"%1b%1b%8b%1b%0s%4b", + (_FMT_)major_device,(_FMT_)minor_device, + NFS_FILEID(inode),THIS->version,THIS->filename,THIS->mode); %} probe addevent.nfs.proc.create.return @@ -552,8 +565,9 @@ function log_proc_remove(version:long,inode:long, int major_device,minor_device; getdevice(sb->s_id,&major_device,&minor_device); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_REMOVE_ENTRY,"%1b%1b%8b%1b%0s%4b",(_FMT_)major_device,(_FMT_)minor_device, - NFS_FILEID(inode),THIS->version,THIS->filename); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_REMOVE_ENTRY,"%1b%1b%8b%1b%0s%4b", + (_FMT_)major_device,(_FMT_)minor_device, + NFS_FILEID(inode),THIS->version,THIS->filename); %} probe addevent.nfs.proc.remove.return @@ -592,9 +606,10 @@ function log_proc_rename(version:long,old_dir:long,old_name:string, getdevice(old_sb->s_id,&major_old,&minor_old); getdevice(new_sb->s_id,&major_new,&minor_new); - _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_RENAME_ENTRY,"%1b%1b%1b%8b%0s%1b%1b%8b%0s",THIS->version, - (_FMT_)major_old,(_FMT_)minor_old,NFS_FILEID(old_dir),THIS->old_name, - (_FMT_)major_new,(_FMT_)minor_new,NFS_FILEID(new_dir),THIS->new_name); + _lket_trace(_GROUP_NFS,_HOOKID_NFS_PROC_RENAME_ENTRY,"%1b%1b%1b%8b%0s%1b%1b%8b%0s", + THIS->version,(_FMT_)major_old,(_FMT_)minor_old,NFS_FILEID(old_dir), + THIS->old_name,(_FMT_)major_new,(_FMT_)minor_new,NFS_FILEID(new_dir), + THIS->new_name); %} probe addevent.nfs.proc.rename.return diff --git a/tapset/LKET/nfsd.stp b/tapset/LKET/nfsd.stp index 5154b95a..41597a86 100755 --- a/tapset/LKET/nfsd.stp +++ b/tapset/LKET/nfsd.stp @@ -20,24 +20,24 @@ probe never } probe addevent.nfsd - = addevent.nfsd.entries, + = addevent.nfsd.entry, addevent.nfsd.return {} -probe addevent.nfsd.entries - = addevent.nfsd.op.entries, - addevent.nfsd.proc.entries +probe addevent.nfsd.entry + = addevent.nfsd.op.entry, + addevent.nfsd.proc.entry {} probe addevent.nfsd.return = addevent.nfsd.op.return, addevent.nfsd.proc.return {} probe addevent.nfsd.op - = addevent.nfsd.op.entries, + = addevent.nfsd.op.entry, addevent.nfsd.op.return {} -probe addevent.nfsd.op.entries = +probe addevent.nfsd.op.entry = addevent.nfsd.dispatch.entry, addevent.nfsd.open.entry, addevent.nfsd.read.entry, @@ -81,7 +81,7 @@ function log_nfsd_dispatch(client_ip:long,proto:long,version:long,xid:long, prog:long,proc:long) %{ _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_DISPATCH_ENTRY,"%1b%1b%4b%4b%4b", - THIS->proto,THIS->version,THIS->xid,THIS->proc,THIS->client_ip); + THIS->proto,THIS->version,THIS->xid,THIS->proc,THIS->client_ip); %} probe addevent.nfsd.dispatch.return @@ -115,7 +115,7 @@ function log_nfsd_lookup(fhp:long,filename:string)%{ /*pure*/ decode_fh(&fhp->fh_handle,i_ino); _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_LOOKUP_ENTRY,"%1b%8b%8b%8b%0s", - (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->filename); + (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->filename); %} probe addevent.nfsd.lookup.return @@ -151,8 +151,8 @@ function log_nfsd_create(fhp:long,filename:string,type:long, decode_fh(&fhp->fh_handle,i_ino); _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_CREATE_ENTRY,"%1b%8b%8b%8b%0s%4b%2b%4b", - (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->filename, - THIS->type,THIS->iap_valid,THIS->iap_mode); + (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->filename, + THIS->type,THIS->iap_valid,THIS->iap_mode); %} probe addevent.nfsd.create.return @@ -189,8 +189,8 @@ function log_nfsd_createv3(fhp:long,filename:string,createmode:long, decode_fh(&fhp->fh_handle,i_ino); _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_CREATEV3_ENTRY,"%1b%8b%8b%8b%0s%1b%2b%4b", - (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->filename, - THIS->createmode,THIS->iap_valid,THIS->iap_mode); + (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->filename, + THIS->createmode,THIS->iap_valid,THIS->iap_mode); %} probe addevent.nfsd.createv3.return @@ -225,7 +225,8 @@ function log_nfsd_unlink(fhp:long,filename:string,type:long)%{ /*pure*/ decode_fh(&fhp->fh_handle,i_ino); _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_UNLINK_ENTRY,"%1b%8b%8b%8b%0s%4b", - (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->filename,THIS->type); + (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2], + THIS->filename,THIS->type); %} probe addevent.nfsd.unlink.return @@ -261,8 +262,9 @@ function log_nfsd_rename(fhp:long,filename:string,tfhp:long,tname:string)%{ /*pu decode_fh(&fhp->fh_handle,old_ino); decode_fh(&tfhp->fh_handle,i_ino); _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_RENAME_ENTRY,"%1b%8b%8b%8b%0s%1b%8b%8b%8b%0s", - (_FMT_)fhp->fh_handle.fh_size,old_ino[0],old_ino[1],old_ino[2],THIS->filename, - (_FMT_)tfhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->tname); + (_FMT_)fhp->fh_handle.fh_size,old_ino[0],old_ino[1],old_ino[2], + THIS->filename, (_FMT_)tfhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2], + THIS->tname); %} probe addevent.nfsd.rename.return @@ -297,7 +299,8 @@ function log_nfsd_open(fhp:long,type:long,access:long)%{ /*pure*/ decode_fh(&fhp->fh_handle,i_ino); _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_OPEN_ENTRY,"%1b%8b%8b%8b%4b%1b", - (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->type,THIS->access); + (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2], + THIS->type,THIS->access); %} probe addevent.nfsd.open.return @@ -361,8 +364,8 @@ function log_nfsd_read(fhp:long,count:long,offset:long, decode_fh(&fhp->fh_handle,i_ino); _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_READ_ENTRY,"%1b%8b%8b%8b%8b%8b%8b%8b", - (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2], - THIS->count,THIS->offset,vec->iov_len,THIS->vlen); + (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2], + THIS->count,THIS->offset,(_FMT_)vec->iov_len,THIS->vlen); %} probe addevent.nfsd.read.return @@ -398,8 +401,8 @@ function log_nfsd_write(fhp:long,count:long,offset:long, decode_fh(&fhp->fh_handle,i_ino); _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_WRITE_ENTRY,"%1b%8b%8b%8b%8b%8b%8b%8b", - (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2], - THIS->count,THIS->offset,vec->iov_len,THIS->vlen); + (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2], + THIS->count,THIS->offset,(_FMT_)vec->iov_len,THIS->vlen); %} probe addevent.nfsd.write.return @@ -433,8 +436,8 @@ function log_nfsd_commit(fhp:long,count:long,offset:long)%{ /*pure*/ decode_fh(&fhp->fh_handle,i_ino); _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_COMMIT_ENTRY,"%1b%8b%8b%8b%8b%8b", - (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2], - THIS->count,THIS->offset); + (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2], + THIS->count,THIS->offset); %} probe addevent.nfsd.commit.return @@ -449,11 +452,11 @@ probe _addevent.nfsd.commit.return log_nfs_return(HOOKID_NFSD_COMMIT_RETURN,$return) } -probe addevent.nfsd.proc = addevent.nfsd.proc.entries, +probe addevent.nfsd.proc = addevent.nfsd.proc.entry, addevent.nfsd.proc.return {} -probe addevent.nfsd.proc.entries = +probe addevent.nfsd.proc.entry = addevent.nfsd.proc.lookup.entry, addevent.nfsd.proc.read.entry, addevent.nfsd.proc.write.entry, @@ -494,8 +497,8 @@ function log_nfsd_proc_lookup(fh:long,version:long,filename:string)%{ /*pure*/ decode_fh(&fhp->fh_handle,i_ino); _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_PROC_LOOKUP_ENTRY,"%1b%8b%8b%8b%1b%0s", - (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2], - THIS->version,THIS->filename); + (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2], + THIS->version,THIS->filename); %} probe addevent.nfsd.proc.lookup.return @@ -531,8 +534,8 @@ function log_nfsd_proc_read(fhp:long,version:long,count:long,offset:long, decode_fh(&fhp->fh_handle,i_ino); _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_PROC_READ_ENTRY,"%1b%8b%8b%8b%1b%8b%8b%8b%8b", - (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->version, - THIS->count,THIS->offset,vec->iov_len,THIS->vlen); + (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->version, + THIS->count,THIS->offset,(_FMT_)vec->iov_len,THIS->vlen); %} probe addevent.nfsd.proc.read.return @@ -568,8 +571,8 @@ function log_nfsd_proc_write(fhp:long,version:long,count:long,offset:long, decode_fh(&fhp->fh_handle,i_ino); _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_PROC_WRITE_ENTRY,"%1b%8b%8b%8b%1b%8b%8b%8b%8b", - (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->version, - THIS->count,THIS->offset,vec->iov_len,THIS->vlen); + (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->version, + THIS->count,THIS->offset,(_FMT_)vec->iov_len,THIS->vlen); %} probe addevent.nfsd.proc.write.return @@ -603,8 +606,8 @@ function log_nfsd_proc_commit(fhp:long,version:long,count:long,offset:long)%{ /* decode_fh(&fhp->fh_handle,i_ino); _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_PROC_COMMIT_ENTRY,"%1b%8b%8b%8b%1b%8b%8b", - (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->version, - THIS->count,THIS->offset); + (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->version, + THIS->count,THIS->offset); %} probe addevent.nfsd.proc.commit.return @@ -632,8 +635,7 @@ probe _addevent.nfsd.proc.compound.entry } function log_nfsd_proc_compound(num:long)%{ /*pure*/ - _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_PROC_COMPOUND_ENTRY,"%4b", - THIS->num); + _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_PROC_COMPOUND_ENTRY,"%4b", THIS->num); %} probe addevent.nfsd.proc.compound.return @@ -667,8 +669,8 @@ function log_nfsd_proc_remove(fhp:long,version:long,filename:string)%{ /*pure*/ decode_fh(&fhp->fh_handle,i_ino); _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_PROC_REMOVE_ENTRY,"%1b%8b%8b%8b%1b%0s", - (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->version, - THIS->filename); + (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->version, + THIS->filename); %} probe addevent.nfsd.proc.remove.return @@ -704,8 +706,9 @@ function log_nfsd_proc_rename(fhp:long,version:long,filename:string, decode_fh(&fhp->fh_handle,o_ino); decode_fh(&tfhp->fh_handle,i_ino); _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_PROC_RENAME_ENTRY,"%1b%1b%8b%8b%8b%0s%1b%8b%8b%8b%0s", - THIS->version,(_FMT_)fhp->fh_handle.fh_size,o_ino[0],o_ino[1],o_ino[2],THIS->filename, - (_FMT_)tfhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->tname); + THIS->version,(_FMT_)fhp->fh_handle.fh_size,o_ino[0],o_ino[1],o_ino[2], + THIS->filename, (_FMT_)tfhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2], + THIS->tname); %} probe addevent.nfsd.proc.rename.return @@ -739,7 +742,8 @@ function log_nfsd_proc_create(fhp:long,version:long,filename:string)%{ /*pure*/ decode_fh(&fhp->fh_handle,i_ino); _lket_trace(_GROUP_NFSD,_HOOKID_NFSD_PROC_CREATE_ENTRY,"%1b%8b%8b%8b%1b%0s", - (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2],THIS->version,THIS->filename); + (_FMT_)fhp->fh_handle.fh_size,i_ino[0],i_ino[1],i_ino[2], + THIS->version,THIS->filename); %} probe addevent.nfsd.proc.create.return diff --git a/tapset/LKET/pagefault.stp b/tapset/LKET/pagefault.stp index 1dcca518..c643a7d5 100755 --- a/tapset/LKET/pagefault.stp +++ b/tapset/LKET/pagefault.stp @@ -7,7 +7,8 @@ function log_pagefault_tracedata(var_id:long, var_addr:long, var_rwflag:long) %{ - _lket_trace(_GROUP_PAGEFAULT, THIS->var_id, "%8b%1b", (int64_t)(THIS->var_addr), (_FMT_)((THIS->var_rwflag)?1:0)); + _lket_trace(_GROUP_PAGEFAULT, THIS->var_id, "%8b%1b", + (int64_t)(THIS->var_addr), (_FMT_)((THIS->var_rwflag)?1:0)); %} @@ -21,7 +22,5 @@ probe addevent.pagefault probe _addevent.pagefault = vm.pagefault { - if(filter_by_pid() == 1 ) { - log_pagefault_tracedata(HOOKID_PAGEFAULT, $address, $write_access) - } + log_pagefault_tracedata(HOOKID_PAGEFAULT, $address, $write_access) } diff --git a/tapset/LKET/process.stp b/tapset/LKET/process.stp index b9dbb4dc..238f1b20 100755 --- a/tapset/LKET/process.stp +++ b/tapset/LKET/process.stp @@ -10,7 +10,7 @@ function log_execve_tracedata(var_id:long, var:long) %{ long tmp=(long)THIS->var; _lket_trace(_GROUP_PROCESS, THIS->var_id, "%4b%0s", - current->tgid, (char *)tmp); + (_FMT_)current->tgid, (char *)tmp); %} @@ -72,9 +72,7 @@ probe addevent.process.execve probe _addevent.process.execve = process.exec { - if(filter_by_pid() == 1 ) { - log_execve_tracedata(HOOKID_PROCESS_EXECVE, $filename) - } + log_execve_tracedata(HOOKID_PROCESS_EXECVE, $filename) } probe addevent.process.fork @@ -86,7 +84,5 @@ probe addevent.process.fork probe _addevent.process.fork = process.create { - if(filter_by_pid() == 1 ) { - log_fork_tracedata(HOOKID_PROCESS_FORK, $return) - } + log_fork_tracedata(HOOKID_PROCESS_FORK, $return) } diff --git a/tapset/LKET/syscalls.stp b/tapset/LKET/syscalls.stp index 4bbea12f..189bc5c4 100755 --- a/tapset/LKET/syscalls.stp +++ b/tapset/LKET/syscalls.stp @@ -24,8 +24,7 @@ probe addevent.syscall.entry probe _addevent.syscall.entry = syscall.* { - if(filter_by_pid() == 1 ) - log_syscall_tracedata(1, name) + log_syscall_tracedata(1, name) } probe addevent.syscall.return @@ -37,9 +36,7 @@ probe addevent.syscall.return probe _addevent.syscall.return = syscall.*.return { - if(filter_by_pid() == 1 ) { - log_syscall_tracedata(2, name) - } + log_syscall_tracedata(2, name) } /* log the system call name */ |