Add the page size in the perf record (user tools)
v2 cover Add the page size in the perf record (user tools)
From: Kan Liang <[email protected]>
Changes since V1:
- Fix the compile warning with GCC 10
- Add Acked-by from Namhyung Kim
Current perf can report both virtual addresses and physical addresses, but not the page size. Without the page size information of the utilized page, users cannot decide whether to promote/demote large pages to optimize memory usage.
The kernel patches have been merged into tip perf/core branch, commit 8d97e71811aa ("perf/core: Add PERF_SAMPLE_DATA_PAGE_SIZE") commit 76a5433f95f3 ("perf/x86/intel: Support PERF_SAMPLE_DATA_PAGE_SIZE") commit 4cb6a42e4c4b ("powerpc/perf: Support PERF_SAMPLE_DATA_PAGE_SIZE") commit 995f088efebe ("perf/core: Add support for PERF_SAMPLE_CODE_PAGE_SIZE") commit 51b646b2d9f8 ("perf,mm: Handle non-page-table-aligned hugetlbfs")
and Peter's perf/core branch
commit 524680ce47a1 ("mm/gup: Provide gup_get_pte() more generic") commit 44a35d6937d2 ("mm: Introduce pXX_leaf_size()") commit 2f1e2f091ad0 ("perf/core: Fix arch_perf_get_page_size()") commit 7649e44aacdd ("arm64/mm: Implement pXX_leaf_size() support") commit 1df1ae7e262c ("sparc64/mm: Implement pXX_leaf_size() support")
This patch set is to enable the page size support in user tools.
Kan Liang (8):
tools headers UAPI: Update tools's copy of linux/perf_event.h perf record: Support new sample type for data page size perf script: Support data page size
perf sort: Add sort option for data page size
perf mem: Factor out a function to generate sort order perf mem: Clean up output format
perf mem: Support data page size
perf test: Add test case for PERF_SAMPLE_DATA_PAGE_SIZE
Stephane Eranian (4):
perf tools: Add support for PERF_SAMPLE_CODE_PAGE_SIZE perf script: Add support for PERF_SAMPLE_CODE_PAGE_SIZE perf report: Add support for PERF_SAMPLE_CODE_PAGE_SIZE perf test: Add test case for PERF_SAMPLE_CODE_PAGE_SIZE
tools/include/uapi/linux/perf_event.h | 6 +- tools/perf/Documentation/perf-mem.txt | 3 + tools/perf/Documentation/perf-record.txt | 6 + tools/perf/Documentation/perf-report.txt | 2 + tools/perf/Documentation/perf-script.txt | 5 +- tools/perf/builtin-mem.c | 150 ++++++++++++---------- tools/perf/builtin-record.c | 4 + tools/perf/builtin-script.c | 26 +++- tools/perf/tests/sample-parsing.c | 10 +- tools/perf/util/event.h | 5 + tools/perf/util/evsel.c | 18 +++ tools/perf/util/hist.c | 5 + tools/perf/util/hist.h | 2 + tools/perf/util/machine.c | 7 +- tools/perf/util/map_symbol.h | 1 + tools/perf/util/perf_event_attr_fprintf.c | 2 +- tools/perf/util/record.h | 2 + tools/perf/util/session.c | 26 ++++ tools/perf/util/sort.c | 56 ++++++++ tools/perf/util/sort.h | 3 + tools/perf/util/synthetic-events.c | 16 +++ 21 files changed, 278 insertions(+), 77 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/12 tools headers UAPI: Update tools's copy of linux/perf_event.h
From: Kan Liang <[email protected]>
To get the changes in:
commit 8d97e71811aa ("perf/core: Add PERF_SAMPLE_DATA_PAGE_SIZE") commit 995f088efebe ("perf/core: Add support for PERF_SAMPLE_CODE_PAGE_SIZE")
This silences this perf tools build warning:
Warning: Kernel ABI header at 'tools/include/uapi/linux/perf_event.h'
differs from latest version at 'include/uapi/linux/perf_event.h'
diff -u tools/include/uapi/linux/perf_event.hinclude/uapi/linux/perf_event.h
--- tools/include/uapi/linux/perf_event.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tools/include/uapi/linux/perf_event.h +5 -1
@@ -143,8 +143,10 @@ enum perf_event_sample_format {PERF_SAMPLE_PHYS_ADDR =1U <<19 ,PERF_SAMPLE_AUX =1U <<20 ,PERF_SAMPLE_CGROUP =1U <<21 , +PERF_SAMPLE_DATA_PAGE_SIZE =1U <<22 , +PERF_SAMPLE_CODE_PAGE_SIZE =1U <<23 , -PERF_SAMPLE_MAX =1U <<22 ,/* non-ABI */ +PERF_SAMPLE_MAX =1U <<24 ,/* non-ABI */ __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */ };
@@ -896,6 +898,8 @@ enum perf_event_type {* { u64 phys_addr;} && PERF_SAMPLE_PHYS_ADDR * { u64 size; * char data[size]; } && PERF_SAMPLE_AUX +* { u64 data_page_size;} && PERF_SAMPLE_DATA_PAGE_SIZE +* { u64 code_page_size;} && PERF_SAMPLE_CODE_PAGE_SIZE * }; */ PERF_RECORD_SAMPLE = 9,
Signature · 1 line
2.17.1
Arnaldo Carvalho de Melo
maintainerRe: [PATCH V2 01/12] tools headers UAPI: Update tools's copy of linux/perf_event.h
Em Mon, Nov 30, 2020 at 09:27:52AM -0800, [email protected] escreveu:
Quoted 8 lines
From: Kan Liang <[email protected]>
To get the changes in:
commit
8d97e71811aa("perf/core: AddPERF_SAMPLE_DATA_PAGE_SIZE") commit995f088efebe("perf/core: Add support forPERF_SAMPLE_CODE_PAGE_SIZE")This silences this perf tools build warning:
Thanks, this is in tip/perf/core, so I'm applying it to my perf/core branch.
- Arnaldo
Quoted 39 lines
Warning: Kernel ABI header at '
tools/include/uapi/linux/perf_event.h'
differs from latest version at 'include/uapi/linux/perf_event.h'
diff -utools/include/uapi/linux/perf_event.hinclude/uapi/linux/perf_event.hAcked-by Namhyung Kim <[email protected]>Signed-off-by Kan Liang <[email protected]>--- tools/include/uapi/linux/perf_event.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)tools/include/uapi/linux/perf_event.h +5
-1@@ -143,8 +143,10 @@ enum perf_event_sample_format {PERF_SAMPLE_PHYS_ADDR =1U <<19 ,PERF_SAMPLE_AUX =1U <<20 ,PERF_SAMPLE_CGROUP =1U <<21 , +PERF_SAMPLE_DATA_PAGE_SIZE =1U <<22 , +PERF_SAMPLE_CODE_PAGE_SIZE =1U <<23 , -PERF_SAMPLE_MAX =1U <<22 ,/* non-ABI */ +PERF_SAMPLE_MAX =1U <<24 ,/* non-ABI */ __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */ };@@ -896,6 +898,8 @@ enum perf_event_type {* { u64 phys_addr;} && PERF_SAMPLE_PHYS_ADDR * { u64 size; * char data[size]; } && PERF_SAMPLE_AUX +* { u64 data_page_size;} && PERF_SAMPLE_DATA_PAGE_SIZE +* { u64 code_page_size;} && PERF_SAMPLE_CODE_PAGE_SIZE * }; */ PERF_RECORD_SAMPLE = 9,Signature · 1 line
2.17.1
Signature · 1 line
- Arnaldo
PATCH v2 2/12 perf record: Support new sample type for data page size
In reply to [email protected]From: Kan Liang <[email protected]>
Support new sample type PERF_SAMPLE_DATA_PAGE_SIZE for page size.
Add new option --data-page-size to record sample data page size.
--- tools/perf/Documentation/perf-record.txt | 3 +++ tools/perf/builtin-record.c | 2 ++ tools/perf/util/event.h | 1 + tools/perf/util/evsel.c | 9 +++++++++ tools/perf/util/perf_event_attr_fprintf.c | 2 +- tools/perf/util/record.h | 1 + tools/perf/util/synthetic-events.c | 8 ++++++++ 7 files changed, 25 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-record.txt +3 -0
@@ -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
tools/perf/builtin-record.c +2 -0
@@ -2476,6 +2476,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,
tools/perf/util/event.h +1 -0
@@ -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;
tools/perf/util/evsel.c +9 -0
@@ -1190,6 +1190,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;
@@ -2365,6 +2368,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++;
tools/perf/util/perf_event_attr_fprintf.c +1 -1
@@ -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
tools/perf/util/record.h +1 -0
@@ -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;
tools/perf/util/synthetic-events.c +8 -0
@@ -1406,6 +1406,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;
@@ -1585,6 +1588,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;
Signature · 1 line
2.17.1
Arnaldo Carvalho de Melo
maintainerRe: [PATCH V2 02/12] perf record: Support new sample type for data page size
Em Mon, Nov 30, 2020 at 09:27:53AM -0800, [email protected] escreveu:
Quoted 5 lines
From: Kan Liang <[email protected]>
Support new sample type
PERF_SAMPLE_DATA_PAGE_SIZEfor page size.Add new option --data-page-size to record sample data page size.
So, trying this on a kernel without this feature I get:
[acme@five perf]$ perf record --data-page-size sleep 1
Error:
The sys_perf_event_open() syscall returned with 22 (Invalid argument) for event (cycles:u). /bin/dmesg | grep -i perf may provide additional information.
[acme@five perf]$
I'm adding the following patch right after yours, next time please test this and provide a similar error message.
- Arnaldo
commit 2044fec7fcc6070b09f9b6a67922b0b9e4295dba
Author: Arnaldo Carvalho de Melo <[email protected]> Date: Mon Dec 7 14:04:05 2020 -0300
perf evsel: Emit warning about kernel not supporting the data page size sample_type bit
Before we had this unhelpful message:
$ perf record --data-page-size sleep 1
Error:
The sys_perf_event_open() syscall returned with 22 (Invalid argument) for event (cycles:u). /bin/dmesg | grep -i perf may provide additional information.
$
Add support to the perf_missing_features variable to remember what caused evsel__open() to fail and then use that information in evsel__open_strerror().
$ perf record --data-page-size sleep 1
Error:
Asking for the data page size isn't supported by this kernel. $
tools/perf/util/evsel.c +8 -1
@@ -1873,7 +1873,12 @@ static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus,* Must probe features in the order they were added to the * perf_event_attr interface. */ -if (!perf_missing_features.cgroup && evsel->core.attr.cgroup) { +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" ); + goto out_close; + }else if (!perf_missing_features.cgroup && evsel->core.attr.cgroup) { perf_missing_features.cgroup = true;pr_debug2_peo ("Kernel has no cgroup sampling support, bailing out\n" ); goto out_close;
@@ -2673,6 +2678,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_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)return scnprintf (msg, size,"Reading from overwrite event is not supported by this kernel." );if (perf_missing_features.clockid)
tools/perf/util/evsel.h +1 -0
@@ -144,6 +144,7 @@ struct perf_missing_features {bool aux_output;bool branch_hw_idx;bool cgroup; +bool data_page_size; };extern struct perf_missing_features perf_missing_features;
Re: [PATCH V2 02/12] perf record: Support new sample type for data page size
Quoted 14 lines · Arnaldo Carvalho de Melo
Em Mon, Nov 30, 2020 at 09:27:53AM -0800, [email protected] escreveu:
Quoted 5 lines
From: Kan Liang <[email protected]>
Support new sample type
PERF_SAMPLE_DATA_PAGE_SIZEfor page size.Add new option --data-page-size to record sample data page size.
So, trying this on a kernel without this feature I get:
[acme@five perf]$ perf record --data-page-size sleep 1
Error:
Thesys_perf_event_open()syscall returned with 22 (Invalid argument) for event (cycles:u)./bin/dmesg| grep -i perf may provide additional information.
Quoted 5 lines
[acme@five perf]$
I'm adding the following patch right after yours, next time please test this and provide a similar error message.
Sorry, I missed it.
Besides the PERF_SAMPLE_DATA_PAGE_SIZE, I think we have to fix the PERF_SAMPLE_CODE_PAGE_SIZE as well. Should I send a separate patch to fix it?
Thanks,
Kan
Quoted 75 lines
- Arnaldo
commit
2044fec7fcc6070b09f9b6a67922b0b9e4295dbaAuthor: Arnaldo Carvalho de Melo <[email protected]> Date: Mon Dec 7 14:04:05 2020 -0300perf evsel: Emit warning about kernel not supporting the data page size
sample_typebitBefore we had this unhelpful message:
$ perf record --data-page-size sleep 1
Error:
Thesys_perf_event_open()syscall returned with 22 (Invalid argument) for event (cycles:u)./bin/dmesg| grep -i perf may provide additional information.
$Add support to the
perf_missing_featuresvariable to remember what causedevsel__open()to fail and then use that information inevsel__open_strerror().$ perf record --data-page-size sleep 1
Error:
Asking for the data page size isn't supported by this kernel. $Cc Kan Liang <[email protected]>Cc Namhyung Kim <[email protected]>Cc Andi Kleen <[email protected]>Cc Jiri Olsa <[email protected]>Cc Mark Rutland <[email protected]>Cc Michael Ellerman <[email protected]>Cc Stephane Eranian <[email protected]>Cc Will Deacon <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>tools/perf/util/evsel.c +8
-1@@ -1873,7 +1873,12 @@ static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus,* Must probe features in the order they were added to the * perf_event_attr interface. */ -if (!perf_missing_features.cgroup && evsel->core.attr.cgroup) { +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" ); + goto out_close; + }else if (!perf_missing_features.cgroup && evsel->core.attr.cgroup) { perf_missing_features.cgroup = true;pr_debug2_peo ("Kernel has no cgroup sampling support, bailing out\n" ); goto out_close;@@ -2673,6 +2678,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_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)return scnprintf (msg, size,"Reading from overwrite event is not supported by this kernel." );if (perf_missing_features.clockid)tools/perf/util/evsel.h +1
-0@@ -144,6 +144,7 @@ struct perf_missing_features {bool aux_output;bool branch_hw_idx;bool cgroup; +bool data_page_size; };extern struct perf_missing_features perf_missing_features;
Arnaldo Carvalho de Melo
maintainerRe: [PATCH V2 02/12] perf record: Support new sample type for data page size
Em Mon, Dec 07, 2020 at 03:25:07PM -0500, Liang, Kan escreveu:
Quoted 23 lines · Arnaldo Carvalho de Melo
Quoted 14 lines
Em Mon, Nov 30, 2020 at 09:27:53AM -0800, [email protected] escreveu:
Quoted 5 lines
From: Kan Liang <[email protected]>
Support new sample type
PERF_SAMPLE_DATA_PAGE_SIZEfor page size.Add new option --data-page-size to record sample data page size.
So, trying this on a kernel without this feature I get:
[acme@five perf]$ perf record --data-page-size sleep 1
Error:
Thesys_perf_event_open()syscall returned with 22 (Invalid argument) for event (cycles:u)./bin/dmesg| grep -i perf may provide additional information.Quoted 5 lines
[acme@five perf]$
I'm adding the following patch right after yours, next time please test this and provide a similar error message.
Quoted 5 lines
Sorry, I missed it.
Besides the
PERF_SAMPLE_DATA_PAGE_SIZE, I think we have to fix thePERF_SAMPLE_CODE_PAGE_SIZEas well.
Should I send a separate patch to fix it?
I've got back to this and what I have is out in acme/perf/core, so you can continue from there.
I had to add the patch below to fix 'perf test "Sample parsing"'.
- Arnaldo
commit eec7b53d59167a1063e704f86ec0aa36ff765e1a
Author: Arnaldo Carvalho de Melo <[email protected]> Date: Wed Dec 16 12:45:10 2020 -0300
perf test: Make sample-parsing test aware of PERF_SAMPLE_{CODE,DATA}_PAGE_SIZE
To fix this:
$ perf test -v "Sample parsing".
27: Sample parsing :
--- start ---
test child forked, pid 586013
sample format has changed, some new PERF_SAMPLE_ bit was introduced - test needs updating test child finished with -1
---- end ----
Sample parsing: FAILED!
$
This patchset is still not completely merged, so when adding the PERF_SAMPLE_CODE_PAGE_SIZE to 'struct perf_sample' we need to add the bits added in this patch for 'perf_sample.data_page_size'.
tools/perf/tests/sample-parsing.c +5 -1
@@ -154,6 +154,9 @@ static bool samples_same(const struct perf_sample *s1,if (type &PERF_SAMPLE_CGROUP )COMP (cgroup); +if (type &PERF_SAMPLE_DATA_PAGE_SIZE ) +COMP (data_page_size); +if (type &PERF_SAMPLE_AUX ) {COMP (aux_sample.size); if (memcmp(s1->aux_sample.data, s2->aux_sample.data,
@@ -234,6 +237,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) }, .phys_addr = 113, .cgroup = 114, + .data_page_size = 115, .aux_sample = { .size = sizeof(aux_data), .data = (void *)aux_data,
@@ -340,7 +344,7 @@ int test__sample_parsing(struct test *test __maybe_unused, int subtest __maybe_u* were added. Please actually update the test rather than just change * the condition below. */ -if (PERF_SAMPLE_MAX >PERF_SAMPLE_CGROUP <<1 ) { +if (PERF_SAMPLE_MAX >PERF_SAMPLE_CODE_PAGE_SIZE <<1 ) {pr_debug ("sample format has changed, some new PERF_SAMPLE_ bit was introduced - test needs updating\n" );return -1 ; }
PATCH v2 3/12 perf script: Support data page size
In reply to [email protected]From: Kan Liang <[email protected]>
Display the data page size if it is available.
Can be configured by the user, for example:
perf script --fields comm,event,phys_addr,data_page_size
dtlb mem-loads:uP: 3fec82ea8 4K
dtlb mem-loads:uP: 3fec82e90 4K
dtlb mem-loads:uP: 3e23700a4 4K
dtlb mem-loads:uP: 3fec82f20 4K
dtlb mem-loads:uP: 3e23700a4 4K
dtlb mem-loads:uP: 3b4211bec 4K
dtlb mem-loads:uP: 382205dc0 2M
dtlb mem-loads:uP: 36fa082c0 2M
dtlb mem-loads:uP: 377607340 2M
dtlb mem-loads:uP: 330010180 2M
dtlb mem-loads:uP: 33200fd80 2M
dtlb mem-loads:uP: 31b012b80 2M--- tools/perf/Documentation/perf-script.txt | 5 +++-- tools/perf/builtin-script.c | 17 +++++++++++++++-- tools/perf/util/event.h | 3 +++ tools/perf/util/session.c | 23 +++++++++++++++++++++++ 4 files changed, 44 insertions(+), 4 deletions(-)
tools/perf/Documentation/perf-script.txt +3 -2
@@ -116,8 +116,9 @@ OPTIONS --fields:: Comma separated list of fields to print. Options are: comm, tid, pid, time, cpu, event, trace, ip, sym, dso, addr, symoff, - srcline, period, iregs, uregs, brstack, brstacksym, flags, bpf-output, brstackinsn, - brstackoff, callindent, insn, insnlen, synth, phys_addr, metric, misc, srccode, ipc. + srcline, period, iregs, uregs, brstack, brstacksym, flags, bpf-output, + brstackinsn, brstackoff, callindent, insn, insnlen, synth, phys_addr, + metric, misc, srccode, ipc, data_page_size. Field list can be prepended with the type, trace, sw or hw, to indicate to which event type the field list applies. e.g., -F sw:comm,tid,time,ip,sym and -F trace:time,cpu,trace
tools/perf/builtin-script.c +15 -2
@@ -30,6 +30,7 @@#include "util/thread-stack.h" #include "util/time-utils.h" #include "util/path.h" +#include "util/event.h" #include "ui/ui.h" #include "print_binary.h" #include "archinsn.h"
@@ -115,6 +116,7 @@ enum perf_output_field {PERF_OUTPUT_SRCCODE =1ULL <<30 ,PERF_OUTPUT_IPC =1ULL <<31 ,PERF_OUTPUT_TOD =1ULL <<32 , + PERF_OUTPUT_DATA_PAGE_SIZE = 1ULL << 33, }; struct perf_script {
@@ -179,6 +181,7 @@ struct output_option { {.str = "srccode", .field = PERF_OUTPUT_SRCCODE}, {.str = "ipc", .field = PERF_OUTPUT_IPC}, {.str = "tod", .field = PERF_OUTPUT_TOD}, + {.str = "data_page_size", .field = PERF_OUTPUT_DATA_PAGE_SIZE}, }; enum {
@@ -251,7 +254,8 @@ static struct {PERF_OUTPUT_SYM |PERF_OUTPUT_SYMOFFSET |PERF_OUTPUT_DSO |PERF_OUTPUT_PERIOD |PERF_OUTPUT_ADDR |PERF_OUTPUT_DATA_SRC | - PERF_OUTPUT_WEIGHT | PERF_OUTPUT_PHYS_ADDR, +PERF_OUTPUT_WEIGHT |PERF_OUTPUT_PHYS_ADDR | + PERF_OUTPUT_DATA_PAGE_SIZE, .invalid_fields = PERF_OUTPUT_TRACE | PERF_OUTPUT_BPF_OUTPUT, },
@@ -499,6 +503,10 @@ static int evsel__check_attr(struct evsel *evsel, struct perf_session *session) evsel__check_stype(evsel, PERF_SAMPLE_PHYS_ADDR, "PHYS_ADDR", PERF_OUTPUT_PHYS_ADDR)) return -EINVAL; +if (PRINT_FIELD (DATA_PAGE_SIZE ) && +evsel__check_stype (evsel,PERF_SAMPLE_DATA_PAGE_SIZE ,"DATA_PAGE_SIZE" ,PERF_OUTPUT_DATA_PAGE_SIZE )) +return -EINVAL ; +return 0 ; }
@@ -1920,6 +1928,7 @@ static void process_event(struct perf_script *script,unsigned int type =output_type (attr->type);struct evsel_script *es = evsel->priv;FILE *fp = es->fp; +char str[PAGE_SIZE_NAME_LEN ];if (output[type].fields ==0 )return ;
@@ -2008,6 +2017,9 @@ static void process_event(struct perf_script *script,if (PRINT_FIELD (PHYS_ADDR ))fprintf (fp,"%16" PRIx64, sample->phys_addr); +if (PRINT_FIELD (DATA_PAGE_SIZE )) +fprintf (fp," %s" ,get_page_size_name (sample->data_page_size, str)); +perf_sample__fprintf_ipc (sample, attr, fp);fprintf (fp,"\n" );
@@ -3506,7 +3518,8 @@ int cmd_script(int argc, const char **argv) "Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso," "addr,symoff,srcline,period,iregs,uregs,brstack," "brstacksym,flags,bpf-output,brstackinsn,brstackoff," - "callindent,insn,insnlen,synth,phys_addr,metric,misc,ipc,tod", + "callindent,insn,insnlen,synth,phys_addr,metric,misc,ipc,tod," + "data_page_size", parse_output_fields),OPT_BOOLEAN ('a' ,"all-cpus" , &system_wide, "system-wide collection from all CPUs"),
tools/perf/util/event.h +3 -0
@@ -409,4 +409,7 @@ extern int sysctl_perf_event_max_stack;extern int sysctl_perf_event_max_contexts_per_stack;extern unsigned int proc_map_timeout; +#define PAGE_SIZE_NAME_LEN 32 +char *get_page_size_name (u64 size,char *str); +#endif /* __PERF_RECORD_H */
tools/perf/util/session.c +23 -0
@@ -1260,10 +1260,30 @@ static void dump_event(struct evlist *evlist, union perf_event *event, event->header.size, perf_event__name(event->header.type)); } +char *get_page_size_name (u64 size,char *str) +{ +const char suffixes[5 ] = {'B' ,'K' ,'M' ,'G' ,'T' }; +int i; + +if (size ==0 ) { +snprintf (str,PAGE_SIZE_NAME_LEN ,"%s" ,"N/A" ); +return str; + } +for (i =0 ; i <5 ; i++) { +if (size <1024 ) +break ; + size /=1024 ; + } + +snprintf (str,PAGE_SIZE_NAME_LEN ,"%lu%c" , size, suffixes[i]); +return str; +} +static void dump_sample (struct evsel *evsel,union perf_event *event,struct perf_sample *sample) {u64 sample_type; +char str[PAGE_SIZE_NAME_LEN ];if (!dump_trace)return ;
@@ -1298,6 +1318,9 @@ static void dump_sample(struct evsel *evsel, union perf_event *event,if (sample_type &PERF_SAMPLE_PHYS_ADDR )printf (" .. phys_addr: 0x%" PRIx64"\n" , sample->phys_addr); +if (sample_type &PERF_SAMPLE_DATA_PAGE_SIZE ) +printf (" .. data page size: %s\n" ,get_page_size_name (sample->data_page_size, str)); +if (sample_type &PERF_SAMPLE_TRANSACTION )printf ("... transaction: %" PRIx64"\n" , sample->transaction);
Signature · 1 line
2.17.1
Re: [PATCH V2 03/12] perf script: Support data page size
On Mon, Nov 30, 2020 at 09:27:54AM -0800, [email protected] wrote:
SNIP
Quoted 17 lines
#endif /*
__PERF_RECORD_H*/tools/perf/util/session.c +8
-0@@ -1260,10 +1260,30 @@ static void dump_event(struct evlist *evlist, union perf_event *event, event->header.size, perf_event__name(event->header.type)); } +char *get_page_size_name (u64 size,char *str) +{ +const char suffixes[5 ] = {'B' ,'K' ,'M' ,'G' ,'T' }; +int i; + +if (size ==0 ) { +snprintf (str,PAGE_SIZE_NAME_LEN ,"%s" ,"N/A" ); +return str;
tools/perf/util/session.c static void dump_event(struct evlist *evlist, union perf_event *event, · line 1280
Quoted 10 lines
tools/perf/util/session.c +10
-0+ } +for (i =0 ; i <5 ; i++) { +if (size <1024 ) +break ; + size /=1024 ; + } + +snprintf (str,PAGE_SIZE_NAME_LEN ,"%lu%c" , size, suffixes[i]); +return str; +}
we have the same code in unit_number__scnprintf,
you just need to add support for 'T' and 'N/A'
jirka
PATCH v2 4/12 perf sort: Add sort option for data page size
In reply to [email protected]From: Kan Liang <[email protected]>
Add a new sort option "data_page_size" for --mem-mode sort. With this option applied, perf can sort and report by sample's data page size.
Here is an example.
perf report --stdio --mem-mode
--sort=comm,symbol,phys_daddr,data_page_size
# To display the perf.data header info, please use # --header/--header-only options.
#
#
# Total Lost Samples: 0
#
# Samples: 9K of event 'mem-loads:uP'
# Total weight : 9028
# Sort order : comm,symbol,phys_daddr,data_page_size
#
# Overhead Command Symbol Data Physical
# Address
# Data Page Size
# ........ ....... ............................
# ...................... ......................
#
11.19% dtlb [.] touch_buffer [.]
0x00000003fec82ea8 4K
8.61% dtlb [.] GetTickCount [.]
0x00000003c4f2c8a8 4K
4.52% dtlb [.] GetTickCount [.]
0x00000003fec82f58 4K
4.33% dtlb [.] __gettimeofday [.]
0x00000003fec82f48 4K
4.32% dtlb [.] GetTickCount [.]
0x00000003fec82f78 4K
4.28% dtlb [.] GetTickCount [.]
0x00000003fec82f50 4K
4.23% dtlb [.] GetTickCount [.]
0x00000003fec82f70 4K
4.11% dtlb [.] GetTickCount [.]
0x00000003fec82f68 4K
4.00% dtlb [.] Calibrate [.]
0x00000003fec82f98 4K
3.91% dtlb [.] Calibrate [.]
0x00000003fec82f90 4K
3.43% dtlb [.] touch_buffer [.]
0x00000003fec82e98 4K
3.42% dtlb [.] touch_buffer [.]
0x00000003fec82e90 4K
0.09% dtlb [.] DoDependentLoads [.]
0x000000036ea084c0 2M
0.08% dtlb [.] DoDependentLoads [.]
0x000000032b010b80 2M--- tools/perf/Documentation/perf-report.txt | 1 + tools/perf/util/hist.c | 3 +++ tools/perf/util/hist.h | 1 + tools/perf/util/machine.c | 7 ++++-- tools/perf/util/map_symbol.h | 1 + tools/perf/util/sort.c | 30 ++++++++++++++++++++++++ tools/perf/util/sort.h | 1 + 7 files changed, 42 insertions(+), 2 deletions(-)
tools/perf/Documentation/perf-report.txt +1 -0
@@ -150,6 +150,7 @@ OPTIONS - snoop: type of snoop (if any) for the data at the time of the sample - dcacheline: the cacheline the data address is on at the time of the sample - phys_daddr: physical address of data being executed on at the time of sample + - data_page_size: the data page size of data being executed on at the time of sample And the default sort keys are changed to local_weight, mem, sym, dso, symbol_daddr, dso_daddr, snoop, tlb, locked, see '--mem-mode'.
tools/perf/util/hist.c +3 -0
@@ -188,6 +188,9 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)hists__new_col_len (hists,HISTC_MEM_PHYS_DADDR , unresolved_col_width +4 +2 ); +hists__new_col_len (hists,HISTC_MEM_DATA_PAGE_SIZE , + unresolved_col_width +4 +2 ); + }else { symlen = unresolved_col_width +4 +2 ;hists__new_col_len (hists,HISTC_MEM_DADDR_SYMBOL , symlen);
tools/perf/util/hist.h +1 -0
@@ -56,6 +56,7 @@ enum hist_column {HISTC_MEM_DADDR_SYMBOL ,HISTC_MEM_DADDR_DSO ,HISTC_MEM_PHYS_DADDR , +HISTC_MEM_DATA_PAGE_SIZE ,HISTC_MEM_LOCKED ,HISTC_MEM_TLB , HISTC_MEM_LVL,
tools/perf/util/machine.c +5 -2
@@ -2023,11 +2023,12 @@ static void ip__resolve_ams(struct thread *thread, ams->ms.sym = al.sym; ams->ms.map = al.map; ams->phys_addr =0 ; + ams->data_page_size =0 ; }static void ip__resolve_data (struct thread *thread,u8 m,struct addr_map_symbol *ams, -u64 addr,u64 phys_addr) +u64 addr,u64 phys_addr,u64 daddr_page_size) {struct addr_location al;
@@ -2041,6 +2042,7 @@ static void ip__resolve_data(struct thread *thread, ams->ms.sym = al.sym; ams->ms.map = al.map; ams->phys_addr = phys_addr; + ams->data_page_size = daddr_page_size; } struct mem_info *sample__resolve_mem(struct perf_sample *sample,
@@ -2053,7 +2055,8 @@ struct mem_info *sample__resolve_mem(struct perf_sample *sample,ip__resolve_ams (al->thread, &mi->iaddr, sample->ip);ip__resolve_data (al->thread, al->cpumode, &mi->daddr, - sample->addr, sample->phys_addr); + sample->addr, sample->phys_addr, + sample->data_page_size); mi->data_src.val = sample->data_src;return mi;
tools/perf/util/map_symbol.h +1 -0
@@ -19,5 +19,6 @@ struct addr_map_symbol {u64 addr;u64 al_addr;u64 phys_addr; + u64 data_page_size; };#endif // __PERF_MAP_SYMBOL
tools/perf/util/sort.c +30 -0
@@ -1462,6 +1462,35 @@ struct sort_entry sort_mem_phys_daddr = { .se_width_idx = HISTC_MEM_PHYS_DADDR, }; +static int64_t +sort__data_page_size_cmp (struct hist_entry *left,struct hist_entry *right) +{ +uint64_t l =0 , r =0 ; + +if (left->mem_info) + l = left->mem_info->daddr.data_page_size; +if (right->mem_info) + r = right->mem_info->daddr.data_page_size; + +return (int64_t )(r - l); +} + +static int hist_entry__data_page_size_snprintf (struct hist_entry *he,char *bf, +size_t size,unsigned int width) +{ +char str[PAGE_SIZE_NAME_LEN ]; + +return repsep_snprintf (bf, size,"%-*s" , width, +get_page_size_name (he->mem_info->daddr.data_page_size, str)); +} + +struct sort_entry sort_mem_data_page_size = { + .se_header ="Data Page Size" , + .se_cmp = sort__data_page_size_cmp, + .se_snprintf = hist_entry__data_page_size_snprintf, + .se_width_idx =HISTC_MEM_DATA_PAGE_SIZE , +}; +static int64_t sort__abort_cmp (struct hist_entry *left,struct hist_entry *right) {
@@ -1740,6 +1769,7 @@ static struct sort_dimension memory_sort_dimensions[] = {DIM (SORT_MEM_SNOOP ,"snoop" , sort_mem_snoop),DIM (SORT_MEM_DCACHELINE ,"dcacheline" , sort_mem_dcacheline),DIM (SORT_MEM_PHYS_DADDR ,"phys_daddr" , sort_mem_phys_daddr), + DIM(SORT_MEM_DATA_PAGE_SIZE, "data_page_size", sort_mem_data_page_size), };#undef DIM
tools/perf/util/sort.h +1 -0
@@ -255,6 +255,7 @@ enum sort_type {SORT_MEM_DCACHELINE ,SORT_MEM_IADDR_SYMBOL ,SORT_MEM_PHYS_DADDR , + SORT_MEM_DATA_PAGE_SIZE, };/*
Signature · 1 line
2.17.1
PATCH v2 5/12 perf mem: Factor out a function to generate sort order
In reply to [email protected]From: Kan Liang <[email protected]>
Now, "--phys-data" is the only option which impacts the sort order. A simple "if else" is enough to handle the option. But there will be more options added, e.g. "--data-page-size", which also impact the sort order. The code will become too complex to be maintained.
Divide the sort order string into several small pieces. The first piece is always the default sort string for LOAD/STORE. Appends the specific sort string if related option is applied.
No functional change.
--- tools/perf/builtin-mem.c | 41 ++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-)
tools/perf/builtin-mem.c +27 -14
@@ -298,11 +298,35 @@ static int report_raw_events(struct perf_mem *mem)perf_session__delete (session);return ret; } +static char *get_sort_order (struct perf_mem *mem) +{ +bool has_extra_options = mem->phys_addr ? true : false; +char sort[128 ]; + +/* +* there is no weight (cost) associated with stores, so don't print +* the column +*/ +if (!(mem->operation &MEM_OPERATION_LOAD )) { +strcpy (sort,"--sort=mem,sym,dso,symbol_daddr," +"dso_daddr,tlb,locked" ); + }else if (has_extra_options) { +strcpy (sort,"--sort=local_weight,mem,sym,dso,symbol_daddr," +"dso_daddr,snoop,tlb,locked" ); + }else +return NULL ; + +if (mem->phys_addr) +strcat (sort,",phys_daddr" ); + +return strdup (sort); +}static int report_events (int argc,const char **argv,struct perf_mem *mem) {const char **rep_argv;int ret, i =0 , j, rep_argc; +char *new_sort_order;if (mem->dump_raw)return report_raw_events (mem);
@@ -316,20 +340,9 @@ static int report_events(int argc, const char **argv, struct perf_mem *mem) rep_argv[i++] ="--mem-mode" ; rep_argv[i++] ="-n" ;/* display number of samples */ -/* -* there is no weight (cost) associated with stores, so don't print -* the column -*/ -if (!(mem->operation &MEM_OPERATION_LOAD )) { -if (mem->phys_addr) - rep_argv[i++] ="--sort=mem,sym,dso,symbol_daddr," -"dso_daddr,tlb,locked,phys_daddr" ; -else - rep_argv[i++] ="--sort=mem,sym,dso,symbol_daddr," -"dso_daddr,tlb,locked" ; - }else if (mem->phys_addr) - rep_argv[i++] ="--sort=local_weight,mem,sym,dso,symbol_daddr," -"dso_daddr,snoop,tlb,locked,phys_daddr" ; + new_sort_order =get_sort_order (mem); +if (new_sort_order) + rep_argv[i++] = new_sort_order;for (j =1 ; j < argc; j++, i++) rep_argv[i] = argv[j];
Signature · 1 line
2.17.1
Re: [PATCH V2 05/12] perf mem: Factor out a function to generate sort order
Quoted 24 lines · On Mon, Nov 30, 2020 at 09:27:56AM -0800, [email protected] wrote:
From: Kan Liang <[email protected]>
Now, "--phys-data" is the only option which impacts the sort order. A simple "if else" is enough to handle the option. But there will be more options added, e.g. "--data-page-size", which also impact the sort order. The code will become too complex to be maintained.
Divide the sort order string into several small pieces. The first piece is always the default sort string for LOAD/STORE. Appends the specific sort string if related option is applied.
No functional change.
Acked-by Namhyung Kim <[email protected]>Signed-off-by Kan Liang <[email protected]>--- tools/perf/builtin-mem.c | 41 ++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-)tools/perf/builtin-mem.c +0
-0
tools/perf/builtin-mem.c static int report_raw_events(struct perf_mem *mem) · line 303
Quoted 6 lines
tools/perf/builtin-mem.c +3
-0@@ -298,11 +298,35 @@ static int report_raw_events(struct perf_mem *mem)perf_session__delete (session);return ret; } +static char *get_sort_order (struct perf_mem *mem) +{ +bool has_extra_options = mem->phys_addr ? true : false;
hum, would simple assignment do? ;-)
how about to do this like in c2c with extra %s:
if (!(mem->operation & MEM_OPERATION_LOAD)) {
strcpy(sort, "--sort=mem,sym,dso,symbol_daddr,"
"dso_daddr,tlb,locked%s",
mem->phys_addr ? ",phys_daddr" : "");
} else if (mem->phys_addr) {
strcpy(sort, "--sort=local_weight,mem,sym,dso,symbol_daddr,"
"dso_daddr,snoop,tlb,locked,phys_daddr");
} else
return NULL;jirka
Quoted 56 lines
tools/perf/builtin-mem.c +24
-14+char sort[128 ]; + +/* +* there is no weight (cost) associated with stores, so don't print +* the column +*/ +if (!(mem->operation &MEM_OPERATION_LOAD )) { +strcpy (sort,"--sort=mem,sym,dso,symbol_daddr," +"dso_daddr,tlb,locked" ); + }else if (has_extra_options) { +strcpy (sort,"--sort=local_weight,mem,sym,dso,symbol_daddr," +"dso_daddr,snoop,tlb,locked" ); + }else +return NULL ; + +if (mem->phys_addr) +strcat (sort,",phys_daddr" ); + +return strdup (sort); +}static int report_events (int argc,const char **argv,struct perf_mem *mem) {const char **rep_argv;int ret, i =0 , j, rep_argc; +char *new_sort_order;if (mem->dump_raw)return report_raw_events (mem);@@ -316,20 +340,9 @@ static int report_events(int argc, const char **argv, struct perf_mem *mem) rep_argv[i++] ="--mem-mode" ; rep_argv[i++] ="-n" ;/* display number of samples */ -/* -* there is no weight (cost) associated with stores, so don't print -* the column -*/ -if (!(mem->operation &MEM_OPERATION_LOAD )) { -if (mem->phys_addr) - rep_argv[i++] ="--sort=mem,sym,dso,symbol_daddr," -"dso_daddr,tlb,locked,phys_daddr" ; -else - rep_argv[i++] ="--sort=mem,sym,dso,symbol_daddr," -"dso_daddr,tlb,locked" ; - }else if (mem->phys_addr) - rep_argv[i++] ="--sort=local_weight,mem,sym,dso,symbol_daddr," -"dso_daddr,snoop,tlb,locked,phys_daddr" ; + new_sort_order =get_sort_order (mem); +if (new_sort_order) + rep_argv[i++] = new_sort_order;for (j =1 ; j < argc; j++, i++) rep_argv[i] = argv[j];Signature · 1 line
2.17.1
PATCH v2 6/12 perf mem: Clean up output format
In reply to [email protected]From: Kan Liang <[email protected]>
Now, "--phys-data" is the only option which impacts the output format. A simple "if else" is enough to handle the option. But there will be more options added, e.g. "--data-page-size", which also impact the output format. The code will become too complex to be maintained.
Divide the big printf into several small pieces. Output the specific piece only if the related option is applied.
No functional change.
--- tools/perf/builtin-mem.c | 93 ++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 55 deletions(-)
tools/perf/builtin-mem.c +38 -55
@@ -172,7 +172,7 @@ dump_raw_samples(struct perf_tool *tool, { struct perf_mem *mem = container_of(tool, struct perf_mem, tool);struct addr_location al; -const char *fmt; +const char *fmt, *field_sep;if (machine__resolve (machine, &al, sample) <0 ) { fprintf(stderr, "problem processing %d event, skipping it.\n",
@@ -186,60 +186,41 @@ dump_raw_samples(struct perf_tool *tool,if (al.map !=NULL ) al.map->dso->hit =1 ; -if (mem->phys_addr) { -if (symbol_conf.field_sep) { - fmt ="%d%s%d%s0x%" PRIx64"%s0x%" PRIx64"%s0x%016" PRIx64 -"%s%" PRIu64"%s0x%" PRIx64"%s%s:%s\n" ; - }else { - fmt ="%5d%s%5d%s0x%016" PRIx64"%s0x016%" PRIx64 -"%s0x%016" PRIx64"%s%5" PRIu64"%s0x%06" PRIx64 -"%s%s:%s\n" ; - symbol_conf.field_sep =" " ; - } - -printf (fmt, - sample->pid, - symbol_conf.field_sep, - sample->tid, - symbol_conf.field_sep, - sample->ip, - symbol_conf.field_sep, - sample->addr, - symbol_conf.field_sep, - sample->phys_addr, - symbol_conf.field_sep, - sample->weight, - symbol_conf.field_sep, - sample->data_src, - symbol_conf.field_sep, - al.map ? (al.map->dso ? al.map->dso->long_name :"???" ) :"???" , - al.sym ? al.sym->name :"???" ); + field_sep = symbol_conf.field_sep; +if (field_sep) { + fmt ="%d%s%d%s0x%" PRIx64"%s0x%" PRIx64"%s" ; }else { -if (symbol_conf.field_sep) { - fmt ="%d%s%d%s0x%" PRIx64"%s0x%" PRIx64"%s%" PRIu64 -"%s0x%" PRIx64"%s%s:%s\n" ; - }else { - fmt ="%5d%s%5d%s0x%016" PRIx64"%s0x016%" PRIx64 -"%s%5" PRIu64"%s0x%06" PRIx64"%s%s:%s\n" ; - symbol_conf.field_sep =" " ; - } + fmt ="%5d%s%5d%s0x%016" PRIx64"%s0x016%" PRIx64"%s" ; + symbol_conf.field_sep =" " ; + } +printf (fmt, + sample->pid, + symbol_conf.field_sep, + sample->tid, + symbol_conf.field_sep, + sample->ip, + symbol_conf.field_sep, + sample->addr, + symbol_conf.field_sep); -printf (fmt, - sample->pid, - symbol_conf.field_sep, - sample->tid, - symbol_conf.field_sep, - sample->ip, - symbol_conf.field_sep, - sample->addr, - symbol_conf.field_sep, - sample->weight, - symbol_conf.field_sep, - sample->data_src, - symbol_conf.field_sep, - al.map ? (al.map->dso ? al.map->dso->long_name :"???" ) :"???" , - al.sym ? al.sym->name :"???" ); +if (mem->phys_addr) { +printf ("0x%016" PRIx64"%s" , + sample->phys_addr, + symbol_conf.field_sep); } + +if (field_sep) + fmt ="%" PRIu64"%s0x%" PRIx64"%s%s:%s\n" ; +else + fmt ="%5" PRIu64"%s0x%06" PRIx64"%s%s:%s\n" ; + +printf (fmt, + sample->weight, + symbol_conf.field_sep, + sample->data_src, + symbol_conf.field_sep, + al.map ? (al.map->dso ? al.map->dso->long_name :"???" ) :"???" , + al.sym ? al.sym->name :"???" ); out_put:addr_location__put (&al);return 0 ;
@@ -287,10 +268,12 @@ static int report_raw_events(struct perf_mem *mem)if (ret <0 ) goto out_delete; +printf ("# PID, TID, IP, ADDR, " ); +if (mem->phys_addr) -printf ("# PID, TID, IP, ADDR, PHYS ADDR, LOCAL WEIGHT, DSRC, SYMBOL\n" ); -else -printf ("# PID, TID, IP, ADDR, LOCAL WEIGHT, DSRC, SYMBOL\n" ); +printf ("PHYS ADDR, " ); + +printf ("LOCAL WEIGHT, DSRC, SYMBOL\n" ); ret =perf_session__process_events (session);
Signature · 1 line
2.17.1
Re: [PATCH V2 06/12] perf mem: Clean up output format
On Mon, Nov 30, 2020 at 09:27:57AM -0800, [email protected] wrote:
SNIP
Quoted 32 lines
tools/perf/builtin-mem.c +1
-20@@ -172,7 +172,7 @@ dump_raw_samples(struct perf_tool *tool, { struct perf_mem *mem = container_of(tool, struct perf_mem, tool);struct addr_location al; -const char *fmt; +const char *fmt, *field_sep;if (machine__resolve (machine, &al, sample) <0 ) { fprintf(stderr, "problem processing %d event, skipping it.\n",@@ -186,60 +186,41 @@ dump_raw_samples(struct perf_tool *tool,if (al.map !=NULL ) al.map->dso->hit =1 ; -if (mem->phys_addr) { -if (symbol_conf.field_sep) { - fmt ="%d%s%d%s0x%" PRIx64"%s0x%" PRIx64"%s0x%016" PRIx64 -"%s%" PRIu64"%s0x%" PRIx64"%s%s:%s\n" ; - }else { - fmt ="%5d%s%5d%s0x%016" PRIx64"%s0x016%" PRIx64 -"%s0x%016" PRIx64"%s%5" PRIu64"%s0x%06" PRIx64 -"%s%s:%s\n" ; - symbol_conf.field_sep =" " ; - } - - printf(fmt, - sample->pid, - symbol_conf.field_sep, - sample->tid, - symbol_conf.field_sep, - sample->ip, - symbol_conf.field_sep, - sample->addr,
tools/perf/builtin-mem.c dump_raw_samples(struct perf_tool *tool, · line 189
Quoted 10 lines
tools/perf/builtin-mem.c +1
-9- symbol_conf.field_sep, - sample->phys_addr, - symbol_conf.field_sep, - sample->weight, - symbol_conf.field_sep, - sample->data_src, - symbol_conf.field_sep, - al.map ? (al.map->dso ? al.map->dso->long_name :"???" ) :"???" , - al.sym ? al.sym->name : "???"); + field_sep = symbol_conf.field_sep;
hum, what's the point of having field_sep?
Quoted 63 lines
tools/perf/builtin-mem.c +31
-23+if (field_sep) { + fmt ="%d%s%d%s0x%" PRIx64"%s0x%" PRIx64"%s" ; }else { -if (symbol_conf.field_sep) { - fmt ="%d%s%d%s0x%" PRIx64"%s0x%" PRIx64"%s%" PRIu64 -"%s0x%" PRIx64"%s%s:%s\n" ; - }else { - fmt ="%5d%s%5d%s0x%016" PRIx64"%s0x016%" PRIx64 -"%s%5" PRIu64"%s0x%06" PRIx64"%s%s:%s\n" ; - symbol_conf.field_sep =" " ; - } + fmt ="%5d%s%5d%s0x%016" PRIx64"%s0x016%" PRIx64"%s" ; + symbol_conf.field_sep =" " ; + } +printf (fmt, + sample->pid, + symbol_conf.field_sep, + sample->tid, + symbol_conf.field_sep, + sample->ip, + symbol_conf.field_sep, + sample->addr, + symbol_conf.field_sep); -printf (fmt, - sample->pid, - symbol_conf.field_sep, - sample->tid, - symbol_conf.field_sep, - sample->ip, - symbol_conf.field_sep, - sample->addr, - symbol_conf.field_sep, - sample->weight, - symbol_conf.field_sep, - sample->data_src, - symbol_conf.field_sep, - al.map ? (al.map->dso ? al.map->dso->long_name :"???" ) :"???" , - al.sym ? al.sym->name :"???" ); +if (mem->phys_addr) { +printf ("0x%016" PRIx64"%s" , + sample->phys_addr, + symbol_conf.field_sep); } + +if (field_sep) + fmt ="%" PRIu64"%s0x%" PRIx64"%s%s:%s\n" ; +else + fmt ="%5" PRIu64"%s0x%06" PRIx64"%s%s:%s\n" ; + +printf (fmt, + sample->weight, + symbol_conf.field_sep, + sample->data_src, + symbol_conf.field_sep, + al.map ? (al.map->dso ? al.map->dso->long_name :"???" ) :"???" , + al.sym ? al.sym->name :"???" ); out_put:addr_location__put (&al);return 0 ;@@ -287,10 +268,12 @@ static int report_raw_events(struct perf_mem *mem)if (ret <0 ) goto out_delete;
tools/perf/builtin-mem.c static int report_raw_events(struct perf_mem *mem) · line 276
Quoted 10 lines
tools/perf/builtin-mem.c +5
-3+printf ("# PID, TID, IP, ADDR, " ); +if (mem->phys_addr) -printf ("# PID, TID, IP, ADDR, PHYS ADDR, LOCAL WEIGHT, DSRC, SYMBOL\n" ); -else -printf ("# PID, TID, IP, ADDR, LOCAL WEIGHT, DSRC, SYMBOL\n" ); +printf ("PHYS ADDR, " ); + +printf ("LOCAL WEIGHT, DSRC, SYMBOL\n" );
if phys addr is the only member, can't we just squeeze it via
"%s", mem->phys_addr ? "PHYS ADDR" : "",
like I mentioned in the other reply? and same also above?
thanks,
jirka
Quoted 6 lines
tools/perf/builtin-mem.c +0
-0ret =perf_session__process_events (session);Signature · 1 line
2.17.1
Re: [PATCH V2 06/12] perf mem: Clean up output format
Quoted 40 lines · Jiri Olsa
On Mon, Nov 30, 2020 at 09:27:57AM -0800, [email protected] wrote:
SNIP
Quoted 36 lines
tools/perf/builtin-mem.c +1
-24@@ -172,7 +172,7 @@ dump_raw_samples(struct perf_tool *tool, { struct perf_mem *mem = container_of(tool, struct perf_mem, tool);struct addr_location al; -const char *fmt; +const char *fmt, *field_sep;if (machine__resolve (machine, &al, sample) <0 ) { fprintf(stderr, "problem processing %d event, skipping it.\n",@@ -186,60 +186,41 @@ dump_raw_samples(struct perf_tool *tool,if (al.map !=NULL ) al.map->dso->hit =1 ; -if (mem->phys_addr) { -if (symbol_conf.field_sep) { - fmt ="%d%s%d%s0x%" PRIx64"%s0x%" PRIx64"%s0x%016" PRIx64 -"%s%" PRIu64"%s0x%" PRIx64"%s%s:%s\n" ; - }else { - fmt ="%5d%s%5d%s0x%016" PRIx64"%s0x016%" PRIx64 -"%s0x%016" PRIx64"%s%5" PRIu64"%s0x%06" PRIx64 -"%s%s:%s\n" ; - symbol_conf.field_sep =" " ; - } - - printf(fmt, - sample->pid, - symbol_conf.field_sep, - sample->tid, - symbol_conf.field_sep, - sample->ip, - symbol_conf.field_sep, - sample->addr, - symbol_conf.field_sep, - sample->phys_addr, - symbol_conf.field_sep, - sample->weight,
Quoted 8 lines
tools/perf/builtin-mem.c dump_raw_samples(struct perf_tool *tool, · line 189
Quoted 6 lines
tools/perf/builtin-mem.c +1
-5- symbol_conf.field_sep, - sample->data_src, - symbol_conf.field_sep, - al.map ? (al.map->dso ? al.map->dso->long_name :"???" ) :"???" , - al.sym ? al.sym->name : "???"); + field_sep = symbol_conf.field_sep;hum, what's the point of having
field_sep?
To keep the fmt consistent.
The patch divides the "printf(fmt,..." into two part. In the first half part, the symbol_conf.field_sep may be modified to " ";
In the second half part, we should not use the modified symbol_conf.field_sep for the below check. The field_sep keeps the original value and should be used.
Quoted 65 lines
Quoted 65 lines
tools/perf/builtin-mem.c +31
-23+if (field_sep) { + fmt ="%d%s%d%s0x%" PRIx64"%s0x%" PRIx64"%s" ; }else { -if (symbol_conf.field_sep) { - fmt ="%d%s%d%s0x%" PRIx64"%s0x%" PRIx64"%s%" PRIu64 -"%s0x%" PRIx64"%s%s:%s\n" ; - }else { - fmt ="%5d%s%5d%s0x%016" PRIx64"%s0x016%" PRIx64 -"%s%5" PRIu64"%s0x%06" PRIx64"%s%s:%s\n" ; - symbol_conf.field_sep =" " ; - } + fmt ="%5d%s%5d%s0x%016" PRIx64"%s0x016%" PRIx64"%s" ; + symbol_conf.field_sep =" " ; + } +printf (fmt, + sample->pid, + symbol_conf.field_sep, + sample->tid, + symbol_conf.field_sep, + sample->ip, + symbol_conf.field_sep, + sample->addr, + symbol_conf.field_sep); -printf (fmt, - sample->pid, - symbol_conf.field_sep, - sample->tid, - symbol_conf.field_sep, - sample->ip, - symbol_conf.field_sep, - sample->addr, - symbol_conf.field_sep, - sample->weight, - symbol_conf.field_sep, - sample->data_src, - symbol_conf.field_sep, - al.map ? (al.map->dso ? al.map->dso->long_name :"???" ) :"???" , - al.sym ? al.sym->name :"???" ); +if (mem->phys_addr) { +printf ("0x%016" PRIx64"%s" , + sample->phys_addr, + symbol_conf.field_sep); } + +if (field_sep) + fmt ="%" PRIu64"%s0x%" PRIx64"%s%s:%s\n" ; +else + fmt ="%5" PRIu64"%s0x%06" PRIx64"%s%s:%s\n" ; + +printf (fmt, + sample->weight, + symbol_conf.field_sep, + sample->data_src, + symbol_conf.field_sep, + al.map ? (al.map->dso ? al.map->dso->long_name :"???" ) :"???" , + al.sym ? al.sym->name :"???" ); out_put:addr_location__put (&al);return 0 ;@@ -287,10 +268,12 @@ static int report_raw_events(struct perf_mem *mem)if (ret <0 ) goto out_delete;
Quoted 14 lines
tools/perf/builtin-mem.c static int report_raw_events(struct perf_mem *mem) · line 276
Quoted 9 lines
tools/perf/builtin-mem.c +5
-3+printf ("# PID, TID, IP, ADDR, " ); +if (mem->phys_addr) -printf ("# PID, TID, IP, ADDR, PHYS ADDR, LOCAL WEIGHT, DSRC, SYMBOL\n" ); -else -printf ("# PID, TID, IP, ADDR, LOCAL WEIGHT, DSRC, SYMBOL\n" ); +printf ("PHYS ADDR, " ); + +printf ("LOCAL WEIGHT, DSRC, SYMBOL\n" );if phys addr is the only member, can't we just squeeze it via
"%s",mem->phys_addr? "PHYS ADDR" : "",
like I mentioned in the other reply? and same also above?
The phys addr is not the only member, the next patch (07/12) will add data page size as a new member. So I factor out phys_addr in this and the previous patch (05/12).
Thanks,
Kan
Re: [PATCH V2 06/12] perf mem: Clean up output format
Quoted 51 lines · Kan
Quoted 38 lines · Jiri Olsa
On Mon, Nov 30, 2020 at 09:27:57AM -0800, [email protected] wrote:
SNIP
Quoted 34 lines
tools/perf/builtin-mem.c +1
-24@@ -172,7 +172,7 @@ dump_raw_samples(struct perf_tool *tool, { struct perf_mem *mem = container_of(tool, struct perf_mem, tool);struct addr_location al; -const char *fmt; +const char *fmt, *field_sep;if (machine__resolve (machine, &al, sample) <0 ) { fprintf(stderr, "problem processing %d event, skipping it.\n",@@ -186,60 +186,41 @@ dump_raw_samples(struct perf_tool *tool,if (al.map !=NULL ) al.map->dso->hit =1 ; -if (mem->phys_addr) { -if (symbol_conf.field_sep) { - fmt ="%d%s%d%s0x%" PRIx64"%s0x%" PRIx64"%s0x%016" PRIx64 -"%s%" PRIu64"%s0x%" PRIx64"%s%s:%s\n" ; - }else { - fmt ="%5d%s%5d%s0x%016" PRIx64"%s0x016%" PRIx64 -"%s0x%016" PRIx64"%s%5" PRIu64"%s0x%06" PRIx64 -"%s%s:%s\n" ; - symbol_conf.field_sep =" " ; - } - - printf(fmt, - sample->pid, - symbol_conf.field_sep, - sample->tid, - symbol_conf.field_sep, - sample->ip, - symbol_conf.field_sep, - sample->addr, - symbol_conf.field_sep, - sample->phys_addr, - symbol_conf.field_sep, - sample->weight,Quoted 8 lines
tools/perf/builtin-mem.c dump_raw_samples(struct perf_tool *tool, · line 189
Quoted 6 lines
tools/perf/builtin-mem.c +1
-5- symbol_conf.field_sep, - sample->data_src, - symbol_conf.field_sep, - al.map ? (al.map->dso ? al.map->dso->long_name :"???" ) :"???" , - al.sym ? al.sym->name : "???"); + field_sep = symbol_conf.field_sep;hum, what's the point of having
field_sep?
Quoted 7 lines
To keep the fmt consistent.
The patch divides the "printf(fmt,..." into two part. In the first half part, the symbol_conf.field_sep may be modified to " ";
In the second half part, we should not use the modified symbol_conf.field_sep for the below check. Thefield_sepkeeps the original value and should be used.
ok, I missed it's being moified.. thanks
jirka
PATCH v2 7/12 perf mem: Support data page size
In reply to [email protected]From: Kan Liang <[email protected]>
Add option --data-page-size in "perf mem" to record/report data page size.
Here are some examples.
perf mem --phys-data --data-page-size report -D
# PID, TID, IP, ADDR, PHYS ADDR, DATA PAGE SIZE, LOCAL WEIGHT, DSRC, # SYMBOL
20134 20134 0xffffffffb5bd2fd0 0x016ffff9a274e96a308 0x000000044e96a308 4K 1168 0x5080144 /lib/modules/4.18.0-rc7+/build/vmlinux:perf_ctx_unlock
20134 20134 0xffffffffb63f645c 0xffffffffb752b814 0xcfb52b814 2M 225 0x26a100142 /lib/modules/4.18.0-rc7+/build/vmlinux:_raw_spin_lock 20134 20134 0xffffffffb660300c 0xfffffe00016b8bb0 0x0 4K 0 0x5080144 /lib/modules/4.18.0-rc7+/build/vmlinux:__x86_indirect_thunk_rax
perf mem --phys-data --data-page-size report --stdio
# To display the perf.data header info, please use
# --header/--header-only options.
#
#
# Total Lost Samples: 0
#
# Samples: 5K of event 'cpu/mem-loads,ldlat=30/P'
# Total weight : 281234
# Sort order :
# mem,sym,dso,symbol_daddr,dso_daddr,tlb,locked,phys_daddr,data_page_size #
# Overhead Samples Memory access Symbol
# Shared Object Data Symbol Data
# Object TLB access Locked Data Physical
# Address Data Page Size
# ........ ............ ........................
# ................................ ................
# ........................................... .......................
# ...................... ...... ......................
# ......................
#
28.54% 1826 L1 or L1 hit [k]
__x86_indirect_thunk_rax [kernel.vmlinux] [k] 0xffffb0df31b0ff28
[unknown] L1 or L2 hit No [k]
0000000000000000 4K
6.02% 256 L1 or L1 hit [.] touch_buffer
dtlb [.] 0x00007ffd50109da8 [stack]
L1 or L2 hit No [.] 0x000000042454ada8 4K
3.23% 5 L1 or L1 hit [k] clear_huge_page
[kernel.vmlinux] [k] 0xffff9a2753b8ce60 [unknown]
L1 or L2 hit No [k] 0x0000000453b8ce60 2M
2.98% 4 L1 or L1 hit [k] clear_page_erms
[kernel.vmlinux] [k] 0xffffb0df31b0fd00 [unknown]
L1 or L2 hit No [k] 0000000000000000 4K--- tools/perf/Documentation/perf-mem.txt | 3 +++ tools/perf/builtin-mem.c | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-mem.txt +3 -0
@@ -63,6 +63,9 @@ OPTIONS --phys-data:: Record/Report sample physical addresses +--data-page-size:: + Record/Report sample data address page size + RECORD OPTIONS -------------- -e::
tools/perf/builtin-mem.c +19 -1
@@ -30,6 +30,7 @@ struct perf_mem {bool dump_raw;bool force;bool phys_addr; +bool data_page_size;int operation;const char *cpu_list;DECLARE_BITMAP (cpu_bitmap,MAX_NR_CPUS );
@@ -124,6 +125,9 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem)if (mem->phys_addr) rec_argv[i++] ="--phys-data" ; +if (mem->data_page_size) + rec_argv[i++] ="--data-page-size" ; +for (j =0 ; j <PERF_MEM_EVENTS__MAX ; j++) { e =perf_mem_events__ptr (j);if (!e->record)
@@ -173,6 +177,7 @@ dump_raw_samples(struct perf_tool *tool, struct perf_mem *mem = container_of(tool, struct perf_mem, tool);struct addr_location al;const char *fmt, *field_sep; +char str[PAGE_SIZE_NAME_LEN ];if (machine__resolve (machine, &al, sample) <0 ) { fprintf(stderr, "problem processing %d event, skipping it.\n",
@@ -209,6 +214,12 @@ dump_raw_samples(struct perf_tool *tool, symbol_conf.field_sep); } +if (mem->data_page_size) { +printf ("%s%s" , +get_page_size_name (sample->data_page_size, str), + symbol_conf.field_sep); + } +if (field_sep) fmt ="%" PRIu64"%s0x%" PRIx64"%s%s:%s\n" ;else
@@ -273,6 +284,9 @@ static int report_raw_events(struct perf_mem *mem)if (mem->phys_addr)printf ("PHYS ADDR, " ); +if (mem->data_page_size) +printf ("DATA PAGE SIZE, " ); +printf ("LOCAL WEIGHT, DSRC, SYMBOL\n" ); ret =perf_session__process_events (session);
@@ -283,7 +297,7 @@ static int report_raw_events(struct perf_mem *mem) }static char *get_sort_order (struct perf_mem *mem) { -bool has_extra_options = mem->phys_addr ? true : false; +bool has_extra_options = (mem->phys_addr | mem->data_page_size) ? true : false;char sort[128 ];/*
@@ -302,6 +316,9 @@ static char *get_sort_order(struct perf_mem *mem)if (mem->phys_addr)strcat (sort,",phys_daddr" ); +if (mem->data_page_size) +strcat (sort,",data_page_size" ); +return strdup (sort); }
@@ -447,6 +464,7 @@ int cmd_mem(int argc, const char **argv) " between columns '.' is reserved."),OPT_BOOLEAN ('f' ,"force" , &mem.force,"don't complain, do it" ),OPT_BOOLEAN ('p' ,"phys-data" , &mem.phys_addr,"Record/Report sample physical addresses" ), +OPT_BOOLEAN (0 ,"data-page-size" , &mem.data_page_size,"Record/Report sample data address page size" ), OPT_END() };const char *const mem_subcommands[] = {"record" ,"report" ,NULL };
Signature · 1 line
2.17.1
PATCH v2 8/12 perf test: Add test case for PERF_SAMPLE_DATA_PAGE_SIZE
In reply to [email protected]From: Kan Liang <[email protected]>
Extend sample-parsing test cases to support new sample type PERF_SAMPLE_DATA_PAGE_SIZE.
--- tools/perf/tests/sample-parsing.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tools/perf/tests/sample-parsing.c +5 -1
@@ -154,6 +154,9 @@ static bool samples_same(const struct perf_sample *s1,if (type &PERF_SAMPLE_CGROUP )COMP (cgroup); +if (type &PERF_SAMPLE_DATA_PAGE_SIZE ) +COMP (data_page_size); +if (type &PERF_SAMPLE_AUX ) {COMP (aux_sample.size); if (memcmp(s1->aux_sample.data, s2->aux_sample.data,
@@ -234,6 +237,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) }, .phys_addr = 113, .cgroup = 114, + .data_page_size = 4096, .aux_sample = { .size = sizeof(aux_data), .data = (void *)aux_data,
@@ -340,7 +344,7 @@ int test__sample_parsing(struct test *test __maybe_unused, int subtest __maybe_u* were added. Please actually update the test rather than just change * the condition below. */ -if (PERF_SAMPLE_MAX >PERF_SAMPLE_CGROUP <<1 ) { +if (PERF_SAMPLE_MAX >PERF_SAMPLE_DATA_PAGE_SIZE <<1 ) {pr_debug ("sample format has changed, some new PERF_SAMPLE_ bit was introduced - test needs updating\n" );return -1 ; }
Signature · 1 line
2.17.1
PATCH v2 9/12 perf tools: Add support for PERF_SAMPLE_CODE_PAGE_SIZE
In reply to [email protected]From: Stephane Eranian <[email protected]>
Adds the infrastructure to sample the code address page size.
Introduce a new --code-page-size option for perf record.
--- tools/perf/Documentation/perf-record.txt | 3 +++ tools/perf/builtin-record.c | 2 ++ tools/perf/util/event.h | 1 + tools/perf/util/evsel.c | 9 +++++++++ tools/perf/util/perf_event_attr_fprintf.c | 2 +- tools/perf/util/record.h | 1 + tools/perf/util/synthetic-events.c | 8 ++++++++ 7 files changed, 25 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-record.txt +3 -0
@@ -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
tools/perf/builtin-record.c +2 -0
@@ -2478,6 +2478,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,
tools/perf/util/event.h +1 -0
@@ -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;
tools/perf/util/evsel.c +9 -0
@@ -1193,6 +1193,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;
@@ -2374,6 +2377,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++;
tools/perf/util/perf_event_attr_fprintf.c +1 -1
@@ -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
tools/perf/util/record.h +1 -0
@@ -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;
tools/perf/util/synthetic-events.c +8 -0
@@ -1409,6 +1409,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;
@@ -1593,6 +1596,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;
Signature · 1 line
2.17.1
PATCH v2 10/12 perf script: Add support for PERF_SAMPLE_CODE_PAGE_SIZE
In reply to [email protected]From: Stephane Eranian <[email protected]>
Display sampled code page sizes when PERF_SAMPLE_CODE_PAGE_SIZE was set.
For example,
perf script --fields comm,event,ip,code_page_size
dtlb mem-loads:uP: 445777 4K
dtlb mem-loads:uP: 40f724 4K
dtlb mem-loads:uP: 474926 4K
dtlb mem-loads:uP: 401075 4K
dtlb mem-loads:uP: 401095 4K
dtlb mem-loads:uP: 401095 4K
dtlb mem-loads:uP: 4010cc 4K
dtlb mem-loads:uP: 440b6f 4K--- tools/perf/Documentation/perf-script.txt | 2 +- tools/perf/builtin-script.c | 13 +++++++++++-- tools/perf/util/session.c | 3 +++ 3 files changed, 15 insertions(+), 3 deletions(-)
tools/perf/Documentation/perf-script.txt +1 -1
@@ -118,7 +118,7 @@ OPTIONS comm, tid, pid, time, cpu, event, trace, ip, sym, dso, addr, symoff, srcline, period, iregs, uregs, brstack, brstacksym, flags, bpf-output, brstackinsn, brstackoff, callindent, insn, insnlen, synth, phys_addr, - metric, misc, srccode, ipc, data_page_size. + metric, misc, srccode, ipc, data_page_size, code_page_size. Field list can be prepended with the type, trace, sw or hw, to indicate to which event type the field list applies. e.g., -F sw:comm,tid,time,ip,sym and -F trace:time,cpu,trace
tools/perf/builtin-script.c +11 -2
@@ -117,6 +117,7 @@ enum perf_output_field {PERF_OUTPUT_IPC =1ULL <<31 ,PERF_OUTPUT_TOD =1ULL <<32 ,PERF_OUTPUT_DATA_PAGE_SIZE =1ULL <<33 , + PERF_OUTPUT_CODE_PAGE_SIZE = 1ULL << 34, }; struct perf_script {
@@ -182,6 +183,7 @@ struct output_option { {.str = "ipc", .field = PERF_OUTPUT_IPC}, {.str = "tod", .field = PERF_OUTPUT_TOD}, {.str = "data_page_size", .field = PERF_OUTPUT_DATA_PAGE_SIZE}, + {.str = "code_page_size", .field = PERF_OUTPUT_CODE_PAGE_SIZE}, }; enum {
@@ -255,7 +257,7 @@ static struct {PERF_OUTPUT_DSO |PERF_OUTPUT_PERIOD |PERF_OUTPUT_ADDR |PERF_OUTPUT_DATA_SRC |PERF_OUTPUT_WEIGHT |PERF_OUTPUT_PHYS_ADDR | - PERF_OUTPUT_DATA_PAGE_SIZE, + PERF_OUTPUT_DATA_PAGE_SIZE | PERF_OUTPUT_CODE_PAGE_SIZE, .invalid_fields = PERF_OUTPUT_TRACE | PERF_OUTPUT_BPF_OUTPUT, },
@@ -507,6 +509,10 @@ static int evsel__check_attr(struct evsel *evsel, struct perf_session *session) evsel__check_stype(evsel, PERF_SAMPLE_DATA_PAGE_SIZE, "DATA_PAGE_SIZE", PERF_OUTPUT_DATA_PAGE_SIZE)) return -EINVAL; +if (PRINT_FIELD (CODE_PAGE_SIZE ) && +evsel__check_stype (evsel,PERF_SAMPLE_CODE_PAGE_SIZE ,"CODE_PAGE_SIZE" ,PERF_OUTPUT_CODE_PAGE_SIZE )) +return -EINVAL ; +return 0 ; }
@@ -2020,6 +2026,9 @@ static void process_event(struct perf_script *script,if (PRINT_FIELD (DATA_PAGE_SIZE ))fprintf (fp," %s" ,get_page_size_name (sample->data_page_size, str)); +if (PRINT_FIELD (CODE_PAGE_SIZE )) +fprintf (fp," %s" ,get_page_size_name (sample->code_page_size, str)); +perf_sample__fprintf_ipc (sample, attr, fp);fprintf (fp,"\n" );
@@ -3519,7 +3528,7 @@ int cmd_script(int argc, const char **argv) "addr,symoff,srcline,period,iregs,uregs,brstack," "brstacksym,flags,bpf-output,brstackinsn,brstackoff," "callindent,insn,insnlen,synth,phys_addr,metric,misc,ipc,tod," - "data_page_size", + "data_page_size,code_page_size", parse_output_fields),OPT_BOOLEAN ('a' ,"all-cpus" , &system_wide, "system-wide collection from all CPUs"),
tools/perf/util/session.c +3 -0
@@ -1321,6 +1321,9 @@ static void dump_sample(struct evsel *evsel, union perf_event *event,if (sample_type &PERF_SAMPLE_DATA_PAGE_SIZE )printf (" .. data page size: %s\n" ,get_page_size_name (sample->data_page_size, str)); +if (sample_type &PERF_SAMPLE_CODE_PAGE_SIZE ) +printf (" .. code page size: %s\n" ,get_page_size_name (sample->code_page_size, str)); +if (sample_type &PERF_SAMPLE_TRANSACTION )printf ("... transaction: %" PRIx64"\n" , sample->transaction);
Signature · 1 line
2.17.1
PATCH v2 11/12 perf report: Add support for PERF_SAMPLE_CODE_PAGE_SIZE
In reply to [email protected]From: Stephane Eranian <[email protected]>
Add a new sort dimension "code_page_size" for common sort. With this option applied, perf can sort and report by sample's code page size.
For example,
perf report --stdio --sort=comm,symbol,code_page_size
# To display the perf.data header info, please use # --header/--header-only options.
#
#
# Total Lost Samples: 0
#
# Samples: 3K of event 'mem-loads:uP'
# Event count (approx.): 1470769
#
# Overhead Command Symbol Code Page Size IPC
# [IPC Coverage]
# ........ ....... ............................ ..............
# ....................
#
69.56% dtlb [.] GetTickCount 4K - 17.93% dtlb [.] Calibrate 4K -
-
11.40% dtlb [.] __gettimeofday 4K -
-
--- tools/perf/Documentation/perf-report.txt | 1 + tools/perf/util/hist.c | 2 ++ tools/perf/util/hist.h | 1 + tools/perf/util/sort.c | 26 ++++++++++++++++++++++++ tools/perf/util/sort.h | 2 ++ 5 files changed, 32 insertions(+)
tools/perf/Documentation/perf-report.txt +1 -0
@@ -108,6 +108,7 @@ OPTIONS - period: Raw number of event count of sample - time: Separate the samples by time stamp with the resolution specified by --time-quantum (default 100ms). Specify with overhead and before it. + - code_page_size: the code page size of sampled code address (ip) By default, comm, dso and symbol keys are used. (i.e. --sort comm,dso,symbol)
tools/perf/util/hist.c +2 -0
@@ -212,6 +212,7 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)hists__new_col_len (hists,HISTC_TIME ,16 ); else hists__new_col_len(hists, HISTC_TIME, 12); + hists__new_col_len(hists, HISTC_CODE_PAGE_SIZE, 6); if (h->srcline) { len =MAX (strlen (h->srcline),strlen (sort_srcline.se_header));
@@ -718,6 +719,7 @@ __hists__add_entry(struct hists *hists, .cpumode = al->cpumode, .ip = al->addr, .level = al->level, + .code_page_size = sample->code_page_size, .stat = { .nr_events = 1, .period = sample->period,
tools/perf/util/hist.h +1 -0
@@ -53,6 +53,7 @@ enum hist_column {HISTC_DSO_TO ,HISTC_LOCAL_WEIGHT ,HISTC_GLOBAL_WEIGHT , +HISTC_CODE_PAGE_SIZE ,HISTC_MEM_DADDR_SYMBOL ,HISTC_MEM_DADDR_DSO , HISTC_MEM_PHYS_DADDR,
tools/perf/util/sort.c +26 -0
@@ -1491,6 +1491,31 @@ struct sort_entry sort_mem_data_page_size = { .se_width_idx = HISTC_MEM_DATA_PAGE_SIZE, }; +static int64_t +sort__code_page_size_cmp (struct hist_entry *left,struct hist_entry *right) +{ +uint64_t l = left->code_page_size; +uint64_t r = right->code_page_size; + +return (int64_t )(r - l); +} + +static int hist_entry__code_page_size_snprintf (struct hist_entry *he,char *bf, +size_t size,unsigned int width) +{ +char str[PAGE_SIZE_NAME_LEN ]; + +return repsep_snprintf (bf, size,"%-*s" , width, +get_page_size_name (he->code_page_size, str)); +} + +struct sort_entry sort_code_page_size = { + .se_header ="Code Page Size" , + .se_cmp = sort__code_page_size_cmp, + .se_snprintf = hist_entry__code_page_size_snprintf, + .se_width_idx =HISTC_CODE_PAGE_SIZE , +}; +static int64_t sort__abort_cmp (struct hist_entry *left,struct hist_entry *right) {
@@ -1735,6 +1760,7 @@ static struct sort_dimension common_sort_dimensions[] = {DIM (SORT_CGROUP_ID ,"cgroup_id" , sort_cgroup_id),DIM (SORT_SYM_IPC_NULL ,"ipc_null" , sort_sym_ipc_null),DIM (SORT_TIME ,"time" , sort_time), + DIM(SORT_CODE_PAGE_SIZE, "code_page_size", sort_code_page_size), };#undef DIM
tools/perf/util/sort.h +2 -0
@@ -106,6 +106,7 @@ struct hist_entry {u64 transaction;s32 socket;s32 cpu; +u64 code_page_size;u8 cpumode;u8 depth;
@@ -229,6 +230,7 @@ enum sort_type {SORT_CGROUP_ID ,SORT_SYM_IPC_NULL ,SORT_TIME , +SORT_CODE_PAGE_SIZE ,/* branch stack specific sort keys */ __SORT_BRANCH_STACK,
Signature · 1 line
2.17.1
PATCH v2 12/12 perf test: Add test case for PERF_SAMPLE_CODE_PAGE_SIZE
In reply to [email protected]From: Stephane Eranian <[email protected]>
Extend sample-parsing test cases to support new sample type PERF_SAMPLE_CODE_PAGE_SIZE.
--- tools/perf/tests/sample-parsing.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tools/perf/tests/sample-parsing.c +5 -1
@@ -157,6 +157,9 @@ static bool samples_same(const struct perf_sample *s1,if (type &PERF_SAMPLE_DATA_PAGE_SIZE )COMP (data_page_size); +if (type &PERF_SAMPLE_CODE_PAGE_SIZE ) +COMP (code_page_size); +if (type &PERF_SAMPLE_AUX ) {COMP (aux_sample.size); if (memcmp(s1->aux_sample.data, s2->aux_sample.data,
@@ -238,6 +241,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format) .phys_addr = 113, .cgroup = 114, .data_page_size = 4096, + .code_page_size = 4096, .aux_sample = { .size = sizeof(aux_data), .data = (void *)aux_data,
@@ -344,7 +348,7 @@ int test__sample_parsing(struct test *test __maybe_unused, int subtest __maybe_u* were added. Please actually update the test rather than just change * the condition below. */ -if (PERF_SAMPLE_MAX >PERF_SAMPLE_DATA_PAGE_SIZE <<1 ) { +if (PERF_SAMPLE_MAX >PERF_SAMPLE_CODE_PAGE_SIZE <<1 ) {pr_debug ("sample format has changed, some new PERF_SAMPLE_ bit was introduced - test needs updating\n" );return -1 ; }
Signature · 1 line
2.17.1
Quoted 37 lines · On Mon, Nov 30, 2020 at 09:27:51AM -0800, [email protected] wrote:
From: Kan Liang <[email protected]>
Changes since V1:
- Fix the compile warning with GCC 10
- Add Acked-by from Namhyung KimCurrent perf can report both virtual addresses and physical addresses, but not the page size. Without the page size information of the utilized page, users cannot decide whether to promote/demote large pages to optimize memory usage.
The kernel patches have been merged into tip perf/core branch, commit
8d97e71811aa("perf/core: AddPERF_SAMPLE_DATA_PAGE_SIZE") commit76a5433f95f3("perf/x86/intel: SupportPERF_SAMPLE_DATA_PAGE_SIZE") commit4cb6a42e4c4b("powerpc/perf: SupportPERF_SAMPLE_DATA_PAGE_SIZE") commit995f088efebe("perf/core: Add support forPERF_SAMPLE_CODE_PAGE_SIZE") commit51b646b2d9f8("perf,mm: Handle non-page-table-aligned hugetlbfs")and Peter's perf/core branch
commit524680ce47a1("mm/gup: Providegup_get_pte()more generic") commit44a35d6937d2("mm: IntroducepXX_leaf_size()") commit2f1e2f091ad0("perf/core: Fixarch_perf_get_page_size()") commit7649e44aacdd("arm64/mm: ImplementpXX_leaf_size()support") commit1df1ae7e262c("sparc64/mm: ImplementpXX_leaf_size()support")This patch set is to enable the page size support in user tools.
Kan Liang (8):
tools headers UAPI: Update tools's copy oflinux/perf_event.hperf record: Support new sample type for data page size perf script: Support data page size
perf sort: Add sort option for data page size
perf mem: Factor out a function to generate sort order perf mem: Clean up output format
perf mem: Support data page size
perf test: Add test case forPERF_SAMPLE_DATA_PAGE_SIZE
Quoted 5 lines
Stephane Eranian (4):
perf tools: Add support forPERF_SAMPLE_CODE_PAGE_SIZEperf script: Add support forPERF_SAMPLE_CODE_PAGE_SIZEperf report: Add support forPERF_SAMPLE_CODE_PAGE_SIZEperf test: Add test case forPERF_SAMPLE_CODE_PAGE_SIZE
thanks,
jirka
Quoted 27 lines
tools/include/uapi/linux/perf_event.h | 6 +- tools/perf/Documentation/perf-mem.txt | 3 + tools/perf/Documentation/perf-record.txt | 6 + tools/perf/Documentation/perf-report.txt | 2 + tools/perf/Documentation/perf-script.txt | 5 +- tools/perf/builtin-mem.c | 150 ++++++++++++---------- tools/perf/builtin-record.c | 4 + tools/perf/builtin-script.c | 26 +++- tools/perf/tests/sample-parsing.c | 10 +- tools/perf/util/event.h | 5 + tools/perf/util/evsel.c | 18 +++ tools/perf/util/hist.c | 5 + tools/perf/util/hist.h | 2 + tools/perf/util/machine.c | 7 +- tools/perf/util/map_symbol.h | 1 + tools/perf/util/perf_event_attr_fprintf.c | 2 +- tools/perf/util/record.h | 2 + tools/perf/util/session.c | 26 ++++ tools/perf/util/sort.c | 56 ++++++++ tools/perf/util/sort.h | 3 + tools/perf/util/synthetic-events.c | 16 +++ 21 files changed, 278 insertions(+), 77 deletions(-)Signature · 1 line
2.17.1