perf record: Add support for PERF_SAMPLE_CODE_PAGE_SIZE
Adds the infrastructure to sample the code address page size. Introduce a new --code-page-size option for perf record. Signed-off-by: Kan Liang <kan.liang@linux.intel.com> Originally-by: Stephane Eranian <eranian@google.com> Acked-by: Jiri Olsa <jolsa@redhat.com> Acked-by: Namhyung Kim <namhyung@kernel.org> Cc: Andi Kleen <ak@linux.intel.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Will Deacon <will@kernel.org> Link: https://lore.kernel.org/r/20210105195752.43489-4-kan.liang@linux.intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Родитель
06280e3b15
Коммит
c1de7f3d84
|
@ -296,6 +296,9 @@ OPTIONS
|
||||||
--data-page-size::
|
--data-page-size::
|
||||||
Record the sampled data address data page size.
|
Record the sampled data address data page size.
|
||||||
|
|
||||||
|
--code-page-size::
|
||||||
|
Record the sampled code address (ip) page size
|
||||||
|
|
||||||
-T::
|
-T::
|
||||||
--timestamp::
|
--timestamp::
|
||||||
Record the sample timestamps. Use it with 'perf report -D' to see the
|
Record the sample timestamps. Use it with 'perf report -D' to see the
|
||||||
|
|
|
@ -2477,6 +2477,8 @@ static struct option __record_options[] = {
|
||||||
"Record the sample physical addresses"),
|
"Record the sample physical addresses"),
|
||||||
OPT_BOOLEAN(0, "data-page-size", &record.opts.sample_data_page_size,
|
OPT_BOOLEAN(0, "data-page-size", &record.opts.sample_data_page_size,
|
||||||
"Record the sampled data address data page size"),
|
"Record the sampled data address data page size"),
|
||||||
|
OPT_BOOLEAN(0, "code-page-size", &record.opts.sample_code_page_size,
|
||||||
|
"Record the sampled code address (ip) page size"),
|
||||||
OPT_BOOLEAN(0, "sample-cpu", &record.opts.sample_cpu, "Record the sample cpu"),
|
OPT_BOOLEAN(0, "sample-cpu", &record.opts.sample_cpu, "Record the sample cpu"),
|
||||||
OPT_BOOLEAN_SET('T', "timestamp", &record.opts.sample_time,
|
OPT_BOOLEAN_SET('T', "timestamp", &record.opts.sample_time,
|
||||||
&record.opts.sample_time_set,
|
&record.opts.sample_time_set,
|
||||||
|
|
|
@ -136,6 +136,7 @@ struct perf_sample {
|
||||||
u64 data_src;
|
u64 data_src;
|
||||||
u64 phys_addr;
|
u64 phys_addr;
|
||||||
u64 data_page_size;
|
u64 data_page_size;
|
||||||
|
u64 code_page_size;
|
||||||
u64 cgroup;
|
u64 cgroup;
|
||||||
u32 flags;
|
u32 flags;
|
||||||
u16 insn_len;
|
u16 insn_len;
|
||||||
|
|
|
@ -1195,6 +1195,9 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts,
|
||||||
if (opts->sample_data_page_size)
|
if (opts->sample_data_page_size)
|
||||||
evsel__set_sample_bit(evsel, DATA_PAGE_SIZE);
|
evsel__set_sample_bit(evsel, DATA_PAGE_SIZE);
|
||||||
|
|
||||||
|
if (opts->sample_code_page_size)
|
||||||
|
evsel__set_sample_bit(evsel, CODE_PAGE_SIZE);
|
||||||
|
|
||||||
if (opts->record_switch_events)
|
if (opts->record_switch_events)
|
||||||
attr->context_switch = track;
|
attr->context_switch = track;
|
||||||
|
|
||||||
|
@ -1880,7 +1883,12 @@ try_fallback:
|
||||||
* Must probe features in the order they were added to the
|
* Must probe features in the order they were added to the
|
||||||
* perf_event_attr interface.
|
* perf_event_attr interface.
|
||||||
*/
|
*/
|
||||||
if (!perf_missing_features.data_page_size &&
|
if (!perf_missing_features.code_page_size &&
|
||||||
|
(evsel->core.attr.sample_type & PERF_SAMPLE_CODE_PAGE_SIZE)) {
|
||||||
|
perf_missing_features.code_page_size = true;
|
||||||
|
pr_debug2_peo("Kernel has no PERF_SAMPLE_CODE_PAGE_SIZE support, bailing out\n");
|
||||||
|
goto out_close;
|
||||||
|
} else if (!perf_missing_features.data_page_size &&
|
||||||
(evsel->core.attr.sample_type & PERF_SAMPLE_DATA_PAGE_SIZE)) {
|
(evsel->core.attr.sample_type & PERF_SAMPLE_DATA_PAGE_SIZE)) {
|
||||||
perf_missing_features.data_page_size = true;
|
perf_missing_features.data_page_size = true;
|
||||||
pr_debug2_peo("Kernel has no PERF_SAMPLE_DATA_PAGE_SIZE support, bailing out\n");
|
pr_debug2_peo("Kernel has no PERF_SAMPLE_DATA_PAGE_SIZE support, bailing out\n");
|
||||||
|
@ -2376,6 +2384,12 @@ int evsel__parse_sample(struct evsel *evsel, union perf_event *event,
|
||||||
array++;
|
array++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
data->code_page_size = 0;
|
||||||
|
if (type & PERF_SAMPLE_CODE_PAGE_SIZE) {
|
||||||
|
data->code_page_size = *array;
|
||||||
|
array++;
|
||||||
|
}
|
||||||
|
|
||||||
if (type & PERF_SAMPLE_AUX) {
|
if (type & PERF_SAMPLE_AUX) {
|
||||||
OVERFLOW_CHECK_u64(array);
|
OVERFLOW_CHECK_u64(array);
|
||||||
sz = *array++;
|
sz = *array++;
|
||||||
|
@ -2685,6 +2699,8 @@ int evsel__open_strerror(struct evsel *evsel, struct target *target,
|
||||||
"We found oprofile daemon running, please stop it and try again.");
|
"We found oprofile daemon running, please stop it and try again.");
|
||||||
break;
|
break;
|
||||||
case EINVAL:
|
case EINVAL:
|
||||||
|
if (evsel->core.attr.sample_type & PERF_SAMPLE_CODE_PAGE_SIZE && perf_missing_features.code_page_size)
|
||||||
|
return scnprintf(msg, size, "Asking for the code page size isn't supported by this kernel.");
|
||||||
if (evsel->core.attr.sample_type & PERF_SAMPLE_DATA_PAGE_SIZE && perf_missing_features.data_page_size)
|
if (evsel->core.attr.sample_type & PERF_SAMPLE_DATA_PAGE_SIZE && perf_missing_features.data_page_size)
|
||||||
return scnprintf(msg, size, "Asking for the data page size isn't supported by this kernel.");
|
return scnprintf(msg, size, "Asking for the data page size isn't supported by this kernel.");
|
||||||
if (evsel->core.attr.write_backward && perf_missing_features.write_backward)
|
if (evsel->core.attr.write_backward && perf_missing_features.write_backward)
|
||||||
|
|
|
@ -149,6 +149,7 @@ struct perf_missing_features {
|
||||||
bool branch_hw_idx;
|
bool branch_hw_idx;
|
||||||
bool cgroup;
|
bool cgroup;
|
||||||
bool data_page_size;
|
bool data_page_size;
|
||||||
|
bool code_page_size;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern struct perf_missing_features perf_missing_features;
|
extern struct perf_missing_features perf_missing_features;
|
||||||
|
|
|
@ -35,7 +35,7 @@ static void __p_sample_type(char *buf, size_t size, u64 value)
|
||||||
bit_name(BRANCH_STACK), bit_name(REGS_USER), bit_name(STACK_USER),
|
bit_name(BRANCH_STACK), bit_name(REGS_USER), bit_name(STACK_USER),
|
||||||
bit_name(IDENTIFIER), bit_name(REGS_INTR), bit_name(DATA_SRC),
|
bit_name(IDENTIFIER), bit_name(REGS_INTR), bit_name(DATA_SRC),
|
||||||
bit_name(WEIGHT), bit_name(PHYS_ADDR), bit_name(AUX),
|
bit_name(WEIGHT), bit_name(PHYS_ADDR), bit_name(AUX),
|
||||||
bit_name(CGROUP), bit_name(DATA_PAGE_SIZE),
|
bit_name(CGROUP), bit_name(DATA_PAGE_SIZE), bit_name(CODE_PAGE_SIZE),
|
||||||
{ .name = NULL, }
|
{ .name = NULL, }
|
||||||
};
|
};
|
||||||
#undef bit_name
|
#undef bit_name
|
||||||
|
|
|
@ -23,6 +23,7 @@ struct record_opts {
|
||||||
bool sample_address;
|
bool sample_address;
|
||||||
bool sample_phys_addr;
|
bool sample_phys_addr;
|
||||||
bool sample_data_page_size;
|
bool sample_data_page_size;
|
||||||
|
bool sample_code_page_size;
|
||||||
bool sample_weight;
|
bool sample_weight;
|
||||||
bool sample_time;
|
bool sample_time;
|
||||||
bool sample_time_set;
|
bool sample_time_set;
|
||||||
|
|
|
@ -1473,6 +1473,9 @@ size_t perf_event__sample_event_size(const struct perf_sample *sample, u64 type,
|
||||||
if (type & PERF_SAMPLE_DATA_PAGE_SIZE)
|
if (type & PERF_SAMPLE_DATA_PAGE_SIZE)
|
||||||
result += sizeof(u64);
|
result += sizeof(u64);
|
||||||
|
|
||||||
|
if (type & PERF_SAMPLE_CODE_PAGE_SIZE)
|
||||||
|
result += sizeof(u64);
|
||||||
|
|
||||||
if (type & PERF_SAMPLE_AUX) {
|
if (type & PERF_SAMPLE_AUX) {
|
||||||
result += sizeof(u64);
|
result += sizeof(u64);
|
||||||
result += sample->aux_sample.size;
|
result += sample->aux_sample.size;
|
||||||
|
@ -1657,6 +1660,11 @@ int perf_event__synthesize_sample(union perf_event *event, u64 type, u64 read_fo
|
||||||
array++;
|
array++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (type & PERF_SAMPLE_CODE_PAGE_SIZE) {
|
||||||
|
*array = sample->code_page_size;
|
||||||
|
array++;
|
||||||
|
}
|
||||||
|
|
||||||
if (type & PERF_SAMPLE_AUX) {
|
if (type & PERF_SAMPLE_AUX) {
|
||||||
sz = sample->aux_sample.size;
|
sz = sample->aux_sample.size;
|
||||||
*array++ = sz;
|
*array++ = sz;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче