perf parse-events: pass parse_state to add_tracepoint
PATCH 1/3 perf parse-events: pass parse_state to add_tracepoint
This is a noop refactoring: instead of passing the index argument to various add tracepoint functions pass the event parse state directly.
Next commit will add an extra parameter to parse_state that will be used.
---
This is the first half of the diff Jiri sent in the mail linked above, in preparation to add a 9p probe test that would only work if 9p module is loaded without this.
Jiri, not sure if that is the split you had in mind? but it sort of made sense to me, so I went with that.
Please ask if you were thinking of something else.
I also didn't change anything else here (except for a minor rebase conflict for patch 2), so happy to demote myself and put you as main author or anything you want; I don't care for commit count.
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
@@ -472,12 +472,13 @@ static void tracepoint_error(struct parse_events_error *e, int err,parse_events_error__handle (e,0 ,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 list_head *head_config) { -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);
@@ -496,7 +497,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 list_head *head_config)
@@ -530,7 +532,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); }
@@ -544,19 +546,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 list_head *head_config) {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) : -add_tracepoint (list, idx, sys_name, evt_name, +add_tracepoint (parse_state, list, sys_name, evt_name, err, head_config); } -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 list_head *head_config)
@@ -582,7 +586,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); }
@@ -619,7 +623,7 @@ static int add_bpf_event(const char *group, const char *event, int fd, struct bppr_debug ("add bpf event %s:%s and attach bpf program %d\n" , group, event, fd); - err =parse_events_add_tracepoint (&new_evsels, &parse_state->idx, group, + err =parse_events_add_tracepoint (parse_state, &new_evsels, group, event, parse_state->error, param->head_config);if (err) {
@@ -1316,7 +1320,8 @@ static int get_config_chgs(struct perf_pmu *pmu, struct list_head *head_config,return 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 list_head *head_config)
@@ -1330,10 +1335,10 @@ 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);else -return add_tracepoint_event (list, idx, sys, event, +return add_tracepoint_event (parse_state, list, sys, event, err, head_config); }
tools/perf/util/parse-events.h +2 -1
@@ -152,7 +152,8 @@ void parse_events__clear_array(struct parse_events_array *a);int parse_events__modifier_event (struct list_head *list,char *str,bool add);int parse_events__modifier_group (struct list_head *list,char *event_mod);int parse_events_name (struct list_head *list,const 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 list_head *head_config);
tools/perf/util/parse-events.y +1 -1
@@ -625,7 +625,7 @@ tracepoint_name opt_event_config if (error) error->idx = @1.first_column; - 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); parse_events_terms__delete($2);
Signature · 1 line
2.37.3
PATCH 2/3 perf parse-events: add fake_tp field to trace state for tests
Tests currently require the tracepoint to exist on the system to pass. This works fine for common tracepoints, but if we add a test for rarely loaded module's probes e.g. 9p tracepoints the test would only pass with the 9p module loaded and that is not acceptable.
Instead, add a new flag like fake_pmu for tracepoints (fake_tp) that skip the tracepoint existence check.
Linf: https://lore.kernel.org/all/YsGduWiTvkM2/tHv@krava/
--- tools/perf/tests/parse-events.c | 4 ++-- tools/perf/tests/pmu-events.c | 2 +- tools/perf/util/evlist.c | 2 +- tools/perf/util/evsel.c | 16 ++++++++++------ tools/perf/util/evsel.h | 4 ++-- tools/perf/util/metricgroup.c | 2 +- tools/perf/util/parse-events.c | 7 +++++-- tools/perf/util/parse-events.h | 5 +++-- 8 files changed, 25 insertions(+), 17 deletions(-)
tools/perf/tests/parse-events.c +2 -2
@@ -2053,7 +2053,7 @@ 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, &err,NULL , true);if (ret) {pr_debug ("failed to parse event '%s', err %d, str '%s'\n" , e->name, ret, err.str);
@@ -2082,7 +2082,7 @@ static int test_event_fake_pmu(const char *str)parse_events_error__init (&err);perf_pmu__test_parse_init (); - ret =__parse_events (evlist, str, &err, &perf_pmu__fake); + ret =__parse_events (evlist, str, &err, &perf_pmu__fake, false);if (ret) {pr_debug ("failed to parse event '%s', err %d, str '%s'\n" , str, ret, err.str);
tools/perf/tests/pmu-events.c +1 -1
@@ -816,7 +816,7 @@ static int check_parse_id(const char *id, struct parse_events_error *error,*/ perf_pmu__test_parse_init (); } - ret =__parse_events (evlist, dup, error, fake_pmu); + ret =__parse_events (evlist, dup, error, fake_pmu, false);free (dup);evlist__delete (evlist);
tools/perf/util/evlist.c +1 -1
@@ -290,7 +290,7 @@ struct evsel *evlist__add_aux_dummy(struct evlist *evlist, bool system_wide)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 , true);if (IS_ERR (evsel))return evsel;
tools/perf/util/evsel.c +10 -6
@@ -481,7 +481,7 @@ struct evsel *evsel__clone(struct evsel *orig)/* * Returns pointer with encoded error via <linux/err.h> interface. */ -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 ;
@@ -498,14 +498,18 @@ 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; +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
@@ -225,7 +225,7 @@ static inline struct evsel *evsel__new(struct perf_event_attr *attr) }struct evsel *evsel__clone (struct evsel *orig); -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);int copy_config_terms (struct list_head *dst,struct list_head *src);void free_config_terms (struct list_head *config_terms);
@@ -235,7 +235,7 @@ void free_config_terms(struct list_head *config_terms);*/ 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); }struct evsel *evsel__new_cycles (bool precise,__u32 type,__u64 config);
tools/perf/util/metricgroup.c +1 -1
@@ -1520,7 +1520,7 @@ 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, &parse_error, fake_pmu); + ret =__parse_events (parsed_evlist, events.buf, &parse_error, fake_pmu, false);if (ret) {parse_events_error__print (&parse_error, events.buf); goto err_out;
tools/perf/util/parse-events.c +5 -2
@@ -478,7 +478,8 @@ static int add_tracepoint(struct parse_events_state *parse_state,struct parse_events_error *err, struct list_head *head_config) { - 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);
@@ -2233,7 +2234,8 @@ static int parse_events__with_hybrid_pmu(struct parse_events_state *parse_state, }int __parse_events (struct evlist *evlist,const char *str, -struct parse_events_error *err,struct perf_pmu *fake_pmu) +struct parse_events_error *err, +struct perf_pmu *fake_pmu,bool fake_tp) {struct parse_events_state parse_state = { .list =LIST_HEAD_INIT (parse_state.list),
@@ -2242,6 +2244,7 @@ int __parse_events(struct evlist *evlist, const char *str, .evlist = evlist, .stoken = PE_START_EVENTS, .fake_pmu = fake_pmu, + .fake_tp = fake_tp, };int ret;
tools/perf/util/parse-events.h +3 -2
@@ -27,13 +27,13 @@ int parse_events_option(const struct option *opt, const char *str, int unset);int parse_events_option_new_evlist (const struct option *opt,const char *str,int unset); __attribute__((nonnull (1 ,2 ,3 )))int __parse_events (struct evlist *evlist,const char *str,struct parse_events_error *error, -struct perf_pmu *fake_pmu); +struct perf_pmu *fake_pmu,bool fake_tp); __attribute__((nonnull))static inline int parse_events (struct evlist *evlist,const char *str,struct parse_events_error *err) { -return __parse_events (evlist, str, err,NULL ); +return __parse_events (evlist, str, err,NULL , false); }int parse_event (struct evlist *evlist,const char *str);
@@ -129,6 +129,7 @@ struct parse_events_state {struct list_head *terms;int stoken;struct perf_pmu *fake_pmu; +bool fake_tp;char *hybrid_pmu_name; };
Signature · 1 line
2.37.3
PATCH v2 3/3 perf parse-events: 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 probe -e '9p:*' works
---
Changelog:
v1 at https://lkml.kernel.org/r/[email protected]
v1->v2: add extra test now it doesn't break for everyone else :)
Ian suggested simplifying the name regex to: [a-zA-Z0-9_*?\[\]!]+ but that:
- breaks probe names with a dot; or if we add a dot allows them to start with one
- also allows probes to start with !
I don't think that'd break anything if we allow .! as leading character but it doesn't really make much difference to me either so I kept the patch minimal: please say if you have an opinion.
tools/perf/tests/parse-events.c | 5 +++++ tools/perf/util/parse-events.l | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
tools/perf/tests/parse-events.c +5 -0
@@ -1941,6 +1941,11 @@ static const struct evlist_test test__events[] = { .check = test__exclusive_group, /* 7 */ }, + { + .name = "9p:9p_client_req", + .check = test__checkevent_tracepoint, + /* 8 */ + }, };static const struct evlist_test test__events_pmu[] = {
tools/perf/util/parse-events.l +1 -1
@@ -211,7 +211,7 @@ bpf_source [^,{}]+\.c[a-zA-Z0-9._]* num_dec [0-9]+ num_hex 0x[a-fA-F0-9]+ num_raw_hex [a-fA-F0-9]+ -name [a-zA-Z_*?\[\]][a-zA-Z0-9_*?.\[\]!]* +name [a-zA-Z0-9_*?\[\]][a-zA-Z0-9_*?.\[\]!]* name_tag [\'][a-zA-Z_*?\[\]][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.37.3