AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

libperf: Add PERF_RECORD_AUXTRACE_INFO 'struct auxtrace_info_event' to perf/event.h

Browse Source 
Move the PERF_RECORD_AUXTRACE_INFO event definition to libperf's
event.h.

In order to keep libperf simple, we switch 'u64/u32/u16/u8' types used
events to their generic '__u*' versions.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190828135717.7245-9-jolsa@kernel.org
[ Fix cs_etm__print_auxtrace_info() arg to be __u64 too to fix the CORESIGHT=1 build ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2019-08-28 15:57:02 +02:00 committed by Arnaldo Carvalho de Melo
parent fecb410030
commit 9a8dad0419
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/arch/x86/util/intel-pt.c
View File

@ -328,7 +328,7 @@ static int intel_pt_info_fill(struct auxtrace_record *itr,
unsigned long max_non_turbo_ratio; unsigned long max_non_turbo_ratio;
size_t filter_str_len; size_t filter_str_len;
const char *filter; const char *filter;
u64 *info; __u64 *info;
int err; int err;
if (priv_size != ptr->priv_size) if (priv_size != ptr->priv_size)

7
tools/perf/lib/include/perf/event.h
View File

@ -201,4 +201,11 @@ struct id_index_event {
struct id_index_entry entries[0]; struct id_index_entry entries[0];
}; };
struct auxtrace_info_event {
struct perf_event_header header;
__u32 type;
__u32 reserved__; /* For alignment */
__u64 priv[];
};
#endif /* __LIBPERF_EVENT_H */ #endif /* __LIBPERF_EVENT_H */

2
tools/perf/util/arm-spe.c
View File

@ -181,7 +181,7 @@ static const char * const arm_spe_info_fmts[] = {
[ARM_SPE_PMU_TYPE] = " PMU Type %"PRId64"\n", [ARM_SPE_PMU_TYPE] = " PMU Type %"PRId64"\n",
}; };
static void arm_spe_print_info(u64 *arr) static void arm_spe_print_info(__u64 *arr)
{ {
if (!dump_trace) if (!dump_trace)
return; return;

2
tools/perf/util/cs-etm.c
View File

@ -2370,7 +2370,7 @@ static const char * const cs_etmv4_priv_fmts[] = {
[CS_ETMV4_TRCAUTHSTATUS] = " TRCAUTHSTATUS %llx\n", [CS_ETMV4_TRCAUTHSTATUS] = " TRCAUTHSTATUS %llx\n",
}; };
static void cs_etm__print_auxtrace_info(u64 *val, int num) static void cs_etm__print_auxtrace_info(__u64 *val, int num)
{ {
int i, j, cpu = 0; int i, j, cpu = 0;

7
tools/perf/util/event.h
View File

@ -332,13 +332,6 @@ struct events_stats {
u32 nr_proc_map_timeout; u32 nr_proc_map_timeout;
}; };
struct auxtrace_info_event {
struct perf_event_header header;
u32 type;
u32 reserved__; /* For alignment */
u64 priv[];
};
struct auxtrace_event { struct auxtrace_event {
struct perf_event_header header; struct perf_event_header header;
u64 size; u64 size;

2
tools/perf/util/intel-bts.c
View File

@ -834,7 +834,7 @@ static const char * const intel_bts_info_fmts[] = {
[INTEL_BTS_SNAPSHOT_MODE] = " Snapshot mode %"PRId64"\n", [INTEL_BTS_SNAPSHOT_MODE] = " Snapshot mode %"PRId64"\n",
}; };
static void intel_bts_print_info(u64 *arr, int start, int finish) static void intel_bts_print_info(__u64 *arr, int start, int finish)
{ {
int i; int i;

4
tools/perf/util/intel-pt.c
View File

@ -3044,7 +3044,7 @@ static const char * const intel_pt_info_fmts[] = {
[INTEL_PT_FILTER_STR_LEN] = " Filter string len. %"PRIu64"\n", [INTEL_PT_FILTER_STR_LEN] = " Filter string len. %"PRIu64"\n",
}; };
static void intel_pt_print_info(u64 *arr, int start, int finish) static void intel_pt_print_info(__u64 *arr, int start, int finish)
{ {
int i; int i;
@ -3076,7 +3076,7 @@ int intel_pt_process_auxtrace_info(union perf_event *event,
size_t min_sz = sizeof(u64) * INTEL_PT_PER_CPU_MMAPS; size_t min_sz = sizeof(u64) * INTEL_PT_PER_CPU_MMAPS;
struct intel_pt *pt; struct intel_pt *pt;
void *info_end; void *info_end;
u64 *info; __u64 *info;
int err; int err;
if (auxtrace_info->header.size < sizeof(struct auxtrace_info_event) + if (auxtrace_info->header.size < sizeof(struct auxtrace_info_event) +