perf probe: Allow names to start with digits
v3 cover perf probe: Allow names to start with digits
This is a rebase of the patch orginally sent almost two years ago here:
https://lkml.kernel.org/r/[email protected]
At the time I was asked to add tests, and Jiri whipped up something to make the test pass even for probes that don't exist on most systems but that ended up never being formatted or sent... I asked what happened of it and got asked to send it myself, but obviously also totally forget about it myself until I needed it again now.
I've taken the diff from that thread, adapted it a little bit to the current master branch and checked things still fall in place -- I didn't see any obvious problem.
Thanks!
---
Changes in v3:
- fix evsel__newtp_idx typo in commit 1's message
- rebase onto perf-tools-next
- add trailers
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- update Jiri's email in commit tags
- (not a change, but after being brain-dead and Ian helpful
reply I'm confirming patch 3/3 works as expected)
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Dominique Martinet (3):
perf parse-events: pass parse_state to add_tracepoint perf parse-events: Add new 'fake_tp' parameter for tests perf parse: Allow names to start with digits
tools/perf/tests/parse-events.c | 11 +++++++++-- tools/perf/tests/pmu-events.c | 2 +- tools/perf/util/evlist.c | 3 ++- tools/perf/util/evsel.c | 20 +++++++++++++------- tools/perf/util/evsel.h | 4 ++-- tools/perf/util/metricgroup.c | 3 ++- tools/perf/util/parse-events.c | 38 +++++++++++++++++++++++--------------- tools/perf/util/parse-events.h | 9 ++++++--- tools/perf/util/parse-events.l | 4 ++-- tools/perf/util/parse-events.y | 2 +- 10 files changed, 61 insertions(+), 35 deletions(-)
---
base-commit: 187c219b57eaf3e1b7a3cab2c6a8b7909bdbf4a9
change-id: 20240407-perf_digit-72445b5edb62
Best regards,
Signature · 1 line
Dominique Martinet | Asmadeus
PATCH v3 1/3 perf parse-events: pass parse_state to add_tracepoint
The next patch will add another flag to parse_state that we will want to pass to evsel__newtp_idx(), so pass the whole parse_state all the way down instead of giving only the index
--- tools/perf/util/parse-events.c | 31 ++++++++++++++++++------------- tools/perf/util/parse-events.h | 3 ++- tools/perf/util/parse-events.y | 2 +- 3 files changed, 21 insertions(+), 15 deletions(-)
tools/perf/util/parse-events.c +18 -13
@@ -543,13 +543,14 @@ static void tracepoint_error(struct parse_events_error *e, int err,parse_events_error__handle (e, column,strdup (str),strdup (help)); } -static int add_tracepoint (struct list_head *list,int *idx, +static int add_tracepoint (struct parse_events_state *parse_state, +struct list_head *list,const char *sys_name,const char *evt_name,struct parse_events_error *err,struct parse_events_terms *head_config,void *loc_) {YYLTYPE *loc = loc_; -struct evsel *evsel =evsel__newtp_idx (sys_name, evt_name, (*idx)++); +struct evsel *evsel =evsel__newtp_idx (sys_name, evt_name, parse_state->idx++);if (IS_ERR (evsel)) {tracepoint_error (err,PTR_ERR (evsel), sys_name, evt_name, loc->first_column);
@@ -568,7 +569,8 @@ static int add_tracepoint(struct list_head *list, int *idx,return 0 ; } -static int add_tracepoint_multi_event (struct list_head *list,int *idx, +static int add_tracepoint_multi_event (struct parse_events_state *parse_state, +struct list_head *list,const char *sys_name,const char *evt_name,struct parse_events_error *err,struct parse_events_terms *head_config,YYLTYPE *loc)
@@ -602,7 +604,7 @@ static int add_tracepoint_multi_event(struct list_head *list, int *idx, found++; - ret =add_tracepoint (list, idx, sys_name, evt_ent->d_name, + ret =add_tracepoint (parse_state, list, sys_name, evt_ent->d_name, err, head_config, loc); }
@@ -616,19 +618,21 @@ static int add_tracepoint_multi_event(struct list_head *list, int *idx,return ret; } -static int add_tracepoint_event (struct list_head *list,int *idx, +static int add_tracepoint_event (struct parse_events_state *parse_state, +struct list_head *list,const char *sys_name,const char *evt_name,struct parse_events_error *err,struct parse_events_terms *head_config,YYLTYPE *loc) {return strpbrk (evt_name,"*?" ) ? -add_tracepoint_multi_event (list, idx, sys_name, evt_name, +add_tracepoint_multi_event (parse_state, list, sys_name, evt_name, err, head_config, loc) : -add_tracepoint (list, idx, sys_name, evt_name, +add_tracepoint (parse_state, list, sys_name, evt_name, err, head_config, loc); } -static int add_tracepoint_multi_sys (struct list_head *list,int *idx, +static int add_tracepoint_multi_sys (struct parse_events_state *parse_state, +struct list_head *list,const char *sys_name,const char *evt_name,struct parse_events_error *err,struct parse_events_terms *head_config,YYLTYPE *loc)
@@ -654,7 +658,7 @@ static int add_tracepoint_multi_sys(struct list_head *list, int *idx,if (!strglobmatch (events_ent->d_name, sys_name))continue ; - ret =add_tracepoint_event (list, idx, events_ent->d_name, + ret =add_tracepoint_event (parse_state, list, events_ent->d_name, evt_name, err, head_config, loc); }
@@ -1291,7 +1295,8 @@ static int get_config_chgs(struct perf_pmu *pmu, struct parse_events_terms *headreturn 0 ; } -int parse_events_add_tracepoint (struct list_head *list,int *idx, +int parse_events_add_tracepoint (struct parse_events_state *parse_state, +struct list_head *list,const char *sys,const char *event,struct parse_events_error *err,struct parse_events_terms *head_config,void *loc_)
@@ -1307,14 +1312,14 @@ int parse_events_add_tracepoint(struct list_head *list, int *idx, }if (strpbrk (sys,"*?" )) -return add_tracepoint_multi_sys (list, idx, sys, event, +return add_tracepoint_multi_sys (parse_state, list, sys, event, err, head_config, loc);else -return add_tracepoint_event (list, idx, sys, event, +return add_tracepoint_event (parse_state, list, sys, event, err, head_config, loc);#else + (void )parse_state; (void )list; - (void )idx; (void )sys; (void )event; (void )head_config;
tools/perf/util/parse-events.h +2 -1
@@ -208,7 +208,8 @@ int parse_events__modifier_event(struct parse_events_state *parse_state, void *lint parse_events__modifier_group (struct parse_events_state *parse_state,void *loc,struct list_head *list,struct parse_events_modifier mod);int parse_events__set_default_name (struct list_head *list,char *name); -int parse_events_add_tracepoint (struct list_head *list,int *idx, +int parse_events_add_tracepoint (struct parse_events_state *parse_state, +struct list_head *list,const char *sys,const char *event,struct parse_events_error *error,struct parse_events_terms *head_config,void *loc);
tools/perf/util/parse-events.y +1 -1
@@ -497,7 +497,7 @@ tracepoint_name opt_event_config if (!list) YYNOMEM; - err = parse_events_add_tracepoint(list, &parse_state->idx, $1.sys, $1.event, + err = parse_events_add_tracepoint(parse_state, list, $1.sys, $1.event, error, $2, &@1); parse_events_terms__delete($2);
Signature · 1 line
2.44.0
PATCH v3 2/3 perf parse-events: Add new 'fake_tp' parameter for tests
In reply to Dominique MartinetThe next commit will allow tracepoints starting with digits, but most systems do not have any available by default so tests should skip the actual "check if it exists in /sys/kernel/debug/tracing" step.
In order to do that, add a new boolean flag specifying if we should actually "format" the probe or not.
--- tools/perf/tests/parse-events.c | 6 ++++-- tools/perf/tests/pmu-events.c | 2 +- tools/perf/util/evlist.c | 3 ++- tools/perf/util/evsel.c | 20 +++++++++++++------- tools/perf/util/evsel.h | 4 ++-- tools/perf/util/metricgroup.c | 3 ++- tools/perf/util/parse-events.c | 9 ++++++--- tools/perf/util/parse-events.h | 6 ++++-- 8 files changed, 34 insertions(+), 19 deletions(-)
tools/perf/tests/parse-events.c +4 -2
@@ -2493,7 +2493,8 @@ static int test_event(const struct evlist_test *e)return TEST_FAIL ; }parse_events_error__init (&err); - ret =parse_events (evlist, e->name, &err); + ret =__parse_events (evlist, e->name,/*pmu_filter=*/ NULL , &err,/*fake_pmu=*/ NULL , +/*warn_if_reordered=*/ true,/*fake_tp=*/ true);if (ret) {pr_debug ("failed to parse event '%s', err %d\n" , e->name, ret);parse_events_error__print (&err, e->name);
@@ -2521,7 +2522,8 @@ static int test_event_fake_pmu(const char *str)parse_events_error__init (&err); ret =__parse_events (evlist, str,/*pmu_filter=*/ NULL , &err, - &perf_pmu__fake,/*warn_if_reordered=*/ true); + &perf_pmu__fake,/*warn_if_reordered=*/ true, +/*fake_tp=*/ true);if (ret) {pr_debug ("failed to parse event '%s', err %d\n" , str, ret);
tools/perf/tests/pmu-events.c +1 -1
@@ -842,7 +842,7 @@ static int check_parse_id(const char *id, struct parse_events_error *error, *cur ='/' ; ret =__parse_events (evlist, dup,/*pmu_filter=*/ NULL , error, fake_pmu, -/*warn_if_reordered=*/ true); +/*warn_if_reordered=*/ true,/*fake_tp=*/ false);free (dup);evlist__delete (evlist);
tools/perf/util/evlist.c +2 -1
@@ -298,7 +298,8 @@ struct evsel *evlist__add_aux_dummy(struct evlist *evlist, bool system_wide)#ifdef HAVE_LIBTRACEEVENT struct evsel *evlist__add_sched_switch (struct evlist *evlist,bool system_wide) { -struct evsel *evsel =evsel__newtp_idx ("sched" ,"sched_switch" ,0 ); +struct evsel *evsel =evsel__newtp_idx ("sched" ,"sched_switch" ,0 , +/*format=*/ true);if (IS_ERR (evsel))return evsel;
tools/perf/util/evsel.c +13 -7
@@ -452,7 +452,7 @@ struct evsel *evsel__clone(struct evsel *orig)* Returns pointer with encoded error via <linux/err.h> interface. */ #ifdef HAVE_LIBTRACEEVENT -struct evsel *evsel__newtp_idx (const char *sys,const char *name,int idx) +struct evsel *evsel__newtp_idx (const char *sys,const char *name,int idx,bool format) {struct evsel *evsel =zalloc (perf_evsel__object.size);int err = -ENOMEM ;
@@ -469,14 +469,20 @@ struct evsel *evsel__newtp_idx(const char *sys, const char *name, int idx)if (asprintf (&evsel->name,"%s:%s" , sys, name) <0 ) goto out_free; - evsel->tp_format =trace_event__tp_format (sys, name); -if (IS_ERR (evsel->tp_format)) { - err =PTR_ERR (evsel->tp_format); - goto out_free; +event_attr_init (&attr); + +if (format) { + evsel->tp_format =trace_event__tp_format (sys, name); +if (IS_ERR (evsel->tp_format)) { + err =PTR_ERR (evsel->tp_format); + goto out_free; + } + attr.config = evsel->tp_format->id; + }else { + attr.config = (__u64) -1 ; } -event_attr_init (&attr); - attr.config = evsel->tp_format->id; + attr.sample_period =1 ;evsel__init (evsel, &attr, idx); }
tools/perf/util/evsel.h +2 -2
@@ -234,14 +234,14 @@ void free_config_terms(struct list_head *config_terms);#ifdef HAVE_LIBTRACEEVENT -struct evsel *evsel__newtp_idx (const char *sys,const char *name,int idx); +struct evsel *evsel__newtp_idx (const char *sys,const char *name,int idx,bool format);/* * Returns pointer with encoded error via <linux/err.h> interface. */ static inline struct evsel *evsel__newtp (const char *sys,const char *name) { -return evsel__newtp_idx (sys, name,0 ); +return evsel__newtp_idx (sys, name,0 , true); }#endif
tools/perf/util/metricgroup.c +2 -1
@@ -1502,7 +1502,8 @@ static int parse_ids(bool metric_no_merge, struct perf_pmu *fake_pmu,pr_debug ("Parsing metric events '%s'\n" , events.buf);parse_events_error__init (&parse_error); ret =__parse_events (parsed_evlist, events.buf,/*pmu_filter=*/ NULL , - &parse_error, fake_pmu,/*warn_if_reordered=*/ false); + &parse_error, fake_pmu,/*warn_if_reordered=*/ false, +/*fake_tp=*/ false);if (ret) {parse_events_error__print (&parse_error, events.buf); goto err_out;
tools/perf/util/parse-events.c +6 -3
@@ -550,7 +550,8 @@ static int add_tracepoint(struct parse_events_state *parse_state, struct parse_events_terms *head_config, void *loc_) { YYLTYPE *loc = loc_; -struct evsel *evsel =evsel__newtp_idx (sys_name, evt_name, parse_state->idx++); +struct evsel *evsel =evsel__newtp_idx (sys_name, evt_name, parse_state->idx++, + !parse_state->fake_tp);if (IS_ERR (evsel)) {tracepoint_error (err,PTR_ERR (evsel), sys_name, evt_name, loc->first_column);
@@ -2135,7 +2136,7 @@ static int parse_events__sort_events_and_fix_groups(struct list_head *list)int __parse_events (struct evlist *evlist,const char *str,const char *pmu_filter,struct parse_events_error *err,struct perf_pmu *fake_pmu, -bool warn_if_reordered) +bool warn_if_reordered,bool fake_tp) {struct parse_events_state parse_state = { .list =LIST_HEAD_INIT (parse_state.list),
@@ -2143,6 +2144,7 @@ int __parse_events(struct evlist *evlist, const char *str, const char *pmu_filte .error = err, .stoken = PE_START_EVENTS, .fake_pmu = fake_pmu, + .fake_tp = fake_tp, .pmu_filter = pmu_filter, .match_legacy_cache_terms = true, };
@@ -2352,7 +2354,8 @@ int parse_events_option(const struct option *opt, const char *str,parse_events_error__init (&err); ret =__parse_events (*args->evlistp, str, args->pmu_filter, &err, -/*fake_pmu=*/ NULL ,/*warn_if_reordered=*/ true); +/*fake_pmu=*/ NULL ,/*warn_if_reordered=*/ true, +/*fake_tp=*/ false);if (ret) {parse_events_error__print (&err, str);
tools/perf/util/parse-events.h +4 -2
@@ -32,14 +32,14 @@ int parse_events_option_new_evlist(const struct option *opt, const char *str, in __attribute__((nonnull (1 ,2 ,4 )))int __parse_events (struct evlist *evlist,const char *str,const char *pmu_filter,struct parse_events_error *error,struct perf_pmu *fake_pmu, -bool warn_if_reordered); +bool warn_if_reordered,bool fake_tp); __attribute__((nonnull (1 ,2 ,3 )))static inline int parse_events (struct evlist *evlist,const char *str,struct parse_events_error *err) {return __parse_events (evlist, str,/*pmu_filter=*/ NULL , err,/*fake_pmu=*/ NULL , -/*warn_if_reordered=*/ true); +/*warn_if_reordered=*/ true,/*fake_tp=*/ false); }int parse_event (struct evlist *evlist,const char *str);
@@ -152,6 +152,8 @@ struct parse_events_state {int stoken;/* Special fake PMU marker for testing. */ struct perf_pmu *fake_pmu; +/* Skip actual tracepoint processing for testing. */ +bool fake_tp;/* If non-null, when wildcard matching only match the given PMU. */ const char *pmu_filter;/* Should PE_LEGACY_NAME tokens be generated for config terms? */
Signature · 1 line
2.44.0
PATCH v3 3/3 perf parse: Allow names to start with digits
In reply to Dominique MartinetTracepoints can start with digits, although we don't have many of these:
$ rg -g '*.h' '\bTRACE_EVENT\([0-9]' net/mac802154/trace.h 53:TRACE_EVENT(802154_drv_return_int, ...
net/ieee802154/trace.h
66:TRACE_EVENT(802154_rdev_add_virtual_intf,
...
include/trace/events/9p.h
124:TRACE_EVENT(9p_client_req,
...
Just allow names to start with digits too so e.g. perf trace -e '9p:*' works
--- tools/perf/tests/parse-events.c | 5 +++++ tools/perf/util/parse-events.l | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)
tools/perf/tests/parse-events.c +5 -0
@@ -2269,6 +2269,11 @@ static const struct evlist_test test__events[] = { .check = test__checkevent_breakpoint_2_events, /* 3 */ }, + { + .name = "9p:9p_client_req", + .check = test__checkevent_tracepoint, + /* 4 */ + }, };static const struct evlist_test test__events_pmu[] = {
tools/perf/util/parse-events.l +2 -2
@@ -242,8 +242,8 @@ event [^,{}/]+ num_dec [0-9]+ num_hex 0x[a-fA-F0-9]{1,16} num_raw_hex [a-fA-F0-9]{1,16} -name [a-zA-Z_*?\[\]][a-zA-Z0-9_*?.\[\]!\-]* -name_tag [\'][a-zA-Z_*?\[\]][a-zA-Z0-9_*?\-,\.\[\]:=]*[\'] +name [a-zA-Z0-9_*?\[\]][a-zA-Z0-9_*?.\[\]!\-]* +name_tag [\'][a-zA-Z0-9_*?\[\]][a-zA-Z0-9_*?\-,\.\[\]:=]*[\'] name_minus [a-zA-Z_*?][a-zA-Z0-9\-_*?.:]* drv_cfg_term [a-zA-Z0-9_\.]+(=[a-zA-Z0-9_*?\.:]+)? /*
Signature · 1 line
2.44.0