Kernel access to Ftrace instances.
Hi,
Please review the patches that follow -
[PATCH 1/2] tracing: Adding new functions for kernel access to Ftrace instances [PATCH 2/2] tracing: Sample module to demonstrate kernel access to ftrace instances.
This patchset addresses the possibility of deadlock introduced by v4, pointed out by Steven Rostedt.
Tested with lockdep enabled to ensure the issue has been resolved.
Let me know if you have any questions or feedback.
Thanks,
Divya
PATCH 1/2 tracing: Adding new functions for kernel access to Ftrace instances
Adding 2 new functions -
1) struct trace_array *trace_array_get_by_name(const char *name);
Return pointer to a trace array with given name. If it does not exist, create and return pointer to the new trace array.
2) int trace_array_set_clr_event(struct trace_array *tr, const char *system ,const char *event, bool enable);
Enable/Disable events to this trace array.
Additionally,
- To handle reference counters, export trace_array_put()
- Due to introduction of the above 2 new functions, we no longer need to export - ftrace_set_clr_event & trace_array_create APIs.
--- include/linux/trace.h | 3 +- include/linux/trace_events.h | 3 +- kernel/trace/trace.c | 96 +++++++++++++++++++++++++++++++++++--------- kernel/trace/trace.h | 1 - kernel/trace/trace_events.c | 27 ++++++++++++- 5 files changed, 106 insertions(+), 24 deletions(-)
include/linux/trace.h +2 -1
@@ -29,7 +29,8 @@ struct trace_export {void trace_printk_init_buffers (void );int trace_array_printk (struct trace_array *tr,unsigned long ip,const char *fmt, ...); -struct trace_array *trace_array_create (const char *name); +void trace_array_put (struct trace_array *tr); +struct trace_array *trace_array_get_by_name (const char *name);int trace_array_destroy (struct trace_array *tr);#endif /* CONFIG_TRACING */
include/linux/trace_events.h +2 -1
@@ -540,7 +540,8 @@ extern int trace_define_field(struct trace_event_call *call, const char *type,#define is_signed_type (type) (((type)(-1)) < (type)1)int trace_set_clr_event (const char *system,const char *event,int set); - +int trace_array_set_clr_event (struct trace_array *tr,const char *system, +const char *event,bool enable);/* * The double __builtin_constant_p is because gcc will give us an error * if we try to allocate the static variable to fmt if it is not a
kernel/trace/trace.c +76 -20
144 lines not on this page · raw message
kernel/trace/trace.h +0 -1
@@ -338,7 +338,6 @@ enum {extern struct mutex trace_types_lock;extern int trace_array_get (struct trace_array *tr); -extern void trace_array_put (struct trace_array *tr);extern int tracing_set_time_stamp_abs (struct trace_array *tr,bool abs);extern int tracing_set_clock (struct trace_array *tr,const char *clockstr);
kernel/trace/trace_events.c +26 -1
@@ -834,7 +834,6 @@ static int ftrace_set_clr_event(struct trace_array *tr, char *buf, int set)return ret; } -EXPORT_SYMBOL_GPL (ftrace_set_clr_event);/** * trace_set_clr_event - enable or disable an event
@@ -859,6 +858,32 @@ int trace_set_clr_event(const char *system, const char *event, int set) }EXPORT_SYMBOL_GPL (trace_set_clr_event); +/** +* trace_array_set_clr_event - enable or disable an event for a trace array. +* @tr: concerned trace array. +* @system: system name to match (NULL for any system) +* @event: event name to match (NULL for all events, within system) +* @enable: true to enable, false to disable +* +* This is a way for other parts of the kernel to enable or disable +* event recording. +* +* Returns 0 on success, -EINVAL if the parameters do not match any +* registered events. +*/ +int trace_array_set_clr_event (struct trace_array *tr,const char *system, +const char *event,bool enable) +{ +int set; + +if (!tr) +return -ENOENT ; + + set = (enable == true) ?1 :0 ; +return __ftrace_set_clr_event (tr,NULL , system, event, set); +} +EXPORT_SYMBOL_GPL (trace_array_set_clr_event); +/* 128 should be much more than enough */ #define EVENT_BUF_SIZE 127
Signature · 1 line
1.8.3.1
PATCH 2/2 tracing: Sample module to demonstrate kernel access to Ftrace instances.
This is a sample module to demonstrate the use of the newly introduced and exported APIs to access Ftrace instances from within the kernel.
Newly introduced APIs used here -
1. Create/Lookup a trace array with the given name. struct trace_array *trace_array_get_by_name(const char *name)
2. Destroy/Remove a trace array.
int trace_array_destroy(struct trace_array *tr)
4. Enable/Disable trace events:
int trace_array_set_clr_event(struct trace_array *tr, const char *system,
const char *event, bool enable);
Exported APIs -
1. trace_printk equivalent for instances.
int trace_array_printk(struct trace_array *tr,
unsigned long ip, const char *fmt, ...);
2. Helper function.
void trace_printk_init_buffers(void);
3. To decrement the reference counter.
void trace_array_put(struct trace_array *tr)
Sample output(contents of /sys/kernel/tracing/instances/sample-instance)
NOTE: Tracing disabled after ~5 sec)
_-----=> irqs-off
/ _----=> need-resched
| / _---=> hardirq/softirq
|| / _--=> preempt-depth
||| / delay
TASK-PID CPU# |||| TIMESTAMP FUNCTION
| | | |||| | |
sample-instance-1452 [002] .... 49.430948: simple_thread: trace_array_printk: count=0
sample-instance-1452 [002] .... 49.430951: sample_event: count value=0 at jiffies=4294716608
sample-instance-1452 [002] .... 50.454847: simple_thread: trace_array_printk: count=1
sample-instance-1452 [002] .... 50.454849: sample_event: count value=1 at jiffies=4294717632
sample-instance-1452 [002] .... 51.478748: simple_thread: trace_array_printk: count=2
sample-instance-1452 [002] .... 51.478750: sample_event: count value=2 at jiffies=4294718656
sample-instance-1452 [002] .... 52.502652: simple_thread: trace_array_printk: count=3
sample-instance-1452 [002] .... 52.502655: sample_event: count value=3 at jiffies=4294719680
sample-instance-1452 [002] .... 53.526533: simple_thread: trace_array_printk: count=4
sample-instance-1452 [002] .... 53.526535: sample_event: count value=4 at jiffies=4294720704
sample-instance-1452 [002] .... 54.550438: simple_thread: trace_array_printk: count=5
sample-instance-1452 [002] .... 55.574336: simple_thread: trace_array_printk: count=6--- samples/Kconfig | 7 ++ samples/Makefile | 1 + samples/ftrace_instance/Makefile | 6 ++ samples/ftrace_instance/sample-trace-array.c | 131 +++++++++++++++++++++++++++ samples/ftrace_instance/sample-trace-array.h | 84 +++++++++++++++++ 5 files changed, 229 insertions(+) create mode 100644 samples/ftrace_instance/Makefile create mode 100644 samples/ftrace_instance/sample-trace-array.c create mode 100644 samples/ftrace_instance/sample-trace-array.h
samples/Kconfig +7 -0
@@ -20,6 +20,13 @@ config SAMPLE_TRACE_PRINTK This builds a module that calls trace_printk() and can be used to test various trace_printk() calls from a module. +config SAMPLE_TRACE_ARRAY + tristate "Build sample module for kernel access to Ftrace instancess" + depends on EVENT_TRACING && m + help + This builds a module that demonstrates the use of various APIs to + access Ftrace instances from within the kernel. + config SAMPLE_KOBJECT tristate "Build kobject examples" help
samples/Makefile +1 -0
@@ -17,6 +17,7 @@ obj-$(CONFIG_SAMPLE_RPMSG_CLIENT) += rpmsg/ subdir-$(CONFIG_SAMPLE_SECCOMP) += seccomp obj-$(CONFIG_SAMPLE_TRACE_EVENTS) += trace_events/ obj-$(CONFIG_SAMPLE_TRACE_PRINTK) += trace_printk/ +obj-$(CONFIG_SAMPLE_TRACE_ARRAY) += ftrace_instance/ obj-$(CONFIG_VIDEO_PCI_SKELETON) += v4l/ obj-y += vfio-mdev/ subdir-$(CONFIG_SAMPLE_VFS) += vfs
samples/ftrace_instance/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +# Builds a module that calls various routines to access Ftrace instances. +# To use(as root): insmod sample-trace-array.ko + +CFLAGS_sample-trace-array.o := -I$(src) + +obj-$(CONFIG_SAMPLE_TRACE_ARRAY) += sample-trace-array.o
samples/ftrace_instance/sample-trace-array.c new file +131 -0
131 lines not on this page · raw message
samples/ftrace_instance/sample-trace-array.h new file +84 -0
84 lines not on this page · raw message
Signature · 1 line
1.8.3.1