mirror of
https://github.com/torvalds/linux
synced 2024-10-17 08:46:50 +00:00
3220fb8d5e
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 commit1dc925568f("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, term->val.str); __t->val.str = term->val.str; `> __t->val.str 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.str; `> sink string has been freed. To fix this issue, in the function get_config_terms(), this patch changes to use strdup() for allocation a new duplicate string rather than directly assignment string pointer. This patch addes a new field 'free_str' in the data structure perf_evsel_config_term; 'free_str' is set to true when the union is used as a string pointer; thus it can tell perf_evsel__free_config_terms() to free the string. Fixes:1dc925568f("perf parse: Add a deep delete for parse event terms") Suggested-by: Jiri Olsa <jolsa@kernel.org> Signed-off-by: Leo Yan <leo.yan@linaro.org> Acked-by: Jiri Olsa <jolsa@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Suzuki Poulouse <suzuki.poulose@arm.com> Cc: linux-arm-kernel@lists.infradead.org Link: http://lore.kernel.org/lkml/20200117055251.24058-2-leo.yan@linaro.org [ Use zfree() in perf_evsel__free_config_terms ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> :# modified: tools/perf/util/evsel_config.h
63 lines
1.6 KiB
C
63 lines
1.6 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#ifndef __PERF_EVSEL_CONFIG_H
|
|
#define __PERF_EVSEL_CONFIG_H 1
|
|
|
|
#include <linux/types.h>
|
|
#include <stdbool.h>
|
|
|
|
/*
|
|
* The 'struct perf_evsel_config_term' is used to pass event
|
|
* specific configuration data to perf_evsel__config routine.
|
|
* It is allocated within event parsing and attached to
|
|
* perf_evsel::config_terms list head.
|
|
*/
|
|
enum evsel_term_type {
|
|
PERF_EVSEL__CONFIG_TERM_PERIOD,
|
|
PERF_EVSEL__CONFIG_TERM_FREQ,
|
|
PERF_EVSEL__CONFIG_TERM_TIME,
|
|
PERF_EVSEL__CONFIG_TERM_CALLGRAPH,
|
|
PERF_EVSEL__CONFIG_TERM_STACK_USER,
|
|
PERF_EVSEL__CONFIG_TERM_INHERIT,
|
|
PERF_EVSEL__CONFIG_TERM_MAX_STACK,
|
|
PERF_EVSEL__CONFIG_TERM_MAX_EVENTS,
|
|
PERF_EVSEL__CONFIG_TERM_OVERWRITE,
|
|
PERF_EVSEL__CONFIG_TERM_DRV_CFG,
|
|
PERF_EVSEL__CONFIG_TERM_BRANCH,
|
|
PERF_EVSEL__CONFIG_TERM_PERCORE,
|
|
PERF_EVSEL__CONFIG_TERM_AUX_OUTPUT,
|
|
PERF_EVSEL__CONFIG_TERM_AUX_SAMPLE_SIZE,
|
|
PERF_EVSEL__CONFIG_TERM_CFG_CHG,
|
|
};
|
|
|
|
struct perf_evsel_config_term {
|
|
struct list_head list;
|
|
enum evsel_term_type type;
|
|
bool free_str;
|
|
union {
|
|
u64 period;
|
|
u64 freq;
|
|
bool time;
|
|
u64 stack_user;
|
|
int max_stack;
|
|
bool inherit;
|
|
bool overwrite;
|
|
unsigned long max_events;
|
|
bool percore;
|
|
bool aux_output;
|
|
u32 aux_sample_size;
|
|
u64 cfg_chg;
|
|
char *str;
|
|
} val;
|
|
bool weak;
|
|
};
|
|
|
|
struct evsel;
|
|
|
|
struct perf_evsel_config_term *__perf_evsel__get_config_term(struct evsel *evsel,
|
|
enum evsel_term_type type);
|
|
|
|
#define perf_evsel__get_config_term(evsel, type) \
|
|
__perf_evsel__get_config_term(evsel, PERF_EVSEL__CONFIG_TERM_ ## type)
|
|
|
|
#endif // __PERF_EVSEL_CONFIG_H
|