Tracepoints
Subsystems (6)
cover Tracepoints
Hi,
Here is the new tracepoint infrastructure, heavily inspired from the Markers. It applies on 2.6.26-rc8. I also post my fs/ LTTng instrumentation as an example of the resulting code using tracepoints. Please feel free to comment.
- Tracepoints allow more complete type checking (at compile-time) than markers.
- They allow to connect probes involving in-kernel tracers which must be aware of complex types such as "struct task_struct *" (not just a void *).
- They are not meant as a replacement for markers, since they do not allow one-liner printk-style addition of tracing statements for debugging purpose.
- They require a declaration in a header file, which creates a nice stable API.
Thanks,
Mathieu
Signature · 3 lines
Mathieu Desnoyers Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
RFC PATCH 1/3 Kernel Tracepoints
Implementation of kernel tracepoints. Inspired from the Linux Kernel Markers.
Allows complete typing verification. No format string required.
TODO : Documentation/tracepoint.txt
Changelog :
- Use #name ":" #proto as string to identify the tracepoint in the tracepoint table. This will make sure not type mismatch happens due to connexion of a probe with the wrong type to a tracepoint declared with the same name in a different header.
--- include/asm-generic/vmlinux.lds.h | 6 include/linux/module.h | 17 + include/linux/tracepoint.h | 139 ++++++++++ init/Kconfig | 16 + kernel/Makefile | 1 kernel/module.c | 66 ++++- kernel/tracepoint.c | 498 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 741 insertions(+), 2 deletions(-)
init/Kconfig +16 -0
@@ -782,12 +782,28 @@ config PROFILING Say Y here to enable the extended profiling support mechanisms used by profilers such as OProfile. +config TRACEPOINTS + bool "Activate tracepoints" + default y + help + Place an empty function call at each tracepoint site. Can be + dynamically changed for a probe function. + config MARKERS bool "Activate markers" help Place an empty function call at each marker site. Can be dynamically changed for a probe function. +config TRACEPROBES + tristate "Compile generic tracing probes" + depends on MARKERS + default y + help + Compile generic tracing probes, which connect to the tracepoints when + loaded and format the information collected by the tracepoints with + the Markers. + source "arch/Kconfig" config PROC_PAGE_MONITOR
kernel/Makefile +1 -0
@@ -68,6 +68,7 @@ obj-$(CONFIG_SYSCTL) += utsname_sysctl.o obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o obj-$(CONFIG_MARKERS) += marker.o +obj-$(CONFIG_TRACEPOINTS) += tracepoint.o obj-$(CONFIG_LATENCYTOP) += latencytop.o ifneq ($(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER),y)
include/linux/tracepoint.h new file +139 -0
139 lines not on this page · raw message
include/asm-generic/vmlinux.lds.h +5 -1
@@ -52,7 +52,10 @@ . = ALIGN(8); \ VMLINUX_SYMBOL(__start___markers) = .; \ *(__markers ) \ - VMLINUX_SYMBOL(__stop___markers) = .; + VMLINUX_SYMBOL(__stop___markers) = .; \ + VMLINUX_SYMBOL(__start___tracepoints) = .; \ + *(__tracepoints ) \ + VMLINUX_SYMBOL(__stop___tracepoints) = .;#define RO_DATA (align) \ . = ALIGN((align)); \
@@ -61,6 +64,7 @@ *(.rodata) *(.rodata.*) \ *(__vermagic)/* Kernel version magic */ \ *(__markers_strings)/* Markers: strings */ \ + *(__tracepoints_strings)/* Tracepoints: strings */ \ } \ \ .rodata1 : AT(ADDR(.rodata1) - LOAD_OFFSET) { \
kernel/tracepoint.c new file +498 -0
498 lines not on this page · raw message
kernel/module.c +65 -1
103 lines not on this page · raw message
include/linux/module.h +17 -0
@@ -16,6 +16,7 @@#include <linux/kobject.h> #include <linux/moduleparam.h> #include <linux/marker.h> +#include <linux/tracepoint.h> #include <asm/local.h> #include <asm/module.h>
@@ -342,6 +343,10 @@ struct modulestruct marker *markers;unsigned int num_markers;#endif +#ifdef CONFIG_TRACEPOINTS +struct tracepoint *tracepoints; +unsigned int num_tracepoints; +#endif };#ifndef MODULE_ARCH_INIT #define MODULE_ARCH_INIT {}
@@ -450,6 +455,9 @@ extern void print_modules(void);extern void module_update_markers (void ); +extern void module_update_tracepoints (void ); +extern int module_get_iter_tracepoints (struct tracepoint_iter *iter); +#else /* !CONFIG_MODULES... */ #define EXPORT_SYMBOL (sym)#define EXPORT_SYMBOL_GPL (sym)
@@ -554,6 +562,15 @@ static inline void module_update_markers { } +static inline void module_update_tracepoints (void ) +{ +} + +static inline int module_get_iter_tracepoints (struct tracepoint_iter *iter) +{ +return 0 ; +} +#endif /* CONFIG_MODULES */ struct device_driver ;
Signature · 3 lines
Mathieu Desnoyers Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
Re: [RFC patch 1/3] Kernel Tracepoints
Hi Mathieu,
I couldn't apply this patch against 2.6.26-rc8, and have some trivial comments.
Quoted 51 lines · Mathieu Desnoyers
Implementation of kernel tracepoints. Inspired from the Linux Kernel Markers.
Allows complete typing verification. No format string required.
TODO :
Documentation/tracepoint.txtChangelog :
- Use #name ":" #proto as string to identify the tracepoint in the tracepoint table. This will make sure not type mismatch happens due to connexion of a probe with the wrong type to a tracepoint declared with the same name in a different header.Signed-off-by Mathieu Desnoyers <[email protected]>CC 'Peter Zijlstra' <[email protected]>CC "Frank Ch. Eigler" <[email protected]>CC 'Ingo Molnar' <[email protected]>CC 'Hideo AOKI' <[email protected]>CC Takashi Nishiie <[email protected]>CC 'Steven Rostedt' <[email protected]>CC Alexander Viro <[email protected]>--- include/asm-generic/vmlinux.lds.h | 6 include/linux/module.h | 17 + include/linux/tracepoint.h | 139 ++++++++++ init/Kconfig | 16 + kernel/Makefile | 1 kernel/module.c | 66 ++++- kernel/tracepoint.c | 498 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 741 insertions(+), 2 deletions(-)Index: linux-2.6-lttng/init/Kconfig
===================================================================init/Kconfig +7
-0@@ -782,12 +782,28 @@ config PROFILING Say Y here to enable the extended profiling support mechanisms used by profilers such as OProfile. +config TRACEPOINTS + bool "Activate tracepoints" + default y + help + Place an empty function call at each tracepoint site. Can be + dynamically changed for a probe function. + config MARKERS bool "Activate markers" help Place an empty function call at each marker site. Can be dynamically changed for a probe function.
init/Kconfig config PROFILING · line 807
Quoted 10 lines
init/Kconfig +9
-0+config TRACEPROBES + tristate "Compile generic tracing probes" + depends on MARKERS + default y + help + Compile generic tracing probes, which connect to the tracepoints when + loaded and format the information collected by the tracepoints with + the Markers. + source "arch/Kconfig"
might this part better go to PATCH 3/3?
[...]
init/Kconfig config PROFILING
Quoted 10 lines
init/Kconfig +10
-0+ + +#define TPPROTO(args...) args +#define TPARGS(args...) args + +#ifdef CONFIG_TRACEPOINTS + +/* + * Note : the empty asm volatile with read constraint is used here instead of a + * "used" attribute to fix a gcc 4.1.x bug.
There seems no empty asm...
Quoted 36 lines
+ * Make sure the alignment of the structure in the
__tracepointssection will
+ * not add unwanted padding between the beginning of the section and the
+ * structure. Force alignment to the same alignment as the section start.
+ */init/Kconfig +32
-0+#define DEFINE_TRACE(name, proto, args) \ + static inline void _do_trace_##name(struct tracepoint *tp, proto) \ + { \ + int i; \ + struct tracepoint_probe_closure *multi; \ + preempt_disable(); \ + multi = tp->multi; \ + smp_read_barrier_depends(); \ + if (multi) { \ + for (i = 0; multi[i].func; i++) { \ + ((void(*)(void *private_data, proto)) \ + (multi[i].func))(multi[i].probe_private, args);\ + } \ + } \ + preempt_enable(); \ + } \ + static inline void trace_##name(proto) \ + { \ + static const char __tpstrtab_##name[] \ + __attribute__((section("__tracepoints_strings"))) \ + = #name ":" #proto; \ + static struct tracepoint __tracepoint_##name \ + __attribute__((section("__tracepoints"), aligned(8))) = \ + { __tpstrtab_##name, 0, NULL }; \ + if (unlikely(__tracepoint_##name.state)) \ + _do_trace_##name(&__tracepoint_##name, args); \ + } \ + static inline int register_trace_##name( \ + void (*probe)(void *private_data, proto), \ + void *private_data) \ + { \ + return tracepoint_probe_register(#name ":" #proto, \
init/Kconfig
Quoted 10 lines
init/Kconfig +10
-0+ (void *)probe, private_data); \ + } \ + static inline void unregister_trace_##name( \ + void (*probe)(void *private_data, proto), \ + void *private_data) \ + { \ + tracepoint_probe_unregister(#name ":" #proto, \ + (void *)probe, private_data); \ + } +
As we are discussing on another thread, this macro can't handle non-argument tracepoint.
[...]
kernel/tracepoint.c line 2
Quoted 7 lines
Index:
linux-2.6-lttng/kernel/tracepoint.c
===================================================================kernel/tracepoint.c new file +2
-0@@ -0,0 +1,498 @@ +/* +* Copyright (C) 2007 Mathieu Desnoyers
trivial: it should be 2008? :-)
[...]
Quoted 45 lines
Index:
linux-2.6-lttng/kernel/module.c
===================================================================kernel/module.c +12
-0@@ -46,6 +46,7 @@#include <asm/cacheflush.h> #include <linux/license.h> #include <asm/sections.h> +#include <linux/tracepoint.h> #if 0 #define DEBUGP printk@@ -1770,6 +1771,8 @@ static struct module *load_module(void _unsigned int unusedgplcrcindex;unsigned int markersindex;unsigned int markersstringsindex; +unsigned int tracepointsindex; +unsigned int tracepointsstringsindex;struct module *mod;long err =0 ;void *percpu =NULL , *ptr =NULL ;/* Stops spurious gcc warning */ @@ -2049,6 +2052,9 @@ static struct module *load_module(void _ markersindex =find_sec (hdr, sechdrs, secstrings,"__markers" ); markersstringsindex =find_sec (hdr, sechdrs, secstrings,"__markers_strings" ); + tracepointsindex =find_sec (hdr, sechdrs, secstrings,"__tracepoints" ); + tracepointsstringsindex =find_sec (hdr, sechdrs, secstrings, +"__tracepoints_strings" );/* Now do relocations. */ for (i =1 ; i < hdr->e_shnum; i++) {@@ -2076,6 +2082,12 @@ static struct module *load_module(void _ mod->num_markers = sechdrs[markersindex].sh_size /sizeof (*mod->markers);#endif +#ifdef CONFIG_TRACEPOINTS + mod->tracepoints = (void *)sechdrs[tracepointsindex].sh_addr; + mod->num_tracepoints = + sechdrs[tracepointsindex].sh_size /sizeof (*mod->tracepoints); +#endif +/* Find duplicate symbols */ err =verify_export_symbols (mod);
kernel/module.c static struct module *load_module(void _ · line 2112
Quoted 8 lines
kernel/module.c +1
-1@@ -2094,11 +2106,16 @@ static struct module *load_module(void _add_kallsyms (mod, sechdrs, symindex, strindex, secstrings); +if (!(mod->taints &TAINT_FORCED_MODULE )) {#ifdef CONFIG_MARKERS -if (!(mod->taints &TAINT_FORCED_MODULE ))marker_update_probe_range (mod->markers, mod->markers + mod->num_markers);
Here, this hunk was rejected, because "Markers Support for Proprierary Modules" patch doesn't merged yet.
kernel/module.c static struct module *load_module(void _ · line 2121
Quoted 9 lines
kernel/module.c +5
-0#endif +#ifdef CONFIG_TRACEPOINTS +tracepoint_update_probe_range (mod->tracepoints, + mod->tracepoints + mod->num_tracepoints); +#endif + } err =module_finalize (hdr, sechdrs, mod);if (err <0 ) goto cleanup;
Thank you,
Signature · 7 lines
Masami Hiramatsu Software Engineer Hitachi Computer Products (America) Inc. Software Solutions Division e-mail: [email protected]
Re: [RFC patch 1/3] Kernel Tracepoints
Quoted 57 lines · * Masami Hiramatsu ([email protected]) wrote:
Hi Mathieu,
I couldn't apply this patch against 2.6.26-rc8, and have some trivial comments.
Quoted 51 lines · Mathieu Desnoyers
Implementation of kernel tracepoints. Inspired from the Linux Kernel Markers.
Allows complete typing verification. No format string required.
TODO :
Documentation/tracepoint.txtChangelog :
- Use #name ":" #proto as string to identify the tracepoint in the tracepoint table. This will make sure not type mismatch happens due to connexion of a probe with the wrong type to a tracepoint declared with the same name in a different header.Signed-off-by Mathieu Desnoyers <[email protected]>CC 'Peter Zijlstra' <[email protected]>CC "Frank Ch. Eigler" <[email protected]>CC 'Ingo Molnar' <[email protected]>CC 'Hideo AOKI' <[email protected]>CC Takashi Nishiie <[email protected]>CC 'Steven Rostedt' <[email protected]>CC Alexander Viro <[email protected]>--- include/asm-generic/vmlinux.lds.h | 6 include/linux/module.h | 17 + include/linux/tracepoint.h | 139 ++++++++++ init/Kconfig | 16 + kernel/Makefile | 1 kernel/module.c | 66 ++++- kernel/tracepoint.c | 498 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 741 insertions(+), 2 deletions(-)Index: linux-2.6-lttng/init/Kconfig
===================================================================init/Kconfig +7
-0@@ -782,12 +782,28 @@ config PROFILING Say Y here to enable the extended profiling support mechanisms used by profilers such as OProfile. +config TRACEPOINTS + bool "Activate tracepoints" + default y + help + Place an empty function call at each tracepoint site. Can be + dynamically changed for a probe function. + config MARKERS bool "Activate markers" help Place an empty function call at each marker site. Can be dynamically changed for a probe function.
Quoted 13 lines
init/Kconfig config PROFILING · line 807
Quoted 10 lines
init/Kconfig +9
-0+config TRACEPROBES + tristate "Compile generic tracing probes" + depends on MARKERS + default y + help + Compile generic tracing probes, which connect to the tracepoints when + loaded and format the information collected by the tracepoints with + the Markers. + source "arch/Kconfig"might this part better go to PATCH 3/3?
Will fix.
Quoted 14 lines
[...]
init/Kconfig
Quoted 10 lines
init/Kconfig +10
-0+ + +#define TPPROTO(args...) args +#define TPARGS(args...) args + +#ifdef CONFIG_TRACEPOINTS + +/* + * Note : the empty asm volatile with read constraint is used here instead of a + * "used" attribute to fix a gcc 4.1.x bug.There seems no empty asm...
True, should be removed from markers too.
Quoted 41 lines
Quoted 41 lines
+ * Make sure the alignment of the structure in the
__tracepointssection will
+ * not add unwanted padding between the beginning of the section and the
+ * structure. Force alignment to the same alignment as the section start.
+ */init/Kconfig +37
-0+#define DEFINE_TRACE(name, proto, args) \ + static inline void _do_trace_##name(struct tracepoint *tp, proto) \ + { \ + int i; \ + struct tracepoint_probe_closure *multi; \ + preempt_disable(); \ + multi = tp->multi; \ + smp_read_barrier_depends(); \ + if (multi) { \ + for (i = 0; multi[i].func; i++) { \ + ((void(*)(void *private_data, proto)) \ + (multi[i].func))(multi[i].probe_private, args);\ + } \ + } \ + preempt_enable(); \ + } \ + static inline void trace_##name(proto) \ + { \ + static const char __tpstrtab_##name[] \ + __attribute__((section("__tracepoints_strings"))) \ + = #name ":" #proto; \ + static struct tracepoint __tracepoint_##name \ + __attribute__((section("__tracepoints"), aligned(8))) = \ + { __tpstrtab_##name, 0, NULL }; \ + if (unlikely(__tracepoint_##name.state)) \ + _do_trace_##name(&__tracepoint_##name, args); \ + } \ + static inline int register_trace_##name( \ + void (*probe)(void *private_data, proto), \ + void *private_data) \ + { \ + return tracepoint_probe_register(#name ":" #proto, \ + (void *)probe, private_data); \ + } \ + static inline void unregister_trace_##name( \ + void (*probe)(void *private_data, proto), \ + void *private_data) \
Quoted 9 lines
init/Kconfig
Quoted 5 lines
init/Kconfig +5
-0+ { \ + tracepoint_probe_unregister(#name ":" #proto, \ + (void *)probe, private_data); \ + } +As we are discussing on another thread, this macro can't handle non-argument tracepoint.
Will fix.
Quoted 11 lines
[...]
kernel/tracepoint.c line 2
Quoted 7 lines
Index:
linux-2.6-lttng/kernel/tracepoint.c
===================================================================kernel/tracepoint.c new file +2
-0@@ -0,0 +1,498 @@ +/* +* Copyright (C) 2007 Mathieu Desnoyers trivial: it should be 2008? :-)
I always have difficulty remembering the day of the week. Now years... :)
Quoted 49 lines
[...]
Quoted 48 lines
Index:
linux-2.6-lttng/kernel/module.c
===================================================================kernel/module.c +12
-0@@ -46,6 +46,7 @@#include <asm/cacheflush.h> #include <linux/license.h> #include <asm/sections.h> +#include <linux/tracepoint.h> #if 0 #define DEBUGP printk@@ -1770,6 +1771,8 @@ static struct module *load_module(void _unsigned int unusedgplcrcindex;unsigned int markersindex;unsigned int markersstringsindex; +unsigned int tracepointsindex; +unsigned int tracepointsstringsindex;struct module *mod;long err =0 ;void *percpu =NULL , *ptr =NULL ;/* Stops spurious gcc warning */ @@ -2049,6 +2052,9 @@ static struct module *load_module(void _ markersindex =find_sec (hdr, sechdrs, secstrings,"__markers" ); markersstringsindex =find_sec (hdr, sechdrs, secstrings,"__markers_strings" ); + tracepointsindex =find_sec (hdr, sechdrs, secstrings,"__tracepoints" ); + tracepointsstringsindex =find_sec (hdr, sechdrs, secstrings, +"__tracepoints_strings" );/* Now do relocations. */ for (i =1 ; i < hdr->e_shnum; i++) {@@ -2076,6 +2082,12 @@ static struct module *load_module(void _ mod->num_markers = sechdrs[markersindex].sh_size /sizeof (*mod->markers);#endif +#ifdef CONFIG_TRACEPOINTS + mod->tracepoints = (void *)sechdrs[tracepointsindex].sh_addr; + mod->num_tracepoints = + sechdrs[tracepointsindex].sh_size /sizeof (*mod->tracepoints); +#endif +/* Find duplicate symbols */ err =verify_export_symbols (mod);@@ -2094,11 +2106,16 @@ static struct module *load_module(void _add_kallsyms (mod, sechdrs, symindex, strindex, secstrings);
Quoted 9 lines
kernel/module.c static struct module *load_module(void _ · line 2112
Quoted 5 lines
kernel/module.c +1
-1+if (!(mod->taints &TAINT_FORCED_MODULE )) {#ifdef CONFIG_MARKERS -if (!(mod->taints &TAINT_FORCED_MODULE ))marker_update_probe_range (mod->markers, mod->markers + mod->num_markers);Here, this hunk was rejected, because "Markers Support for Proprierary Modules" patch doesn't merged yet.
Ok, I'll change the patch order.
Quoted 12 lines
kernel/module.c static struct module *load_module(void _ · line 2121
Quoted 9 lines
kernel/module.c +5
-0#endif +#ifdef CONFIG_TRACEPOINTS +tracepoint_update_probe_range (mod->tracepoints, + mod->tracepoints + mod->num_tracepoints); +#endif + } err =module_finalize (hdr, sechdrs, mod);if (err <0 ) goto cleanup;Thank you,
Thanks for the review,
Mathieu
Quoted 9 lines
Signature · 7 lines
Masami Hiramatsu Software Engineer Hitachi Computer Products (America) Inc. Software Solutions Division e-mail: [email protected]
Signature · 2 lines
Mathieu Desnoyers OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
RFC PATCH 2/3 LTTng tracepoint instrumentation fs
In reply to Mathieu DesnoyersCore filesystem tracepoints.
Tracepoints added :
fs_buffer_wait_endfs_buffer_wait_startfs_closefs_execfs_ioctlfs_llseekfs_lseekfs_openfs_pollfs_pread64fs_pwrite64fs_readfs_readvfs_selectfs_writefs_writev
--- fs/buffer.c | 3 +++ fs/compat.c | 2 ++ fs/exec.c | 2 ++ fs/fs-trace.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/ioctl.c | 3 +++ fs/open.c | 3 +++ fs/read_write.c | 19 +++++++++++++++++-- fs/select.c | 3 +++ 8 files changed, 87 insertions(+), 2 deletions(-)
fs/buffer.c +3 -0
@@ -41,6 +41,7 @@#include <linux/bitops.h> #include <linux/mpage.h> #include <linux/bit_spinlock.h> +#include "fs-trace.h" static int fsync_buffers_list (spinlock_t *lock,struct list_head *list);
@@ -89,7 +90,9 @@ void unlock_buffer(struct buffer_head *b*/ void __wait_on_buffer (struct buffer_head * bh) { +trace_fs_buffer_wait_start (bh);wait_on_bit (&bh->b_state, BH_Lock, sync_buffer,TASK_UNINTERRUPTIBLE ); +trace_fs_buffer_wait_end (bh); } static void
fs/compat.c +2 -0
@@ -51,6 +51,7 @@#include <linux/poll.h> #include <linux/mm.h> #include <linux/eventpoll.h> +#include "fs-trace.h" #include <asm/uaccess.h> #include <asm/mmu_context.h>
@@ -1402,6 +1403,7 @@ int compat_do_execve(char * filename, retval =search_binary_handler (bprm, regs);if (retval >=0 ) { +trace_fs_exec (filename);/* execve success */ security_bprm_free (bprm);acct_update_integrals (current);
fs/ioctl.c +3 -0
@@ -13,6 +13,7 @@#include <linux/security.h> #include <linux/module.h> #include <linux/uaccess.h> +#include "fs-trace.h" #include <asm/ioctls.h>
@@ -201,6 +202,8 @@ asmlinkage long sys_ioctl(unsigned int fif (!filp) goto out; +trace_fs_ioctl (fd, cmd, arg); + error =security_file_ioctl (filp, cmd, arg);if (error) goto out_fput;
fs/open.c +3 -0
@@ -28,6 +28,7 @@#include <linux/rcupdate.h> #include <linux/audit.h> #include <linux/falloc.h> +#include "fs-trace.h" int vfs_statfs (struct dentry *dentry,struct kstatfs *buf) {
@@ -1090,6 +1091,7 @@ long do_sys_open(int dfd, const char __ufsnotify_open (f->f_path.dentry);fd_install (fd, f); } +trace_fs_open (fd, tmp); }putname (tmp); }
@@ -1179,6 +1181,7 @@ asmlinkage long sys_close(unsigned int f filp = fdt->fd[fd];if (!filp) goto out_unlock; +trace_fs_close (fd);rcu_assign_pointer (fdt->fd[fd],NULL );FD_CLR (fd, fdt->close_on_exec);__put_unused_fd (files, fd);
fs/read_write.c +17 -2
@@ -16,6 +16,7 @@#include <linux/syscalls.h> #include <linux/pagemap.h> #include <linux/splice.h> +#include "fs-trace.h" #include "read_write.h" #include <asm/uaccess.h>
@@ -146,6 +147,9 @@ asmlinkage off_t sys_lseek(unsigned intif (res != (loff_t )retval) retval = -EOVERFLOW ;/* LFS: should only happen on 32 bit platforms */ } + +trace_fs_lseek (fd, offset, origin); +fput_light (file, fput_needed); bad:return retval;
@@ -173,6 +177,8 @@ asmlinkage long sys_llseek(unsigned int offset =vfs_llseek (file, ((loff_t ) offset_high <<32 ) | offset_low, origin); +trace_fs_llseek (fd, offset, origin); + retval = (int )offset;if (offset >=0 ) { retval = -EFAULT ;
@@ -359,6 +365,7 @@ asmlinkage ssize_t sys_read(unsigned int file =fget_light (fd, &fput_needed);if (file) {loff_t pos =file_pos_read (file); +trace_fs_read (fd, count); ret =vfs_read (file, buf, count, &pos);file_pos_write (file, pos);fput_light (file, fput_needed);
@@ -376,6 +383,7 @@ asmlinkage ssize_t sys_write(unsigned in file =fget_light (fd, &fput_needed);if (file) {loff_t pos =file_pos_read (file); +trace_fs_write (fd, count); ret =vfs_write (file, buf, count, &pos);file_pos_write (file, pos);fput_light (file, fput_needed);
@@ -397,8 +405,11 @@ asmlinkage ssize_t sys_pread64(unsigned file =fget_light (fd, &fput_needed);if (file) { ret = -ESPIPE ; -if (file->f_mode &FMODE_PREAD ) +if (file->f_mode &FMODE_PREAD ) { +trace_fs_pread64 (fd, count, pos); ret =vfs_read (file, buf, count, &pos); + } +fput_light (file, fput_needed); }
@@ -418,8 +429,10 @@ asmlinkage ssize_t sys_pwrite64(unsigned file =fget_light (fd, &fput_needed);if (file) { ret = -ESPIPE ; -if (file->f_mode &FMODE_PWRITE ) +if (file->f_mode &FMODE_PWRITE ) { +trace_fs_pwrite64 (fd, count, pos); ret =vfs_write (file, buf, count, &pos); + }fput_light (file, fput_needed); }
@@ -663,6 +676,7 @@ sys_readv(unsigned long fd, const struct file =fget_light (fd, &fput_needed);if (file) {loff_t pos =file_pos_read (file); +trace_fs_readv (fd, vlen); ret =vfs_readv (file, vec, vlen, &pos);file_pos_write (file, pos);fput_light (file, fput_needed);
@@ -684,6 +698,7 @@ sys_writev(unsigned long fd, const struc file =fget_light (fd, &fput_needed);if (file) {loff_t pos =file_pos_read (file); +trace_fs_writev (fd, vlen); ret =vfs_writev (file, vec, vlen, &pos);file_pos_write (file, pos);fput_light (file, fput_needed);
fs/select.c +3 -0
@@ -24,6 +24,7 @@#include <linux/fdtable.h> #include <linux/fs.h> #include <linux/rcupdate.h> +#include "fs-trace.h" #include <asm/uaccess.h>
@@ -232,6 +233,7 @@ int do_select(int n, fd_set_bits *fds, s file =fget_light (i, &fput_needed);if (file) { f_op = file->f_op; +trace_fs_select (i, *timeout); mask =DEFAULT_POLLMASK ;if (f_op && f_op->poll) mask = (*f_op->poll)(file, retval ?NULL : wait);
@@ -560,6 +562,7 @@ static inline unsigned int do_pollfd(str file =fget_light (fd, &fput_needed); mask =POLLNVAL ;if (file !=NULL ) { +trace_fs_poll (fd); mask =DEFAULT_POLLMASK ;if (file->f_op && file->f_op->poll) mask = file->f_op->poll (file, pwait);
fs/exec.c +2 -0
@@ -51,6 +51,7 @@#include <linux/tsacct_kern.h> #include <linux/cn_proc.h> #include <linux/audit.h> +#include "fs-trace.h" #include <asm/uaccess.h> #include <asm/mmu_context.h>
@@ -1330,6 +1331,7 @@ int do_execve(char * filename, retval =search_binary_handler (bprm,regs);if (retval >=0 ) { +trace_fs_exec (filename);/* execve success */ security_bprm_free (bprm);acct_update_integrals (current);
fs/fs-trace.h new file +54 -0
54 lines not on this page · raw message
Signature · 3 lines
Mathieu Desnoyers Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
RFC PATCH 3/3 LTTng instrumentation FS tracepoint probes
In reply to Mathieu DesnoyersCreate a module which declares FS tracepoint probes, using markers.
--- fs/Makefile | 1 fs/fs-trace.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+)
fs/fs-trace.c new file +172 -0
@@ -0,0 +1,172 @@ +/* +* fs/fs-trace.c +* +* FS tracepoint probes. +*/ + +#include <linux/module.h> +#include <linux/buffer_head.h> +#include "fs-trace.h" + +static void probe_fs_buffer_wait_start (void *private_data, +struct buffer_head *bh) +{ +trace_mark (fs_buffer_wait_start,"bh %p" , bh); +} + +static void probe_fs_buffer_wait_end (void *private_data, +struct buffer_head *bh) +{ +trace_mark (fs_buffer_wait_end,"bh %p" , bh); +} + +static void probe_fs_exec (void *private_data,char *filename) +{ +trace_mark (fs_exec,"filename %s" , filename); +} + +static void probe_fs_ioctl (void *private_data, +unsigned int fd,unsigned int cmd,unsigned long arg) +{ +trace_mark (fs_ioctl,"fd %u cmd %u arg %lu" , fd, cmd, arg); +} + +static void probe_fs_open (void *private_data,unsigned int fd,char *filename) +{ +trace_mark (fs_open,"fd %d filename %s" , fd, filename); +} + +static void probe_fs_close (void *private_data,unsigned int fd) +{ +trace_mark (fs_close,"fd %u" , fd); +} + +static void probe_fs_lseek (void *private_data, +unsigned int fd,unsigned long offset,unsigned int origin) +{ +trace_mark (fs_lseek,"fd %u offset %ld origin %u" , fd, offset, origin); +} + +static void probe_fs_llseek (void *private_data, +unsigned int fd,loff_t offset,unsigned int origin) +{ +trace_mark (fs_llseek,"fd %u offset %llu origin %u" , fd, + (unsigned long long )offset, origin); +} + +static void probe_fs_read (void *private_data,unsigned int fd,size_t count) +{ +trace_mark (fs_read,"fd %u count %zu" , fd, count); +} + +static void probe_fs_write (void *private_datat,unsigned int fd,size_t count) +{ +trace_mark (fs_write,"fd %u count %zu" , fd, count); +} + +static void probe_fs_pread64 (void *private_data, +unsigned int fd,size_t count,loff_t pos) +{ +trace_mark (fs_pread64,"fd %u count %zu pos %llu" , + fd, count, (unsigned long long )pos); +} + +static void probe_fs_pwrite64 (void *private_data, +unsigned int fd,size_t count,loff_t pos) +{ +trace_mark (fs_pwrite64,"fd %u count %zu pos %llu" , + fd, count, (unsigned long long )pos); +} + +static void probe_fs_readv (void *private_data, +unsigned long fd,unsigned long vlen) +{ +trace_mark (fs_readv,"fd %lu vlen %lu" , fd, vlen); +} + +static void probe_fs_writev (void *private_data, +unsigned long fd,unsigned long vlen) +{ +trace_mark (fs_writev,"fd %lu vlen %lu" , fd, vlen); +} + +static void probe_fs_select (void *private_data,int fd,s64 timeout) +{ +trace_mark (fs_select,"fd %d timeout #8d%lld" , fd, (long long )timeout); +} + +static void probe_fs_poll (void *private_data,int fd) +{ +trace_mark (fs_pollfd,"fd %d" , fd); +} + + +int __init fs_trace_init (void ) +{ +int ret; + + ret =register_trace_fs_buffer_wait_start (probe_fs_buffer_wait_start, +NULL ); +WARN_ON (ret); + ret =register_trace_fs_buffer_wait_end (probe_fs_buffer_wait_end, +NULL ); +WARN_ON (ret); + ret =register_trace_fs_exec (probe_fs_exec,NULL ); +WARN_ON (ret); + ret =register_trace_fs_ioctl (probe_fs_ioctl,NULL ); +WARN_ON (ret); + ret =register_trace_fs_open (probe_fs_open,NULL ); +WARN_ON (ret); + ret =register_trace_fs_close (probe_fs_close,NULL ); +WARN_ON (ret); + ret =register_trace_fs_lseek (probe_fs_lseek,NULL ); +WARN_ON (ret); + ret =register_trace_fs_llseek (probe_fs_llseek,NULL ); +WARN_ON (ret); + ret =register_trace_fs_read (probe_fs_read,NULL ); +WARN_ON (ret); + ret =register_trace_fs_write (probe_fs_write,NULL ); +WARN_ON (ret); + ret =register_trace_fs_pread64 (probe_fs_pread64,NULL ); +WARN_ON (ret); + ret =register_trace_fs_pwrite64 (probe_fs_pwrite64,NULL ); +WARN_ON (ret); + ret =register_trace_fs_readv (probe_fs_readv,NULL ); +WARN_ON (ret); + ret =register_trace_fs_writev (probe_fs_writev,NULL ); +WARN_ON (ret); + ret =register_trace_fs_select (probe_fs_select,NULL ); +WARN_ON (ret); + ret =register_trace_fs_poll (probe_fs_poll,NULL ); +WARN_ON (ret); + +return 0 ; +} + +module_init (fs_trace_init); + +void __exit fs_trace_exit(void) +{ +unregister_trace_fs_poll (probe_fs_poll,NULL ); +unregister_trace_fs_select (probe_fs_select,NULL ); +unregister_trace_fs_writev (probe_fs_writev,NULL ); +unregister_trace_fs_readv (probe_fs_readv,NULL ); +unregister_trace_fs_pwrite64 (probe_fs_pwrite64,NULL ); +unregister_trace_fs_pread64 (probe_fs_pread64,NULL ); +unregister_trace_fs_write (probe_fs_write,NULL ); +unregister_trace_fs_read (probe_fs_read,NULL ); +unregister_trace_fs_llseek (probe_fs_llseek,NULL ); +unregister_trace_fs_lseek (probe_fs_lseek,NULL ); +unregister_trace_fs_close (probe_fs_close,NULL ); +unregister_trace_fs_open (probe_fs_open,NULL ); +unregister_trace_fs_ioctl (probe_fs_ioctl,NULL ); +unregister_trace_fs_exec (probe_fs_exec,NULL ); +unregister_trace_fs_buffer_wait_end (probe_fs_buffer_wait_end,NULL ); +unregister_trace_fs_buffer_wait_start (probe_fs_buffer_wait_start,NULL ); +} + +module_exit (fs_trace_exit); + +MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Mathieu Desnoyers" ); +MODULE_DESCRIPTION ("FS Tracepoint Probes" );
fs/Makefile +1 -0
@@ -63,6 +63,7 @@ obj-$(CONFIG_CONFIGFS_FS) += configfs/ obj-y += devpts/ obj-$(CONFIG_PROFILING) += dcookies.o +obj-$(CONFIG_TRACEPROBES) += fs-trace.o obj-$(CONFIG_DLM) += dlm/ # Do not add any filesystems before this line
Signature · 3 lines
Mathieu Desnoyers Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68