* [PATCH v2] perf parse: Copy string to perf_evsel_config_term
@ 2020-01-07 3:18 Leo Yan
2020-01-07 9:16 ` Jiri Olsa
0 siblings, 1 reply; 5+ messages in thread
From: Leo Yan @ 2020-01-07 3:18 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo, Jiri Olsa, Peter Zijlstra, Ingo Molnar,
Mark Rutland, Alexander Shishkin, Namhyung Kim, Ian Rogers,
Adrian Hunter, Andi Kleen, linux-kernel, Mathieu Poirier,
Mike Leach, Suzuki K Poulose
Cc: Leo Yan
perf with CoreSight fails to record trace data with command:
perf record -e cs_etm/@tmc_etr0/u --per-thread ls
failed to set sink "" on event cs_etm/@tmc_etr0/u with 21 (Is a
directory)/perf/
This failure is root caused with the commit 1dc925568f01 ("perf
parse: Add a deep delete for parse event terms").
The log shows, cs_etm fails to parse the sink attribution; cs_etm event
relies on the event configuration to pass sink name, but the event
specific configuration data cannot be passed properly with flow:
get_config_terms()
ADD_CONFIG_TERM(DRV_CFG, drv_cfg, term->val.str);
__t->val.drv_cfg = term->val.str;
`> __t->val.drv_cfg is assigned to term->val.str;
parse_events_terms__purge()
parse_events_term__delete()
zfree(&term->val.str);
`> term->val.str is freed and assigned to NULL pointer;
cs_etm_set_sink_attr()
sink = __t->val.drv_cfg;
`> sink string has been freed.
To fix this issue, in the function get_config_terms(), this patch
changes from directly assignment pointer value for the strings to
use strdup() for allocation a new duplicate string for the cases:
perf_evsel_config_term::val.callgraph
perf_evsel_config_term::val.branch
perf_evsel_config_term::val.drv_cfg.
Fixes: 1dc925568f01 ("perf parse: Add a deep delete for parse event terms")
Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
tools/perf/util/parse-events.c | 55 +++++++++++++++++++++-------------
1 file changed, 34 insertions(+), 21 deletions(-)
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index ed7c008b9c8b..49b26504bee3 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1220,7 +1220,6 @@ static int get_config_terms(struct list_head *head_config,
struct list_head *head_terms __maybe_unused)
{
#define ADD_CONFIG_TERM(__type, __name, __val) \
-do { \
struct perf_evsel_config_term *__t; \
\
__t = zalloc(sizeof(*__t)); \
@@ -1229,9 +1228,23 @@ do { \
\
INIT_LIST_HEAD(&__t->list); \
__t->type = PERF_EVSEL__CONFIG_TERM_ ## __type; \
- __t->val.__name = __val; \
__t->weak = term->weak; \
- list_add_tail(&__t->list, head_terms); \
+ list_add_tail(&__t->list, head_terms)
+
+#define ADD_CONFIG_TERM_VAL(__type, __name, __val) \
+do { \
+ ADD_CONFIG_TERM(__type, __name, __val); \
+ __t->val.__name = __val; \
+} while (0)
+
+#define ADD_CONFIG_TERM_STR(__type, __name, __val) \
+do { \
+ ADD_CONFIG_TERM(__type, __name, __val); \
+ __t->val.__name = strdup(__val); \
+ if (!__t->val.__name) { \
+ zfree(&__t); \
+ return -ENOMEM; \
+ } \
} while (0)
struct parse_events_term *term;
@@ -1239,53 +1252,53 @@ do { \
list_for_each_entry(term, head_config, list) {
switch (term->type_term) {
case PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD:
- ADD_CONFIG_TERM(PERIOD, period, term->val.num);
+ ADD_CONFIG_TERM_VAL(PERIOD, period, term->val.num);
break;
case PARSE_EVENTS__TERM_TYPE_SAMPLE_FREQ:
- ADD_CONFIG_TERM(FREQ, freq, term->val.num);
+ ADD_CONFIG_TERM_VAL(FREQ, freq, term->val.num);
break;
case PARSE_EVENTS__TERM_TYPE_TIME:
- ADD_CONFIG_TERM(TIME, time, term->val.num);
+ ADD_CONFIG_TERM_VAL(TIME, time, term->val.num);
break;
case PARSE_EVENTS__TERM_TYPE_CALLGRAPH:
- ADD_CONFIG_TERM(CALLGRAPH, callgraph, term->val.str);
+ ADD_CONFIG_TERM_STR(CALLGRAPH, callgraph, term->val.str);
break;
case PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE:
- ADD_CONFIG_TERM(BRANCH, branch, term->val.str);
+ ADD_CONFIG_TERM_STR(BRANCH, branch, term->val.str);
break;
case PARSE_EVENTS__TERM_TYPE_STACKSIZE:
- ADD_CONFIG_TERM(STACK_USER, stack_user, term->val.num);
+ ADD_CONFIG_TERM_VAL(STACK_USER, stack_user, term->val.num);
break;
case PARSE_EVENTS__TERM_TYPE_INHERIT:
- ADD_CONFIG_TERM(INHERIT, inherit, term->val.num ? 1 : 0);
+ ADD_CONFIG_TERM_VAL(INHERIT, inherit, term->val.num ? 1 : 0);
break;
case PARSE_EVENTS__TERM_TYPE_NOINHERIT:
- ADD_CONFIG_TERM(INHERIT, inherit, term->val.num ? 0 : 1);
+ ADD_CONFIG_TERM_VAL(INHERIT, inherit, term->val.num ? 0 : 1);
break;
case PARSE_EVENTS__TERM_TYPE_MAX_STACK:
- ADD_CONFIG_TERM(MAX_STACK, max_stack, term->val.num);
+ ADD_CONFIG_TERM_VAL(MAX_STACK, max_stack, term->val.num);
break;
case PARSE_EVENTS__TERM_TYPE_MAX_EVENTS:
- ADD_CONFIG_TERM(MAX_EVENTS, max_events, term->val.num);
+ ADD_CONFIG_TERM_VAL(MAX_EVENTS, max_events, term->val.num);
break;
case PARSE_EVENTS__TERM_TYPE_OVERWRITE:
- ADD_CONFIG_TERM(OVERWRITE, overwrite, term->val.num ? 1 : 0);
+ ADD_CONFIG_TERM_VAL(OVERWRITE, overwrite, term->val.num ? 1 : 0);
break;
case PARSE_EVENTS__TERM_TYPE_NOOVERWRITE:
- ADD_CONFIG_TERM(OVERWRITE, overwrite, term->val.num ? 0 : 1);
+ ADD_CONFIG_TERM_VAL(OVERWRITE, overwrite, term->val.num ? 0 : 1);
break;
case PARSE_EVENTS__TERM_TYPE_DRV_CFG:
- ADD_CONFIG_TERM(DRV_CFG, drv_cfg, term->val.str);
+ ADD_CONFIG_TERM_STR(DRV_CFG, drv_cfg, term->val.str);
break;
case PARSE_EVENTS__TERM_TYPE_PERCORE:
- ADD_CONFIG_TERM(PERCORE, percore,
- term->val.num ? true : false);
+ ADD_CONFIG_TERM_VAL(PERCORE, percore,
+ term->val.num ? true : false);
break;
case PARSE_EVENTS__TERM_TYPE_AUX_OUTPUT:
- ADD_CONFIG_TERM(AUX_OUTPUT, aux_output, term->val.num ? 1 : 0);
+ ADD_CONFIG_TERM_VAL(AUX_OUTPUT, aux_output, term->val.num ? 1 : 0);
break;
case PARSE_EVENTS__TERM_TYPE_AUX_SAMPLE_SIZE:
- ADD_CONFIG_TERM(AUX_SAMPLE_SIZE, aux_sample_size, term->val.num);
+ ADD_CONFIG_TERM_VAL(AUX_SAMPLE_SIZE, aux_sample_size, term->val.num);
break;
default:
break;
@@ -1322,7 +1335,7 @@ static int get_config_chgs(struct perf_pmu *pmu, struct list_head *head_config,
}
if (bits)
- ADD_CONFIG_TERM(CFG_CHG, cfg_chg, bits);
+ ADD_CONFIG_TERM_VAL(CFG_CHG, cfg_chg, bits);
#undef ADD_CONFIG_TERM
return 0;
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] perf parse: Copy string to perf_evsel_config_term
2020-01-07 3:18 [PATCH v2] perf parse: Copy string to perf_evsel_config_term Leo Yan
@ 2020-01-07 9:16 ` Jiri Olsa
2020-01-07 10:09 ` Leo Yan
0 siblings, 1 reply; 5+ messages in thread
From: Jiri Olsa @ 2020-01-07 9:16 UTC (permalink / raw)
To: Leo Yan
Cc: Arnaldo Carvalho de Melo, Jiri Olsa, Peter Zijlstra, Ingo Molnar,
Mark Rutland, Alexander Shishkin, Namhyung Kim, Ian Rogers,
Adrian Hunter, Andi Kleen, linux-kernel, Mathieu Poirier,
Mike Leach, Suzuki K Poulose
On Tue, Jan 07, 2020 at 11:18:28AM +0800, Leo Yan wrote:
> perf with CoreSight fails to record trace data with command:
>
> perf record -e cs_etm/@tmc_etr0/u --per-thread ls
> failed to set sink "" on event cs_etm/@tmc_etr0/u with 21 (Is a
> directory)/perf/
>
> This failure is root caused with the commit 1dc925568f01 ("perf
> parse: Add a deep delete for parse event terms").
>
> The log shows, cs_etm fails to parse the sink attribution; cs_etm event
> relies on the event configuration to pass sink name, but the event
> specific configuration data cannot be passed properly with flow:
>
> get_config_terms()
> ADD_CONFIG_TERM(DRV_CFG, drv_cfg, term->val.str);
> __t->val.drv_cfg = term->val.str;
> `> __t->val.drv_cfg is assigned to term->val.str;
>
> parse_events_terms__purge()
> parse_events_term__delete()
> zfree(&term->val.str);
> `> term->val.str is freed and assigned to NULL pointer;
>
> cs_etm_set_sink_attr()
> sink = __t->val.drv_cfg;
> `> sink string has been freed.
>
> To fix this issue, in the function get_config_terms(), this patch
> changes from directly assignment pointer value for the strings to
> use strdup() for allocation a new duplicate string for the cases:
>
> perf_evsel_config_term::val.callgraph
> perf_evsel_config_term::val.branch
> perf_evsel_config_term::val.drv_cfg.
>
> Fixes: 1dc925568f01 ("perf parse: Add a deep delete for parse event terms")
> Signed-off-by: Leo Yan <leo.yan@linaro.org>
> ---
> tools/perf/util/parse-events.c | 55 +++++++++++++++++++++-------------
> 1 file changed, 34 insertions(+), 21 deletions(-)
>
> diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> index ed7c008b9c8b..49b26504bee3 100644
> --- a/tools/perf/util/parse-events.c
> +++ b/tools/perf/util/parse-events.c
> @@ -1220,7 +1220,6 @@ static int get_config_terms(struct list_head *head_config,
> struct list_head *head_terms __maybe_unused)
> {
> #define ADD_CONFIG_TERM(__type, __name, __val) \
> -do { \
> struct perf_evsel_config_term *__t; \
> \
> __t = zalloc(sizeof(*__t)); \
> @@ -1229,9 +1228,23 @@ do { \
> \
> INIT_LIST_HEAD(&__t->list); \
> __t->type = PERF_EVSEL__CONFIG_TERM_ ## __type; \
> - __t->val.__name = __val; \
> __t->weak = term->weak; \
> - list_add_tail(&__t->list, head_terms); \
> + list_add_tail(&__t->list, head_terms)
> +
> +#define ADD_CONFIG_TERM_VAL(__type, __name, __val) \
> +do { \
> + ADD_CONFIG_TERM(__type, __name, __val); \
> + __t->val.__name = __val; \
> +} while (0)
> +
> +#define ADD_CONFIG_TERM_STR(__type, __name, __val) \
> +do { \
> + ADD_CONFIG_TERM(__type, __name, __val); \
> + __t->val.__name = strdup(__val); \
> + if (!__t->val.__name) { \
> + zfree(&__t); \
> + return -ENOMEM; \
> + } \
> } while (0)
hum, I did not check yesterday how we release perf_evsel_config_term
objects, but looks like now we need to release those pointers in here:
perf_evsel__free_config_terms
jirka
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] perf parse: Copy string to perf_evsel_config_term
2020-01-07 9:16 ` Jiri Olsa
@ 2020-01-07 10:09 ` Leo Yan
2020-01-07 10:28 ` Jiri Olsa
0 siblings, 1 reply; 5+ messages in thread
From: Leo Yan @ 2020-01-07 10:09 UTC (permalink / raw)
To: Jiri Olsa
Cc: Arnaldo Carvalho de Melo, Jiri Olsa, Peter Zijlstra, Ingo Molnar,
Mark Rutland, Alexander Shishkin, Namhyung Kim, Ian Rogers,
Adrian Hunter, Andi Kleen, linux-kernel, Mathieu Poirier,
Mike Leach, Suzuki K Poulose
On Tue, Jan 07, 2020 at 10:16:09AM +0100, Jiri Olsa wrote:
[...]
> > diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> > index ed7c008b9c8b..49b26504bee3 100644
> > --- a/tools/perf/util/parse-events.c
> > +++ b/tools/perf/util/parse-events.c
> > @@ -1220,7 +1220,6 @@ static int get_config_terms(struct list_head *head_config,
> > struct list_head *head_terms __maybe_unused)
> > {
> > #define ADD_CONFIG_TERM(__type, __name, __val) \
> > -do { \
> > struct perf_evsel_config_term *__t; \
> > \
> > __t = zalloc(sizeof(*__t)); \
> > @@ -1229,9 +1228,23 @@ do { \
> > \
> > INIT_LIST_HEAD(&__t->list); \
> > __t->type = PERF_EVSEL__CONFIG_TERM_ ## __type; \
> > - __t->val.__name = __val; \
> > __t->weak = term->weak; \
> > - list_add_tail(&__t->list, head_terms); \
> > + list_add_tail(&__t->list, head_terms)
> > +
> > +#define ADD_CONFIG_TERM_VAL(__type, __name, __val) \
> > +do { \
> > + ADD_CONFIG_TERM(__type, __name, __val); \
> > + __t->val.__name = __val; \
> > +} while (0)
> > +
> > +#define ADD_CONFIG_TERM_STR(__type, __name, __val) \
> > +do { \
> > + ADD_CONFIG_TERM(__type, __name, __val); \
> > + __t->val.__name = strdup(__val); \
> > + if (!__t->val.__name) { \
> > + zfree(&__t); \
> > + return -ENOMEM; \
> > + } \
> > } while (0)
>
> hum, I did not check yesterday how we release perf_evsel_config_term
> objects, but looks like now we need to release those pointers in here:
> perf_evsel__free_config_terms
My bad! I did some check for releasing but missed this function.
Will spin a new patch for this. Since '__t->val' is an union type, so
for the releasing, I think we need to use below code.
Please let me know if this is okay for you?
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index a69e64236120..fc659cdbd3ce 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1264,7 +1264,19 @@ static void perf_evsel__free_config_terms(struct evsel *evsel)
struct perf_evsel_config_term *term, *h;
list_for_each_entry_safe(term, h, &evsel->config_terms, list) {
+ int type = term->type;
+
list_del_init(&term->list);
+
+ if (type == PARSE_EVENTS__TERM_TYPE_CALLGRAPH)
+ zfree(&term->val.callgraph);
+
+ if (type == PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE)
+ zfree(&term->val.branch);
+
+ if (type == PARSE_EVENTS__TERM_TYPE_DRV_CFG)
+ zfree(&term->val.drv_cfg);
+
free(term);
}
}
Thanks,
Leo
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] perf parse: Copy string to perf_evsel_config_term
2020-01-07 10:09 ` Leo Yan
@ 2020-01-07 10:28 ` Jiri Olsa
2020-01-07 11:42 ` Leo Yan
0 siblings, 1 reply; 5+ messages in thread
From: Jiri Olsa @ 2020-01-07 10:28 UTC (permalink / raw)
To: Leo Yan
Cc: Arnaldo Carvalho de Melo, Jiri Olsa, Peter Zijlstra, Ingo Molnar,
Mark Rutland, Alexander Shishkin, Namhyung Kim, Ian Rogers,
Adrian Hunter, Andi Kleen, linux-kernel, Mathieu Poirier,
Mike Leach, Suzuki K Poulose
On Tue, Jan 07, 2020 at 06:09:06PM +0800, Leo Yan wrote:
> On Tue, Jan 07, 2020 at 10:16:09AM +0100, Jiri Olsa wrote:
>
> [...]
>
> > > diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> > > index ed7c008b9c8b..49b26504bee3 100644
> > > --- a/tools/perf/util/parse-events.c
> > > +++ b/tools/perf/util/parse-events.c
> > > @@ -1220,7 +1220,6 @@ static int get_config_terms(struct list_head *head_config,
> > > struct list_head *head_terms __maybe_unused)
> > > {
> > > #define ADD_CONFIG_TERM(__type, __name, __val) \
> > > -do { \
> > > struct perf_evsel_config_term *__t; \
> > > \
> > > __t = zalloc(sizeof(*__t)); \
> > > @@ -1229,9 +1228,23 @@ do { \
> > > \
> > > INIT_LIST_HEAD(&__t->list); \
> > > __t->type = PERF_EVSEL__CONFIG_TERM_ ## __type; \
> > > - __t->val.__name = __val; \
> > > __t->weak = term->weak; \
> > > - list_add_tail(&__t->list, head_terms); \
> > > + list_add_tail(&__t->list, head_terms)
> > > +
> > > +#define ADD_CONFIG_TERM_VAL(__type, __name, __val) \
> > > +do { \
> > > + ADD_CONFIG_TERM(__type, __name, __val); \
> > > + __t->val.__name = __val; \
> > > +} while (0)
> > > +
> > > +#define ADD_CONFIG_TERM_STR(__type, __name, __val) \
> > > +do { \
> > > + ADD_CONFIG_TERM(__type, __name, __val); \
> > > + __t->val.__name = strdup(__val); \
> > > + if (!__t->val.__name) { \
> > > + zfree(&__t); \
> > > + return -ENOMEM; \
> > > + } \
> > > } while (0)
> >
> > hum, I did not check yesterday how we release perf_evsel_config_term
> > objects, but looks like now we need to release those pointers in here:
> > perf_evsel__free_config_terms
>
> My bad! I did some check for releasing but missed this function.
>
> Will spin a new patch for this. Since '__t->val' is an union type, so
> for the releasing, I think we need to use below code.
>
> Please let me know if this is okay for you?
>
> diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
> index a69e64236120..fc659cdbd3ce 100644
> --- a/tools/perf/util/evsel.c
> +++ b/tools/perf/util/evsel.c
> @@ -1264,7 +1264,19 @@ static void perf_evsel__free_config_terms(struct evsel *evsel)
> struct perf_evsel_config_term *term, *h;
>
> list_for_each_entry_safe(term, h, &evsel->config_terms, list) {
> + int type = term->type;
> +
> list_del_init(&term->list);
> +
> + if (type == PARSE_EVENTS__TERM_TYPE_CALLGRAPH)
> + zfree(&term->val.callgraph);
> +
> + if (type == PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE)
> + zfree(&term->val.branch);
> +
> + if (type == PARSE_EVENTS__TERM_TYPE_DRV_CFG)
> + zfree(&term->val.drv_cfg);
> +
> free(term);
> }
we would need to update perf_evsel__free_config_terms all the time
we add new term.. which does not happen too often, but that's another
reason we will probably forget that ;-)
I wonder we could make it generic with the 'char*' pointer in
the val union like in the below.. totaly untested
also we might not need to pass __name to ADD_CONFIG_TERM_STR
and ADD_CONFIG_TERM any more and just initialize 'str' pointer
jirka
---
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index a69e64236120..ab9925cc1aa7 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1265,6 +1265,8 @@ static void perf_evsel__free_config_terms(struct evsel *evsel)
list_for_each_entry_safe(term, h, &evsel->config_terms, list) {
list_del_init(&term->list);
+ if (term->free_str)
+ free(term->val.str);
free(term);
}
}
diff --git a/tools/perf/util/evsel_config.h b/tools/perf/util/evsel_config.h
index 1f8d2fe0b66e..dfc28738e071 100644
--- a/tools/perf/util/evsel_config.h
+++ b/tools/perf/util/evsel_config.h
@@ -32,6 +32,7 @@ enum evsel_term_type {
struct perf_evsel_config_term {
struct list_head list;
enum evsel_term_type type;
+ bool free_str;
union {
u64 period;
u64 freq;
@@ -48,6 +49,7 @@ struct perf_evsel_config_term {
bool aux_output;
u32 aux_sample_size;
u64 cfg_chg;
+ char *str;
} val;
bool weak;
};
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 49b26504bee3..83fb149b9485 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1245,6 +1245,7 @@ do { \
zfree(&__t); \
return -ENOMEM; \
} \
+ __t->free_str = true; \
} while (0)
struct parse_events_term *term;
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] perf parse: Copy string to perf_evsel_config_term
2020-01-07 10:28 ` Jiri Olsa
@ 2020-01-07 11:42 ` Leo Yan
0 siblings, 0 replies; 5+ messages in thread
From: Leo Yan @ 2020-01-07 11:42 UTC (permalink / raw)
To: Jiri Olsa
Cc: Arnaldo Carvalho de Melo, Jiri Olsa, Peter Zijlstra, Ingo Molnar,
Mark Rutland, Alexander Shishkin, Namhyung Kim, Ian Rogers,
Adrian Hunter, Andi Kleen, linux-kernel, Mathieu Poirier,
Mike Leach, Suzuki K Poulose
Hi Jiri,
On Tue, Jan 07, 2020 at 11:28:48AM +0100, Jiri Olsa wrote:
> On Tue, Jan 07, 2020 at 06:09:06PM +0800, Leo Yan wrote:
> > On Tue, Jan 07, 2020 at 10:16:09AM +0100, Jiri Olsa wrote:
> >
> > [...]
> >
> > > > diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> > > > index ed7c008b9c8b..49b26504bee3 100644
> > > > --- a/tools/perf/util/parse-events.c
> > > > +++ b/tools/perf/util/parse-events.c
> > > > @@ -1220,7 +1220,6 @@ static int get_config_terms(struct list_head *head_config,
> > > > struct list_head *head_terms __maybe_unused)
> > > > {
> > > > #define ADD_CONFIG_TERM(__type, __name, __val) \
> > > > -do { \
> > > > struct perf_evsel_config_term *__t; \
> > > > \
> > > > __t = zalloc(sizeof(*__t)); \
> > > > @@ -1229,9 +1228,23 @@ do { \
> > > > \
> > > > INIT_LIST_HEAD(&__t->list); \
> > > > __t->type = PERF_EVSEL__CONFIG_TERM_ ## __type; \
> > > > - __t->val.__name = __val; \
> > > > __t->weak = term->weak; \
> > > > - list_add_tail(&__t->list, head_terms); \
> > > > + list_add_tail(&__t->list, head_terms)
> > > > +
> > > > +#define ADD_CONFIG_TERM_VAL(__type, __name, __val) \
> > > > +do { \
> > > > + ADD_CONFIG_TERM(__type, __name, __val); \
> > > > + __t->val.__name = __val; \
> > > > +} while (0)
> > > > +
> > > > +#define ADD_CONFIG_TERM_STR(__type, __name, __val) \
> > > > +do { \
> > > > + ADD_CONFIG_TERM(__type, __name, __val); \
> > > > + __t->val.__name = strdup(__val); \
> > > > + if (!__t->val.__name) { \
> > > > + zfree(&__t); \
> > > > + return -ENOMEM; \
> > > > + } \
> > > > } while (0)
> > >
> > > hum, I did not check yesterday how we release perf_evsel_config_term
> > > objects, but looks like now we need to release those pointers in here:
> > > perf_evsel__free_config_terms
> >
> > My bad! I did some check for releasing but missed this function.
> >
> > Will spin a new patch for this. Since '__t->val' is an union type, so
> > for the releasing, I think we need to use below code.
> >
> > Please let me know if this is okay for you?
> >
> > diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
> > index a69e64236120..fc659cdbd3ce 100644
> > --- a/tools/perf/util/evsel.c
> > +++ b/tools/perf/util/evsel.c
> > @@ -1264,7 +1264,19 @@ static void perf_evsel__free_config_terms(struct evsel *evsel)
> > struct perf_evsel_config_term *term, *h;
> >
> > list_for_each_entry_safe(term, h, &evsel->config_terms, list) {
> > + int type = term->type;
> > +
> > list_del_init(&term->list);
> > +
> > + if (type == PARSE_EVENTS__TERM_TYPE_CALLGRAPH)
> > + zfree(&term->val.callgraph);
> > +
> > + if (type == PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE)
> > + zfree(&term->val.branch);
> > +
> > + if (type == PARSE_EVENTS__TERM_TYPE_DRV_CFG)
> > + zfree(&term->val.drv_cfg);
> > +
> > free(term);
> > }
>
> we would need to update perf_evsel__free_config_terms all the time
> we add new term.. which does not happen too often, but that's another
> reason we will probably forget that ;-)
>
> I wonder we could make it generic with the 'char*' pointer in
> the val union like in the below.. totaly untested
>
> also we might not need to pass __name to ADD_CONFIG_TERM_STR
> and ADD_CONFIG_TERM any more and just initialize 'str' pointer
Makes sense. Will spin a new patch with following this idea and send
out soon.
Thanks a lot for suggestions!
Leo
> ---
> diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
> index a69e64236120..ab9925cc1aa7 100644
> --- a/tools/perf/util/evsel.c
> +++ b/tools/perf/util/evsel.c
> @@ -1265,6 +1265,8 @@ static void perf_evsel__free_config_terms(struct evsel *evsel)
>
> list_for_each_entry_safe(term, h, &evsel->config_terms, list) {
> list_del_init(&term->list);
> + if (term->free_str)
> + free(term->val.str);
> free(term);
> }
> }
> diff --git a/tools/perf/util/evsel_config.h b/tools/perf/util/evsel_config.h
> index 1f8d2fe0b66e..dfc28738e071 100644
> --- a/tools/perf/util/evsel_config.h
> +++ b/tools/perf/util/evsel_config.h
> @@ -32,6 +32,7 @@ enum evsel_term_type {
> struct perf_evsel_config_term {
> struct list_head list;
> enum evsel_term_type type;
> + bool free_str;
> union {
> u64 period;
> u64 freq;
> @@ -48,6 +49,7 @@ struct perf_evsel_config_term {
> bool aux_output;
> u32 aux_sample_size;
> u64 cfg_chg;
> + char *str;
> } val;
> bool weak;
> };
> diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> index 49b26504bee3..83fb149b9485 100644
> --- a/tools/perf/util/parse-events.c
> +++ b/tools/perf/util/parse-events.c
> @@ -1245,6 +1245,7 @@ do { \
> zfree(&__t); \
> return -ENOMEM; \
> } \
> + __t->free_str = true; \
> } while (0)
>
> struct parse_events_term *term;
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-01-07 11:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-07 3:18 [PATCH v2] perf parse: Copy string to perf_evsel_config_term Leo Yan
2020-01-07 9:16 ` Jiri Olsa
2020-01-07 10:09 ` Leo Yan
2020-01-07 10:28 ` Jiri Olsa
2020-01-07 11:42 ` Leo Yan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).