perf record: Support new sample type for data page size

Support new sample type PERF_SAMPLE_DATA_PAGE_SIZE for page size.

Add new option --data-page-size to record sample data page size.

Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Stephane Eranian <eranian@google.com>
Cc: Will Deacon <will@kernel.org>
Link: http://lore.kernel.org/lkml/20201130172803.2676-3-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 768888b9326a7d2e4bdf9480a89f9271885f7fa0..2d30e525a60034b43da0bc29c1ec2bebe38745e6 100644 (file)
--- a/tools/perf/Documentation/perf-record.txt
+++ b/tools/perf/Documentation/perf-record.txt
@@ -293,6 +293,9 @@ OPTIONS
 --phys-data::
        Record the sample physical addresses.
 
+--data-page-size::
+       Record the sampled data address data 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 d832c108a1ca28b96fef15eb5409e0df54e5c05f..fd391165061231394bc2e3e62a25a9d0754bff5d 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -2472,6 +2472,8 @@ static struct option __record_options[] = {
        OPT_BOOLEAN('d', "data", &record.opts.sample_address, "Record the sample addresses"),
        OPT_BOOLEAN(0, "phys-data", &record.opts.sample_phys_addr,
                    "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, "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 b828b99176f403f05d9e19abe210a142249757b1..448ac30c2fc45b8da61d3aa8d3fed8201b54f04b 100644 (file)
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -135,6 +135,7 @@ struct perf_sample {
        u32 raw_size;
        u64 data_src;
        u64 phys_addr;
+       u64 data_page_size;
        u64 cgroup;
        u32 flags;
        u16 insn_len;

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 3dd0eae9810db389287c1546a0a14da8cca302fa..5e6085c3fc761a55978b9ffb130dff5d36a254c6 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1188,6 +1188,9 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts,
                evsel__set_sample_bit(evsel, CGROUP);
        }
 
+       if (opts->sample_data_page_size)
+               evsel__set_sample_bit(evsel, DATA_PAGE_SIZE);
+
        if (opts->record_switch_events)
                attr->context_switch = track;
 
@@ -2355,6 +2358,12 @@ int evsel__parse_sample(struct evsel *evsel, union perf_event *event,
                array++;
        }
 
+       data->data_page_size = 0;
+       if (type & PERF_SAMPLE_DATA_PAGE_SIZE) {
+               data->data_page_size = *array;
+               array++;
+       }
+
        if (type & PERF_SAMPLE_AUX) {
                OVERFLOW_CHECK_u64(array);
                sz = *array++;

diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c
index e67a227c0ce7e6b20312972eb2f1b78a63a3bb2b..fb0bb66844384ee54920269ab0a506f8905b9617 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(CGROUP), bit_name(DATA_PAGE_SIZE),
                { .name = NULL, }
        };
 #undef bit_name

diff --git a/tools/perf/util/record.h b/tools/perf/util/record.h
index 266760ac9143ff72bce6dcde0a018316df971b1d..694b351dcd278014a7a8b12cb8f3baaf91748adb 100644 (file)
--- a/tools/perf/util/record.h
+++ b/tools/perf/util/record.h
@@ -22,6 +22,7 @@ struct record_opts {
        bool          raw_samples;
        bool          sample_address;
        bool          sample_phys_addr;
+       bool          sample_data_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 297987c6960b5b3d939c21933270efe3bcb0e5d2..2947e3f3c6d9d03c154c719eabd224669bc676b4 100644 (file)
--- a/tools/perf/util/synthetic-events.c
+++ b/tools/perf/util/synthetic-events.c
@@ -1409,6 +1409,9 @@ size_t perf_event__sample_event_size(const struct perf_sample *sample, u64 type,
        if (type & PERF_SAMPLE_CGROUP)
                result += sizeof(u64);
 
+       if (type & PERF_SAMPLE_DATA_PAGE_SIZE)
+               result += sizeof(u64);
+
        if (type & PERF_SAMPLE_AUX) {
                result += sizeof(u64);
                result += sample->aux_sample.size;
@@ -1588,6 +1591,11 @@ int perf_event__synthesize_sample(union perf_event *event, u64 type, u64 read_fo
                array++;
        }
 
+       if (type & PERF_SAMPLE_DATA_PAGE_SIZE) {
+               *array = sample->data_page_size;
+               array++;
+       }
+
        if (type & PERF_SAMPLE_AUX) {
                sz = sample->aux_sample.size;
                *array++ = sz;