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>

diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt
index 0042ff7f6f331c606509626dd1d4520cf425dd2b..9087b223e3249ce4294a49590845c1340ecdd4cf 100644 (file)
--- a/tools/perf/Documentation/perf-record.txt
+++ b/tools/perf/Documentation/perf-record.txt
@@ -296,6 +296,9 @@ OPTIONS
 --data-page-size::
        Record the sampled data address data page size.
 
+--code-page-size::
+       Record the sampled code address (ip) page size
+
 -T::
 --timestamp::
        Record the sample timestamps. Use it with 'perf report -D' to see the

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 7bb10e9863bd84562486f76650b1df4b5c41b184..7704c33bfe316c9cbba76e1f0fd3b87669eac4e6 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -2477,6 +2477,8 @@ static struct option __record_options[] = {
                    "Record the sample physical addresses"),
        OPT_BOOLEAN(0, "data-page-size", &record.opts.sample_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_SET('T', "timestamp", &record.opts.sample_time,
                        &record.opts.sample_time_set,

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index ff403ea578e1151201757bef30e863a9b46b271b..2afea7247dd30aa007e806a6fb4b2b9e79b20b0b 100644 (file)
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -136,6 +136,7 @@ struct perf_sample {
        u64 data_src;
        u64 phys_addr;
        u64 data_page_size;
+       u64 code_page_size;
        u64 cgroup;
        u32 flags;
        u16 insn_len;

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index f6668ece71d7cb8e4892b45431282a0c9a4a1761..8b18ec56e266e9aca79324e2b2edda41159c6cb9 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1195,6 +1195,9 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts,
        if (opts->sample_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)
                attr->context_switch = track;
 
@@ -1880,7 +1883,12 @@ try_fallback:
         * Must probe features in the order they were added to the
         * 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)) {
                perf_missing_features.data_page_size = true;
                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++;
        }
 
+       data->code_page_size = 0;
+       if (type & PERF_SAMPLE_CODE_PAGE_SIZE) {
+               data->code_page_size = *array;
+               array++;
+       }
+
        if (type & PERF_SAMPLE_AUX) {
                OVERFLOW_CHECK_u64(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.");
                break;
        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)
                        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)

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 8226b1fefa8cf2a33a7d7ec35ceb14fed48ea7a1..e25594494cf628677a34807121f8480318196a0c 100644 (file)
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -149,6 +149,7 @@ struct perf_missing_features {
        bool branch_hw_idx;
        bool cgroup;
        bool data_page_size;
+       bool code_page_size;
 };
 
 extern struct perf_missing_features perf_missing_features;

diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c
index 22b417f434706ba792206eb9c4405182d4f69004..1bd6cfd74257d102c56f563932f985523ec8ff07 100644 (file)
--- a/tools/perf/util/perf_event_attr_fprintf.c
+++ b/tools/perf/util/perf_event_attr_fprintf.c
@@ -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(IDENTIFIER), bit_name(REGS_INTR), bit_name(DATA_SRC),
                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, }
        };
 #undef bit_name

diff --git a/tools/perf/util/record.h b/tools/perf/util/record.h
index b996ce61faddab993e4af9641df23058ec324e8f..68f471d9a88b2b369d6fcf78731e7ac420cf104a 100644 (file)
--- a/tools/perf/util/record.h
+++ b/tools/perf/util/record.h
@@ -23,6 +23,7 @@ struct record_opts {
        bool          sample_address;
        bool          sample_phys_addr;
        bool          sample_data_page_size;
+       bool          sample_code_page_size;
        bool          sample_weight;
        bool          sample_time;
        bool          sample_time_set;

diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic-events.c
index 69688f20db1196d64ea606d9298a0da682b33149..3a898520f05cb9f8282d5fc59922469e93b0bd79 100644 (file)
--- a/tools/perf/util/synthetic-events.c
+++ b/tools/perf/util/synthetic-events.c
@@ -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)
                result += sizeof(u64);
 
+       if (type & PERF_SAMPLE_CODE_PAGE_SIZE)
+               result += sizeof(u64);
+
        if (type & PERF_SAMPLE_AUX) {
                result += sizeof(u64);
                result += sample->aux_sample.size;
@@ -1657,6 +1660,11 @@ int perf_event__synthesize_sample(union perf_event *event, u64 type, u64 read_fo
                array++;
        }
 
+       if (type & PERF_SAMPLE_CODE_PAGE_SIZE) {
+               *array = sample->code_page_size;
+               array++;
+       }
+
        if (type & PERF_SAMPLE_AUX) {
                sz = sample->aux_sample.size;
                *array++ = sz;