tracing: Some final updates for 5.10
Subsystems (4)
Steven Rostedt
maintainercover tracing: Some final updates for 5.10
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next
Head SHA1: 1a0b112ed1247152685996b4e0edf2af9844ece4
Qiujun Huang (1):
ftrace: Fix some typos in comment
Steven Rostedt (VMware) (3):
tracing: Change synthetic event string format to limit printed length
ftrace: Simplify the hash calculation
ftrace: Format variable declarations of ftrace_allocate_records
Sudip Mukherjee (1):
tracing: Remove a pointless assignment
Tom Zanussi (6):
tracing: Change STR_VAR_MAX_LEN
tracing: Fix parse_synth_field() error handling
tracing: Save normal string variables
tracing: Add support for dynamic strings to synthetic events
tracing: Add README information for synthetic_events file selftests/ftrace: Add test case for synthetic event dynamic strings
Wei Yang (4):
ftrace: Use fls() to get the bits for dup_hash()
ftrace: Simplify the dyn_ftrace->flags macro
ftrace: Simplify the calculation of page number for ftrace_page->records
ftrace: ftrace_global_list is renamed to ftrace_ops_list
----
Documentation/trace/events.rst | 15 +- Documentation/trace/histogram.rst | 18 ++ include/linux/ftrace.h | 11 +- kernel/trace/ftrace.c | 22 +- kernel/trace/synth_event_gen_test.c | 18 +- kernel/trace/trace.c | 8 +- kernel/trace/trace_events_hist.c | 45 +++- kernel/trace/trace_events_synth.c | 256 ++++++++++++++++++--- kernel/trace/trace_synth.h | 6 +- .../trigger-synthetic-event-dynstring.tc | 31 +++ 10 files changed, 366 insertions(+), 64 deletions(-) create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc
Steven Rostedt
maintainerPATCH 1/15 ftrace: Fix some typos in comment
From: Qiujun Huang <[email protected]>
s/coorditate/coordinate/
s/emty/empty/
s/preeptive/preemptive/
s/succes/success/
s/carefule/careful/
--- kernel/trace/ftrace.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
kernel/trace/ftrace.c +5 -5
@@ -230,7 +230,7 @@ static void update_ftrace_function(void)/* * For static tracing, we need to be a bit more careful. * The function change takes affect immediately. Thus, -* we need to coorditate the setting of the function_trace_ops +* we need to coordinate the setting of the function_trace_ops * with the setting of the ftrace_trace_function. * * Set the function to the list ops, which will call the
@@ -1451,7 +1451,7 @@ static bool hash_contains_ip(unsigned long ip, {/* * The function record is a match if it exists in the filter -* hash and not in the notrace hash. Note, an emty hash is +* hash and not in the notrace hash. Note, an empty hash is * considered a match for the filter hash, but an empty * notrace hash is considered not in the notrace hash. */
@@ -2976,7 +2976,7 @@ int ftrace_shutdown(struct ftrace_ops *ops, int command)synchronize_rcu_tasks_rude ();/* -* When the kernel is preeptive, tasks can be preempted +* When the kernel is preemptive, tasks can be preempted * while on a ftrace trampoline. Just scheduling a task on * a CPU is not good enough to flush them. Calling * synchornize_rcu_tasks() will wait for those tasks to
@@ -4368,7 +4368,7 @@ void **ftrace_func_mapper_find_ip(struct ftrace_func_mapper *mapper,* @ip: The instruction pointer address to map @data to * @data: The data to map to @ip * -* Returns 0 on succes otherwise an error. +* Returns 0 on success otherwise an error. */ int ftrace_func_mapper_add_ip (struct ftrace_func_mapper *mapper,unsigned long ip,void *data)
@@ -4536,7 +4536,7 @@ register_ftrace_function_probe(char *glob, struct trace_array *tr,/* * Note, there's a small window here that the func_hash->filter_hash -* may be NULL or empty. Need to be carefule when reading the loop. +* may be NULL or empty. Need to be careful when reading the loop. */ mutex_lock (&probe->ops.func_hash->regex_lock);
Signature · 1 line
2.28.0
Steven Rostedt
maintainerPATCH 5/15 tracing: Add support for dynamic strings to synthetic events
In reply to Steven RostedtFrom: Tom Zanussi <[email protected]>
Currently, sythetic events only support static string fields such as:
# echo 'test_latency u64 lat; char somename[32]' > /sys/kernel/debug/tracing/synthetic_events
Which is fine, but wastes a lot of space in the event.
It also prevents the most commonly-defined strings in the existing trace events e.g. those defined using __string(), from being passed to synthetic events via the trace() action.
With this change, synthetic events with dynamic fields can be defined:
# echo 'test_latency u64 lat; char somename[]' > /sys/kernel/debug/tracing/synthetic_events
And the trace() action can be used to generate events using either dynamic or static strings:
# echo 'hist:keys=name:lat=common_timestamp.usecs-$ts0:onmatch(sys.event).test_latency($lat,name)' > /sys/kernel/debug/tracing/events
The synthetic event dynamic strings are implemented in the same way as the existing __data_loc strings and appear as such in the format file.
[ <[email protected]>: added __set_synth_event_print_fmt() changes:
I added the following to make it work with trace-cmd. Dynamic strings must have __get_str() for events in the print_fmt otherwise it can't be parsed correctly. ]
--- Documentation/trace/events.rst | 15 +- Documentation/trace/histogram.rst | 18 ++ kernel/trace/synth_event_gen_test.c | 18 +- kernel/trace/trace_events_hist.c | 9 + kernel/trace/trace_events_synth.c | 248 ++++++++++++++++++++++++---- kernel/trace/trace_synth.h | 4 + 6 files changed, 272 insertions(+), 40 deletions(-)
Documentation/trace/events.rst +13 -2
@@ -589,8 +589,19 @@ name:: { .type = "int", .name = "my_int_field" }, }; -See synth_field_size() for available types. If field_name contains [n] -the field is considered to be an array. +See synth_field_size() for available types. + +If field_name contains [n], the field is considered to be a static array. + +If field_names contains[] (no subscript), the field is considered to +be a dynamic array, which will only take as much space in the event as +is required to hold the array. + +Because space for an event is reserved before assigning field values +to the event, using dynamic arrays implies that the piecewise +in-kernel API described below can't be used with dynamic arrays. The +other non-piecewise in-kernel APIs can, however, be used with dynamic +arrays. If the event is created from within a module, a pointer to the module must be passed to synth_event_create(). This will ensure that the
Documentation/trace/histogram.rst +18 -0
@@ -1776,6 +1776,24 @@ consisting of the name of the new event along with one or more variables and their types, which can be any valid field type, separated by semicolons, to the tracing/synthetic_events file. +See synth_field_size() for available types. + +If field_name contains [n], the field is considered to be a static array. + +If field_names contains[] (no subscript), the field is considered to +be a dynamic array, which will only take as much space in the event as +is required to hold the array. + +A string field can be specified using either the static notation: + + char name[32]; + +Or the dynamic: + + char name[]; + +The size limit for either is 256. + For instance, the following creates a new event named 'wakeup_latency' with 3 fields: lat, pid, and prio. Each of those fields is simply a variable reference to a variable on another event::
kernel/trace/synth_event_gen_test.c +12 -6
@@ -242,9 +242,11 @@ static struct synth_field_desc create_synth_test_fields[] = { { .type = "pid_t", .name = "next_pid_field" }, { .type = "char[16]", .name = "next_comm_field" }, { .type = "u64", .name = "ts_ns" }, + { .type = "char[]", .name = "dynstring_field_1" }, { .type = "u64", .name = "ts_ms" }, { .type = "unsigned int", .name = "cpu" }, { .type = "char[64]", .name = "my_string_field" }, + { .type = "char[]", .name = "dynstring_field_2" }, { .type = "int", .name = "my_int_field" }, };
@@ -254,7 +256,7 @@ static struct synth_field_desc create_synth_test_fields[] = {*/ static int __init test_create_synth_event (void ) { -u64 vals[7 ]; +u64 vals[9 ];int ret;/* Create the create_synth_test event with the fields above */
@@ -292,10 +294,12 @@ static int __init test_create_synth_event(void) vals[0 ] =777 ;/* next_pid_field */ vals[1 ] = (u64 )(long )"tiddlywinks" ;/* next_comm_field */ vals[2 ] =1000000 ;/* ts_ns */ - vals[3 ] =1000 ;/* ts_ms */ - vals[4 ] =raw_smp_processor_id ();/* cpu */ - vals[5 ] = (u64 )(long )"thneed" ;/* my_string_field */ - vals[6 ] =398 ;/* my_int_field */ + vals[3 ] = (u64 )(long )"xrayspecs" ;/* dynstring_field_1 */ + vals[4 ] =1000 ;/* ts_ms */ + vals[5 ] =raw_smp_processor_id ();/* cpu */ + vals[6 ] = (u64 )(long )"thneed" ;/* my_string_field */ + vals[7 ] = (u64 )(long )"kerplunk" ;/* dynstring_field_2 */ + vals[8 ] =398 ;/* my_int_field */ /* Now generate a create_synth_test event */ ret =synth_event_trace_array (create_synth_test, vals,ARRAY_SIZE (vals));
@@ -422,13 +426,15 @@ static int __init test_trace_synth_event(void)int ret;/* Trace some bogus values just for testing */ - ret =synth_event_trace (create_synth_test,7 ,/* number of values */ + ret =synth_event_trace (create_synth_test,9 ,/* number of values */ (u64 )444 ,/* next_pid_field */ (u64 )(long )"clackers" ,/* next_comm_field */ (u64 )1000000 ,/* ts_ns */ + (u64 )(long )"viewmaster" ,/* dynstring_field_1 */ (u64 )1000 ,/* ts_ms */ (u64 )raw_smp_processor_id (),/* cpu */ (u64 )(long )"Thneed" ,/* my_string_field */ + (u64 )(long )"yoyos" ,/* dynstring_field_2 */ (u64 )999 );/* my_int_field */ return ret; }
kernel/trace/trace_events_hist.c +9 -0
@@ -3289,6 +3289,15 @@ static int check_synth_field(struct synth_event *event, field = event->fields[field_pos]; +/* +* A dynamic string synth field can accept static or +* dynamic. A static string synth field can only accept a +* same-sized static string, which is checked for later. +*/ +if (strstr (hist_field->type,"char[" ) && field->is_string + && field->is_dynamic) +return 0 ; +if (strcmp (field->type, hist_field->type) !=0 ) {if (field->size != hist_field->size || field->is_signed != hist_field->is_signed)
kernel/trace/trace_events_synth.c +216 -32
428 lines not on this page · raw message
kernel/trace/trace_synth.h +4 -0
@@ -16,6 +16,8 @@ struct synth_field {unsigned int offset;bool is_signed;bool is_string; +bool is_dynamic; +bool field_pos; };struct synth_event {
@@ -24,6 +26,8 @@ struct synth_event {char *name;struct synth_field **fields;unsigned int n_fields; +struct synth_field **dynamic_fields; +unsigned int n_dynamic_fields;unsigned int n_u64;struct trace_event_class class;struct trace_event_call call;
Signature · 1 line
2.28.0
Steven Rostedt
maintainerPATCH 10/15 ftrace: Simplify the hash calculation
In reply to Steven RostedtFrom: "Steven Rostedt (VMware)" <[email protected]>
No need to add a check to subtract the number of bits if bits is zero after fls(). Just divide the size by two before calling it. This does give the same answer for size of 0 and 1, but that's fine.
--- kernel/trace/ftrace.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
kernel/trace/ftrace.c +3 -4
@@ -1368,11 +1368,10 @@ static struct ftrace_hash *dup_hash(struct ftrace_hash *src, int size)int i;/* -* Make the hash size about 1/2 the # found +* Use around half the size (max bit of it), but +* a minimum of 2 is fine (as size of 0 or 1 both give 1 for bits). */ - bits =fls (size); -if (bits) - bits--; + bits =fls (size /2 );/* Don't allocate too much */ if (bits >FTRACE_HASH_MAX_BITS )
Signature · 1 line
2.28.0
Steven Rostedt
maintainerPATCH 11/15 ftrace: Simplify the dyn_ftrace->flags macro
In reply to Steven RostedtFrom: Wei Yang <[email protected]>
All the three macro are defined to be used for ftrace_rec_count(). This can be achieved by (flags & FTRACE_REF_MAX) directly.
Since no other places would use those macros, remove them for clarity.
Also it fixes a typo in the comment.
--- include/linux/ftrace.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
include/linux/ftrace.h +2 -5
@@ -432,7 +432,7 @@ bool is_ftrace_trampoline(unsigned long addr);* DIRECT - there is a direct function to call * * When a new ftrace_ops is registered and wants a function to save -* pt_regs, the rec->flag REGS is set. When the function has been +* pt_regs, the rec->flags REGS is set. When the function has been * set up to save regs, the REG_EN flag is set. Once a function * starts saving regs it will do so until all ftrace_ops are removed * from tracing that function.
@@ -450,12 +450,9 @@ enum { };#define FTRACE_REF_MAX_SHIFT 23 -#define FTRACE_FL_BITS 9 -#define FTRACE_FL_MASKED_BITS ((1UL << FTRACE_FL_BITS) - 1) -#define FTRACE_FL_MASK (FTRACE_FL_MASKED_BITS << FTRACE_REF_MAX_SHIFT)#define FTRACE_REF_MAX ((1UL << FTRACE_REF_MAX_SHIFT) - 1) -#define ftrace_rec_count (rec) ((rec)->flags & ~FTRACE_FL_MASK) +#define ftrace_rec_count (rec) ((rec)->flags & FTRACE_REF_MAX)struct dyn_ftrace {unsigned long ip;/* address of mcount call-site */
Signature · 1 line
2.28.0
Steven Rostedt
maintainerPATCH 15/15 tracing: Remove a pointless assignment
In reply to Steven RostedtFrom: Sudip Mukherjee <[email protected]>
The variable 'len' has been assigned a value but is not used after that. So, remove the assignement.
--- kernel/trace/trace.c | 1 - 1 file changed, 1 deletion(-)
kernel/trace/trace.c +0 -1
@@ -6667,7 +6667,6 @@ tracing_mark_write(struct file *filp, const char __user *ubuf, written = -EFAULT ; }else written = cnt; - len = cnt;if (tr->trace_marker_file && !list_empty (&tr->trace_marker_file->triggers)) {/* do not add \n before testing triggers, but add \0 */
Signature · 1 line
2.28.0
Steven Rostedt
maintainerPATCH 12/15 ftrace: Simplify the calculation of page number for ftrace_page->records
In reply to Steven RostedtFrom: Wei Yang <[email protected]>
Based on the following two reasones, we could simplify the calculation:
- If the number after roundup count is not power of 2, we would definitely have more than 1 empty page with a higher order.
- get_count_order() just return current order, so one lower order could meet the requirement.
The calculation could be simplified by lower one order level when pages are not power of 2.
--- kernel/trace/ftrace.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
kernel/trace/ftrace.c +4 -3
@@ -3129,18 +3129,19 @@ static int ftrace_update_code(struct module *mod, struct ftrace_page *new_pgs)static int ftrace_allocate_records (struct ftrace_page *pg,int count) {int order; -int cnt; +int pages, cnt;if (WARN_ON (!count))return -EINVAL ; - order =get_count_order (DIV_ROUND_UP (count,ENTRIES_PER_PAGE )); + pages =DIV_ROUND_UP (count,ENTRIES_PER_PAGE ); + order =get_count_order (pages);/* * We want to fill as much as possible. No more than a page * may be empty. */ -while ((PAGE_SIZE << order) /ENTRY_SIZE >= count +ENTRIES_PER_PAGE ) +if (!is_power_of_2 (pages)) order--; again:
Signature · 1 line
2.28.0
Steven Rostedt
maintainerPATCH 4/15 tracing: Save normal string variables
In reply to Steven RostedtFrom: Tom Zanussi <[email protected]>
String variables created as field variables and save variables are already handled properly by having their values copied when set. The same isn't done for normal variables, but needs to be - simply saving a pointer to a string contained in an old event isn't sufficient, since that event's data may quickly become overwritten and therefore a string pointer to it could yield garbage.
This change uses the same mechanism as field variables and simply appends the new strings to the existing per-element field_var_str[] array allocated for that purpose.
--- kernel/trace/trace_events_hist.c | 34 ++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-)
kernel/trace/trace_events_hist.c +32 -2
@@ -147,6 +147,8 @@ struct hist_field {*/ unsigned int var_ref_idx;bool read_once; + +unsigned int var_str_idx; }; static u64 hist_field_none(struct hist_field *field,
@@ -349,6 +351,7 @@ struct hist_trigger_data {unsigned int n_keys;unsigned int n_fields;unsigned int n_vars; +unsigned int n_var_str;unsigned int key_size;struct tracing_map_sort_key sort_keys[TRACING_MAP_SORT_KEYS_MAX ];unsigned int n_sort_keys;
@@ -1396,7 +1399,12 @@ static int hist_trigger_elt_data_alloc(struct tracing_map_elt *elt) } } - n_str = hist_data->n_field_var_str + hist_data->n_save_var_str; + n_str = hist_data->n_field_var_str + hist_data->n_save_var_str + + hist_data->n_var_str; +if (n_str >SYNTH_FIELDS_MAX ) { +hist_elt_data_free (elt_data); +return -EINVAL ; + }BUILD_BUG_ON (STR_VAR_LEN_MAX & (sizeof (u64) -1 ));
@@ -3653,6 +3661,7 @@ static int create_var_field(struct hist_trigger_data *hist_data, {struct trace_array *tr = hist_data->event_file->tr;unsigned long flags =0 ; +int ret;if (WARN_ON (val_idx >=TRACING_MAP_VALS_MAX +TRACING_MAP_VARS_MAX ))return -EINVAL ;
@@ -3667,7 +3676,12 @@ static int create_var_field(struct hist_trigger_data *hist_data,if (WARN_ON (hist_data->n_vars >TRACING_MAP_VARS_MAX ))return -EINVAL ; -return __create_val_field (hist_data, val_idx, file, var_name, expr_str, flags); + ret =__create_val_field (hist_data, val_idx, file, var_name, expr_str, flags); + +if (hist_data->fields[val_idx]->flags &HIST_FIELD_FL_STRING ) + hist_data->fields[val_idx]->var_str_idx = hist_data->n_var_str++; + +return ret; } static int create_val_fields(struct hist_trigger_data *hist_data,
@@ -4394,6 +4408,22 @@ static void hist_trigger_elt_update(struct hist_trigger_data *hist_data, hist_val = hist_field->fn (hist_field, elt, rbe, rec);if (hist_field->flags &HIST_FIELD_FL_VAR ) { var_idx = hist_field->var.idx; + +if (hist_field->flags &HIST_FIELD_FL_STRING ) { +unsigned int str_start, var_str_idx, idx; +char *str, *val_str; + + str_start = hist_data->n_field_var_str + + hist_data->n_save_var_str; + var_str_idx = hist_field->var_str_idx; + idx = str_start + var_str_idx; + + str = elt_data->field_var_str[idx]; + val_str = (char *)(uintptr_t )hist_val; +strscpy (str, val_str,STR_VAR_LEN_MAX ); + + hist_val = (u64 )(uintptr_t )str; + }tracing_map_set_var (elt, var_idx, hist_val);continue ; }
Signature · 1 line
2.28.0
Steven Rostedt
maintainerPATCH 14/15 ftrace: ftrace_global_list is renamed to ftrace_ops_list
In reply to Steven RostedtFrom: Wei Yang <[email protected]>
Fix the comment to comply with the code.
--- include/linux/ftrace.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/ftrace.h +2 -2
@@ -217,11 +217,11 @@ extern struct ftrace_ops __rcu *ftrace_ops_list;extern struct ftrace_ops ftrace_list_end;/* -* Traverse the ftrace_global_list, invoking all entries. The reason that we +* Traverse the ftrace_ops_list, invoking all entries. The reason that we * can use rcu_dereference_raw_check() is that elements removed from this list * are simply leaked, so there is no need to interact with a grace-period * mechanism. The rcu_dereference_raw_check() calls are needed to handle -* concurrent insertions into the ftrace_global_list. +* concurrent insertions into the ftrace_ops_list. * * Silly Alpha and silly pointer-speculation compiler optimizations! */
Signature · 1 line
2.28.0
Steven Rostedt
maintainerPATCH 13/15 ftrace: Format variable declarations of ftrace_allocate_records
In reply to Steven RostedtFrom: "Steven Rostedt (VMware)" <[email protected]>
I hate when unrelated variables are declared on the same line. Split them.
--- kernel/trace/ftrace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/trace/ftrace.c +2 -1
@@ -3129,7 +3129,8 @@ static int ftrace_update_code(struct module *mod, struct ftrace_page *new_pgs)static int ftrace_allocate_records (struct ftrace_page *pg,int count) {int order; -int pages, cnt; +int pages; +int cnt;if (WARN_ON (!count))return -EINVAL ;
Signature · 1 line
2.28.0
Steven Rostedt
maintainerPATCH 3/15 tracing: Fix parse_synth_field() error handling
In reply to Steven RostedtFrom: Tom Zanussi <[email protected]>
synth_field_size() returns either a positive size or an error (zero or a negative value). However, the existing code assumes the only error value is 0. It doesn't handle negative error codes, as it assigns directly to field->size (a size_t; unsigned), thereby interpreting the error code as a valid size instead.
Do the test before assignment to field->size.
[ [email protected]: changelog addition, first paragraph above ]
--- kernel/trace/trace_events_synth.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/trace/trace_events_synth.c +4 -2
@@ -465,6 +465,7 @@ static struct synth_field *parse_synth_field(int argc, const char **argv,struct synth_field *field;const char *prefix =NULL , *field_type = argv[0 ], *field_name, *array;int len, ret =0 ; +ssize_t size;if (field_type[0 ] ==';' ) field_type++;
@@ -520,11 +521,12 @@ static struct synth_field *parse_synth_field(int argc, const char **argv, field->type[len -1 ] ='\0' ; } - field->size =synth_field_size (field->type); -if (!field->size) { + size =synth_field_size (field->type); +if (size <=0 ) { ret = -EINVAL ; goto free; } + field->size = size;if (synth_field_is_string (field->type)) field->is_string = true;
Signature · 1 line
2.28.0
Steven Rostedt
maintainerPATCH 9/15 ftrace: Use fls() to get the bits for dup_hash()
In reply to Steven RostedtFrom: Wei Yang <[email protected]>
The effect here is to get the number of bits, lets use fls() to do this job.
--- kernel/trace/ftrace.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/trace/ftrace.c +3 -2
@@ -1370,8 +1370,9 @@ static struct ftrace_hash *dup_hash(struct ftrace_hash *src, int size)/* * Make the hash size about 1/2 the # found */ -for (size /=2 ; size; size >>=1 ) - bits++; + bits =fls (size); +if (bits) + bits--;/* Don't allocate too much */ if (bits >FTRACE_HASH_MAX_BITS )
Signature · 1 line
2.28.0
Steven Rostedt
maintainerPATCH 7/15 selftests/ftrace: Add test case for synthetic event dynamic strings
In reply to Steven RostedtFrom: Tom Zanussi <[email protected]>
Add a selftest that defines and traces a synthetic event that uses a dynamic string event field.
--- .../trigger-synthetic-event-dynstring.tc | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc
tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-dynstring.tc new file +31 -0
@@ -0,0 +1,31 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: event trigger - test inter-event histogram trigger trace action with dynamic string param +# requires: set_event synthetic_events events/sched/sched_process_exec/hist "char name[]' >> synthetic_events":README + +fail() { #msg + echo $1 + exit_fail +} + +echo "Test create synthetic event" + +echo 'ping_test_latency u64 lat; char filename[]' > synthetic_events +if [ ! -d events/synthetic/ping_test_latency ]; then + fail "Failed to create ping_test_latency synthetic event" +fi + +echo "Test create histogram for synthetic event using trace action and dynamic strings" +echo "Test histogram dynamic string variables,simple expression support and trace action" + +echo 'hist:key=pid:filenamevar=filename:ts0=common_timestamp.usecs' > events/sched/sched_process_exec/trigger +echo 'hist:key=pid:lat=common_timestamp.usecs-$ts0:onmatch(sched.sched_process_exec).ping_test_latency($lat,$filenamevar) if comm == "ping"' > events/sched/sched_process_exit/trigger +echo 'hist:keys=filename,lat:sort=filename,lat' > events/synthetic/ping_test_latency/trigger + +ping $LOCALHOST -c 5 + +if ! grep -q "ping" events/synthetic/ping_test_latency/hist; then + fail "Failed to create dynamic string trace action inter-event histogram" +fi + +exit 0
Signature · 1 line
2.28.0
Steven Rostedt
maintainerPATCH 8/15 tracing: Change synthetic event string format to limit printed length
In reply to Steven RostedtFrom: "Steven Rostedt (VMware)" <[email protected]>
Change the format for printing synthetic field strings to limit the length of the string printed even if it's not correctly terminated.
--- kernel/trace/trace_events_synth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/trace/trace_events_synth.c +3 -1
@@ -234,7 +234,7 @@ static const char *synth_field_fmt(char *type)else if (strcmp (type,"gfp_t" ) ==0 ) fmt ="%x" ;else if (synth_field_is_string (type)) - fmt ="%s" ; + fmt ="%.*s" ;return fmt; }
@@ -303,11 +303,13 @@ static enum print_line_t print_synth_event(struct trace_iterator *iter, str_field = (char *)entry + data_offset;trace_seq_printf (s, print_fmt, se->fields[i]->name, +STR_VAR_LEN_MAX , str_field, i == se->n_fields -1 ?"" :" " ); n_u64++; }else {trace_seq_printf (s, print_fmt, se->fields[i]->name, +STR_VAR_LEN_MAX , (char *)&entry->fields[n_u64], i == se->n_fields -1 ?"" :" " ); n_u64 +=STR_VAR_LEN_MAX /sizeof (u64);
Signature · 1 line
2.28.0
Steven Rostedt
maintainerPATCH 2/15 tracing: Change STR_VAR_MAX_LEN
In reply to Steven RostedtFrom: Tom Zanussi <[email protected]>
32 is too small for this value, and anyway it makes more sense to use MAX_FILTER_STR_VAL, as this is also the value used for variable-length __strings.
--- kernel/trace/trace_events_hist.c | 2 ++ kernel/trace/trace_synth.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
kernel/trace/trace_events_hist.c +2 -0
@@ -1398,6 +1398,8 @@ static int hist_trigger_elt_data_alloc(struct tracing_map_elt *elt) n_str = hist_data->n_field_var_str + hist_data->n_save_var_str; +BUILD_BUG_ON (STR_VAR_LEN_MAX & (sizeof (u64) -1 )); + size =STR_VAR_LEN_MAX ;for (i =0 ; i < n_str; i++) {
kernel/trace/trace_synth.h +1 -1
@@ -7,7 +7,7 @@#define SYNTH_SYSTEM "synthetic"#define SYNTH_FIELDS_MAX 32 -#define STR_VAR_LEN_MAX 32/* must be multiple of sizeof(u64) */ +#define STR_VAR_LEN_MAX MAX_FILTER_STR_VAL/* must be multiple of sizeof(u64) */ struct synth_field {char *type;
Signature · 1 line
2.28.0
Steven Rostedt
maintainerPATCH 6/15 tracing: Add README information for synthetic_events file
In reply to Steven RostedtFrom: Tom Zanussi <[email protected]>
Add an entry with a basic description of events/synthetic_events along with a simple example.
--- kernel/trace/trace.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
kernel/trace/trace.c +6 -1
@@ -5249,7 +5249,12 @@ static const char readme_msg[] ="\t trace(<synthetic_event>,param list) - generate synthetic event\n" "\t save(field,...) - save current event fields\n" #ifdef CONFIG_TRACER_SNAPSHOT - "\t snapshot() - snapshot the trace buffer\n" + "\t snapshot() - snapshot the trace buffer\n\n" +#endif +#ifdef CONFIG_SYNTH_EVENTS +" events/synthetic_events\t- Create/append/remove/show synthetic events\n" +"\t Write into this file to define/undefine new synthetic events.\n" + "\t example: echo 'myevent u64 lat; char name[]' >> synthetic_events\n"#endif #endif ;
Signature · 1 line
2.28.0
Steven Rostedt
maintainerBah, I just realized I used the wrong script. This was suppose to be a '[for-next]' patch series :-/
-- Steve