tracing: Some last updates for 4.8
Subsystems (6)
Steven Rostedt
maintainerPATCH 3/7 ftrace: Reduce size of function graph entries
In reply to Steven RostedtFrom: Namhyung Kim <[email protected]>
Currently ftrace_graph_ent{,_entry} and ftrace_graph_ret{,_entry} struct can have padding bytes at the end due to alignment in 64-bit data type. As these data are recorded so frequently, those paddings waste non-negligible space. As the ring buffer maintains alignment properly for each architecture, just to remove the extra padding using 'packed' attribute.
ftrace_graph_ent_entry: 24 -> 20
ftrace_graph_ret_entry: 48 -> 44
Also I moved the 'overrun' field in struct ftrace_graph_ret to minimize the padding in the middle.
Tested on x86_64 only.
--- include/linux/ftrace.h | 12 ++++++++---- kernel/trace/trace.h | 11 +++++++++++ kernel/trace/trace_entries.h | 4 ++-- 3 files changed, 21 insertions(+), 6 deletions(-)
include/linux/ftrace.h +8 -4
@@ -754,23 +754,27 @@ static inline void ftrace_init(void) { }/* * Structure that defines an entry function trace. +* It's already packed but the attribute "packed" is needed +* to remove extra padding at the end. */ struct ftrace_graph_ent {unsigned long func;/* Current function */ int depth; -}; +} __packed;/* * Structure that defines a return function trace. +* It's already packed but the attribute "packed" is needed +* to remove extra padding at the end. */ struct ftrace_graph_ret {unsigned long func;/* Current function */ -unsigned long long calltime; -unsigned long long rettime;/* Number of functions that overran the depth limit for current task */ unsigned long overrun; +unsigned long long calltime; +unsigned long long rettime;int depth; -}; +} __packed;/* Type of the callback handlers for tracing function graph*/ typedef void (*trace_func_graph_ret_t )(struct ftrace_graph_ret *);/* return */
kernel/trace/trace.h +11 -0
@@ -80,6 +80,12 @@ enum trace_type {FTRACE_ENTRY (name, struct_name, id,PARAMS (tstruct),PARAMS (print), \ filter) +#undef FTRACE_ENTRY_PACKED +#define FTRACE_ENTRY_PACKED (name, struct_name, id, tstruct, print, \ + filter) \ + FTRACE_ENTRY(name, struct_name, id, PARAMS(tstruct), PARAMS(print), \ + filter) __packed +#include "trace_entries.h" /*
@@ -1625,6 +1631,11 @@ int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);#define FTRACE_ENTRY_DUP (call, struct_name, id, tstruct, print, filter) \ FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print), \ filter) +#undef FTRACE_ENTRY_PACKED +#define FTRACE_ENTRY_PACKED (call, struct_name, id, tstruct, print, filter) \ + FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print), \ + filter) +#include "trace_entries.h" #if defined(CONFIG_PERF_EVENTS ) && defined(CONFIG_FUNCTION_TRACER )
kernel/trace/trace_entries.h +2 -2
@@ -72,7 +72,7 @@ FTRACE_ENTRY_REG(function, ftrace_entry, );/* Function call entry */ -FTRACE_ENTRY(funcgraph_entry, ftrace_graph_ent_entry, +FTRACE_ENTRY_PACKED(funcgraph_entry, ftrace_graph_ent_entry, TRACE_GRAPH_ENT,
@@ -88,7 +88,7 @@ FTRACE_ENTRY(funcgraph_entry, ftrace_graph_ent_entry, );/* Function return entry */ -FTRACE_ENTRY(funcgraph_exit, ftrace_graph_ret_entry, +FTRACE_ENTRY_PACKED(funcgraph_exit, ftrace_graph_ret_entry, TRACE_GRAPH_RET,
Signature · 1 line
2.8.1
Steven Rostedt
maintainercover tracing: Some last updates for 4.8
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: 78aebca2c955c1c5aeb48e12645e13fe3c3461f2
Daniel Bristot de Oliveira (4):
tracing: Use outer () on __get_str() definition tracing, RAS: Cleanup on __get_str() usage
tracing: Use __get_str() when manipulating strings printk, tracing: Avoiding unneeded blank lines
Namhyung Kim (1):
ftrace: Reduce size of function graph entries
Tom Zanussi (1):
tracing: Have HIST_TRIGGERS select TRACING
Wei Yongjun (1):
tracing: Using for_each_set_bit() to simplify trace_pid_write()
----
fs/nfs/nfs4trace.h | 4 ++-- fs/nfs/nfstrace.h | 4 ++-- include/linux/ftrace.h | 12 ++++++++---- include/ras/ras_event.h | 4 ++-- include/trace/events/printk.h | 12 ++++++++++-- include/trace/perf.h | 2 +- include/trace/trace_events.h | 2 +- kernel/trace/Kconfig | 1 + kernel/trace/trace.c | 8 ++------ kernel/trace/trace.h | 11 +++++++++++ kernel/trace/trace_entries.h | 4 ++-- 11 files changed, 42 insertions(+), 22 deletions(-)
Steven Rostedt
maintainerPATCH 6/7 tracing: Use __get_str() when manipulating strings
From: Daniel Bristot de Oliveira <[email protected]>
Use __get_str(str) rather than __get_dynamic_array(str) when deadling with strings.
It is just a code cleanup, no changes on tracepoint ABI.
--- fs/nfs/nfs4trace.h | 4 ++-- fs/nfs/nfstrace.h | 4 ++-- include/trace/events/printk.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
fs/nfs/nfs4trace.h +2 -2
@@ -1235,8 +1235,8 @@ DECLARE_EVENT_CLASS(nfs4_idmap_event, len =0 ; __entry->error = error <0 ? error :0 ; __entry->id = id; -memcpy (__get_dynamic_array (name), name, len); - ((char *)__get_dynamic_array (name))[len] =0 ; +memcpy (__get_str (name), name, len); +__get_str (name)[len] =0 ; ), TP_printk(
fs/nfs/nfstrace.h +2 -2
@@ -707,9 +707,9 @@ TRACE_EVENT(nfs_sillyrename_unlink, __entry->dev = dir->i_sb->s_dev; __entry->dir =NFS_FILEID (dir); __entry->error = error; -memcpy (__get_dynamic_array (name), +memcpy (__get_str (name), data->args.name.name, len); - ((char *)__get_dynamic_array (name))[len] =0 ; +__get_str (name)[len] =0 ; ), TP_printk(
include/trace/events/printk.h +2 -2
@@ -16,8 +16,8 @@ TRACE_EVENT(console, ), TP_fast_assign( - memcpy(__get_dynamic_array(msg), text, len); - ((char *)__get_dynamic_array (msg))[len] =0 ; + memcpy(__get_str(msg), text, len); +__get_str (msg)[len] =0 ; ),TP_printk ("%s" ,__get_str (msg))
Signature · 1 line
2.8.1
Steven Rostedt
maintainerPATCH 1/7 tracing: Using for_each_set_bit() to simplify trace_pid_write()
In reply to Steven RostedtFrom: Wei Yongjun <[email protected]>
Using for_each_set_bit() to simplify the code.
--- kernel/trace/trace.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
kernel/trace/trace.c +2 -6
@@ -517,13 +517,9 @@ int trace_pid_write(struct trace_pid_list *filtered_pids,if (filtered_pids) {/* copy the current bits to the new max */ - pid =find_first_bit (filtered_pids->pids, - filtered_pids->pid_max); -while (pid < filtered_pids->pid_max) { +for_each_set_bit (pid, filtered_pids->pids, + filtered_pids->pid_max) {set_bit (pid, pid_list->pids); - pid =find_next_bit (filtered_pids->pids, - filtered_pids->pid_max, - pid +1 ); nr_pids++; } }
Signature · 1 line
2.8.1
Steven Rostedt
maintainerPATCH 2/7 tracing: Have HIST_TRIGGERS select TRACING
In reply to Steven RostedtFrom: Tom Zanussi <[email protected]>
The kbuild test robot reported a compile error if HIST_TRIGGERS was enabled but nothing else that selected TRACING was configured in.
HIST_TRIGGERS should directly select it and not rely on anything else to do it.
--- kernel/trace/Kconfig | 1 + 1 file changed, 1 insertion(+)
kernel/trace/Kconfig +1 -0
@@ -542,6 +542,7 @@ config HIST_TRIGGERS bool "Histogram triggers" depends on ARCH_HAVE_NMI_SAFE_CMPXCHG select TRACING_MAP + select TRACING default n help Hist triggers allow one or more arbitrary trace event fields
Signature · 1 line
2.8.1
Steven Rostedt
maintainerPATCH 7/7 printk, tracing: Avoiding unneeded blank lines
In reply to Steven RostedtFrom: Daniel Bristot de Oliveira <[email protected]>
Printk messages often finish with '\n' to cause a new line. But as each tracepoint is already printed in a new line, printk messages that finish with '\n' ends up adding a blank line to the trace output. For example:
kworker/0:1-86 [000] d... 46.006949: console: [ 46.006946] usb 1-3: USB disconnect, device number 3
kworker/2:2-374 [002] d... 48.699342: console: [ 48.699339] usb 1-3: new high-speed USB device number 4 using ehci-pci
kworker/2:2-374 [002] d... 49.041450: console: [ 49.041448] usb 1-3: New USB device found, idVendor=5986, idProduct=0To avoid unneeded blank lines, this patch checks if the printk message finishes with '\n', if so, it cut is off the '\n' to avoid blank lines.
In a patched kernel, the same messages are printed without extra blank lines. For example:
kworker/0:4-185 [000] d... 23.641738: console: [ 23.641736] usb 1-3: USB disconnect, device number 3
kworker/0:4-185 [000] d... 24.918703: console: [ 24.918700] usb 1-3: new high-speed USB device number 4 using ehci-pci
kworker/0:4-185 [000] d... 25.228308: console: [ 25.228306] usb 1-3: New USB device found, idVendor=5986, idProduct=02d5--- include/trace/events/printk.h | 8 ++++++++ 1 file changed, 8 insertions(+)
include/trace/events/printk.h +8 -0
@@ -16,6 +16,14 @@ TRACE_EVENT(console, ),TP_fast_assign ( +/* +* Each trace entry is printed in a new line. +* If the msg finishes with '\n', cut it off +* to avoid blank lines in the trace. +*/ + if ((len > 0) && (text[len-1] == '\n')) + len -= 1; +memcpy (__get_str (msg), text, len);__get_str (msg)[len] =0 ; ),
Signature · 1 line
2.8.1
Steven Rostedt
maintainerPATCH 5/7 tracing, RAS: Cleanup on __get_str() usage
In reply to Steven RostedtFrom: Daniel Bristot de Oliveira <[email protected]>
__get_str(msg) does not need (char *) operator overloading to access mgs's elements anymore. This patch substitutes
((char *)__get_str(msg))[0] usage to __get_str(msg)[0].
It is just a code cleanup, no changes on tracepoint ABI.
--- include/ras/ras_event.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/ras/ras_event.h +2 -2
@@ -147,7 +147,7 @@ TRACE_EVENT(mc_event, __entry->error_count,mc_event_error_type (__entry->error_type), __entry->error_count >1 ?"s" :"" , - ((char *)__get_str (msg))[0 ] ?" " :"" , +__get_str (msg)[0 ] ?" " :"" ,__get_str (msg),__get_str (label), __entry->mc_index,
@@ -157,7 +157,7 @@ TRACE_EVENT(mc_event, __entry->address,1 << __entry->grain_bits, __entry->syndrome, - ((char *)__get_str (driver_detail))[0 ] ?" " :"" , +__get_str (driver_detail)[0 ] ?" " :"" , __get_str(driver_detail)) );
Signature · 1 line
2.8.1
Steven Rostedt
maintainerPATCH 4/7 tracing: Use outer () on __get_str() definition
In reply to Steven RostedtFrom: Daniel Bristot de Oliveira <[email protected]>
__get_str(str)'s definition includes a (char *) operator overloading that is not protected with outer ().
This patch adds () around __get_str()'s definition, enabling some code cleanup.
--- include/trace/perf.h | 2 +- include/trace/trace_events.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/trace/perf.h +1 -1
@@ -15,7 +15,7 @@ ((__entry->__data_loc_##field >> 16) & 0xffff)#undef __get_str -#define __get_str (field) (char *)__get_dynamic_array(field) +#define __get_str (field) ((char *)__get_dynamic_array(field))#undef __get_bitmask#define __get_bitmask (field) (char *)__get_dynamic_array(field)
include/trace/trace_events.h +1 -1
@@ -256,7 +256,7 @@ TRACE_MAKE_SYSTEM_STR(); ((__entry->__data_loc_##field >> 16) & 0xffff)#undef __get_str -#define __get_str (field) (char *)__get_dynamic_array(field) +#define __get_str (field) ((char *)__get_dynamic_array(field))#undef __get_bitmask#define __get_bitmask (field) \
Signature · 1 line
2.8.1