Stitch LBR call stack (kernel)
Subsystems (3)
v6 cover Stitch LBR call stack (kernel)
From: Kan Liang <[email protected]>
Changes since V5
- Modify the changelog and comments
- To match the struct perf_branch_stack order, output hw_idx before entries[nr].
Changes since V4
- Only include the kernel patches
- Abstract TOS to HW index, which can be used across hw platforms. If we don't know the order of raw branch records, the hw_idx should be -1ULL. Set hw_idx to -1ULL for IBM Power for now.
- Move the new branch sample type back to bit 17
Changes since V3
- Add the new branch sample type at the end of enum perf_branch_sample_type.
- Rebase the user space patch on top of acme's perf/core branch
Changes since V2
- Move tos into struct perf_branch_stack
Changes since V1
- Add a new branch sample type for LBR TOS. Drop the sample type in V1.
- Add check in perf header to detect unknown input bits in event attr
- Save and use the LBR cursor nodes from previous sample to avoid duplicate calculation of cursor nodes.
- Add fast path for duplicate entries check. It benefits all call stack parsing, not just for stitch LBR call stack. It can be merged independetely.
Start from Haswell, Linux perf can utilize the existing Last Branch Record (LBR) facility to record call stack. However, the depth of the reconstructed LBR call stack limits to the number of LBR registers. E.g. on skylake, the depth of reconstructed LBR call stack is <= 32 That's because HW will overwrite the oldest LBR registers when it's full.
However, the overwritten LBRs may still be retrieved from previous sample. At that moment, HW hasn't overwritten the LBR registers yet. Perf tools can stitch those overwritten LBRs on current call stacks to get a more complete call stack.
To determine if LBRs can be stitched, the physical index of LBR registers is required. A new branch sample type is introduced to dump the LBR Top-of-Stack (TOS) information for perf tools.
The stitching approach base on LBR call stack technology. The known limitations of LBR call stack technology still apply to the approach, e.g. Exception handing such as setjmp/longjmp will have calls/returns not match.
This approach is not full proof. There can be cases where it creates incorrect call stacks from incorrect matches. There is no attempt to validate any matches in another way. So it is not enabled by default. However in many common cases with call stack overflows it can recreate better call stacks than the default lbr call stack output. So if there are problems with LBR overflows this is a possible workaround.
Regression:
Users may collect LBR call stack on a machine with new perf tool and new kernel (support LBR TOS). However, they may parse the perf.data with old perf tool (not support LBR TOS). The old tool doesn't check attr.branch_sample_type. Users probably get incorrect information without any warning.
Kan Liang (2):
perf/core: Add new branch sample type for HW index of raw branch
records
perf/x86/intel: Output LBR TOS information
arch/powerpc/perf/core-book3s.c | 1 + arch/x86/events/intel/lbr.c | 9 +++++++++ include/linux/perf_event.h | 12 ++++++++++++ include/uapi/linux/perf_event.h | 8 +++++++- kernel/events/core.c | 10 ++++++++++ 5 files changed, 39 insertions(+), 1 deletion(-)
Signature · 1 line
2.17.1
PATCH v6 1/2 perf/core: Add new branch sample type for HW index of raw branch records
From: Kan Liang <[email protected]>
The low level index is the index in the underlying hardware buffer of the most recently captured taken branch which is always saved in branch_entries[0]. It is very useful for reconstructing the call stack. For example, in Intel LBR call stack mode, the depth of reconstructed LBR call stack limits to the number of LBR registers. With the low level index information, perf tool may stitch the stacks of two samples. The reconstructed LBR call stack can break the HW limitation.
Add a new branch sample type to retrieve low level index of raw branch records. The low level index is between -1 (unknown) and max depth which can be retrieved in /sys/devices/cpu/caps/branches.
Only when the new branch sample type is set, the low level index information is dumped into the PERF_SAMPLE_BRANCH_STACK output. Perf tool should check the attr.branch_sample_type, and apply the corresponding format for PERF_SAMPLE_BRANCH_STACK samples. Otherwise, some user case may be broken. For example, users may parse a perf.data, which include the new branch sample type, with an old version perf tool (without the check). Users probably get incorrect information without any warning.
--- arch/powerpc/perf/core-book3s.c | 1 + arch/x86/events/intel/lbr.c | 3 +++ include/linux/perf_event.h | 12 ++++++++++++ include/uapi/linux/perf_event.h | 8 +++++++- kernel/events/core.c | 10 ++++++++++ 5 files changed, 33 insertions(+), 1 deletion(-)
arch/powerpc/perf/core-book3s.c +1 -0
@@ -524,6 +524,7 @@ static void power_pmu_bhrb_read(struct perf_event *event, struct cpu_hw_events * } } cpuhw->bhrb_stack.nr = u_index; + cpuhw->bhrb_stack.hw_idx =-1ULL ;return ; }
arch/x86/events/intel/lbr.c +3 -0
@@ -585,6 +585,7 @@ static void intel_pmu_lbr_read_32(struct cpu_hw_events *cpuc) cpuc->lbr_entries[i].reserved =0 ; } cpuc->lbr_stack.nr = i; + cpuc->lbr_stack.hw_idx =-1ULL ; }/*
@@ -680,6 +681,7 @@ static void intel_pmu_lbr_read_64(struct cpu_hw_events *cpuc) out++; } cpuc->lbr_stack.nr = out; + cpuc->lbr_stack.hw_idx =-1ULL ; }void intel_pmu_lbr_read (void )
@@ -1120,6 +1122,7 @@ void intel_pmu_store_pebs_lbrs(struct pebs_lbr *lbr)int i; cpuc->lbr_stack.nr = x86_pmu.lbr_nr; + cpuc->lbr_stack.hw_idx =-1ULL ;for (i =0 ; i < x86_pmu.lbr_nr; i++) {u64 info = lbr->lbr[i].info;struct perf_branch_entry *e = &cpuc->lbr_entries[i];
include/linux/perf_event.h +12 -0
@@ -93,14 +93,26 @@ struct perf_raw_record {/* * branch stack layout: * nr: number of taken branches stored in entries[] +* hw_idx: The low level index of raw branch records +* for the most recent branch. +* -1ULL means invalid/unknown. * * Note that nr can vary from sample to sample * branches (to, from) are stored from most recent * to least recent, i.e., entries[0] contains the most * recent branch. +* The entries[] is an abstraction of raw branch records, +* which may not be stored in age order in HW, e.g. Intel LBR. +* The hw_idx is to expose the low level index of raw +* branch record for the most recent branch aka entries[0]. +* The hw_idx index is between -1 (unknown) and max depth, +* which can be retrieved in /sys/devices/cpu/caps/branches. +* For the architectures whose raw branch records are +* already stored in age order, the hw_idx should be 0. */ struct perf_branch_stack {__u64 nr; +__u64 hw_idx;struct perf_branch_entry entries[0 ]; };
include/uapi/linux/perf_event.h +7 -1
@@ -181,6 +181,8 @@ enum perf_branch_sample_type_shift {PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT =16 ,/* save branch type */ +PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT =17 ,/* save low level index of raw branch records */ + PERF_SAMPLE_BRANCH_MAX_SHIFT /* non-ABI */ };
@@ -208,6 +210,8 @@ enum perf_branch_sample_type {PERF_SAMPLE_BRANCH_TYPE_SAVE =1U <<PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT , +PERF_SAMPLE_BRANCH_HW_INDEX =1U <<PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT , + PERF_SAMPLE_BRANCH_MAX = 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT, };
@@ -853,7 +857,9 @@ enum perf_event_type {* char data[size];}&& PERF_SAMPLE_RAW * * { u64 nr; -* { u64 from, to, flags } lbr[nr];} && PERF_SAMPLE_BRANCH_STACK +* { u64 hw_idx; } && PERF_SAMPLE_BRANCH_HW_INDEX +* { u64 from, to, flags } lbr[nr]; +* } && PERF_SAMPLE_BRANCH_STACK * * { u64 abi; # enum perf_sample_regs_abi * u64 regs[weight(mask)]; } && PERF_SAMPLE_REGS_USER
kernel/events/core.c +10 -0
@@ -6546,6 +6546,11 @@ static void perf_output_read(struct perf_output_handle *handle,perf_output_read_one (handle, event, enabled, running); } +static inline bool perf_sample_save_hw_index (struct perf_event *event) +{ +return event->attr.branch_sample_type &PERF_SAMPLE_BRANCH_HW_INDEX ; +} + void perf_output_sample(struct perf_output_handle *handle, struct perf_event_header *header, struct perf_sample_data *data,
@@ -6634,6 +6639,8 @@ void perf_output_sample(struct perf_output_handle *handle, *sizeof (struct perf_branch_entry );perf_output_put (handle, data->br_stack->nr); +if (perf_sample_save_hw_index (event)) +perf_output_put (handle, data->br_stack->hw_idx);perf_output_copy (handle, data->br_stack->entries, size); }else {/*
@@ -6827,6 +6834,9 @@ void perf_prepare_sample(struct perf_event_header *header,if (sample_type &PERF_SAMPLE_BRANCH_STACK ) {int size =sizeof (u64);/* nr */ if (data->br_stack) { +if (perf_sample_save_hw_index (event)) + size +=sizeof (u64); + size += data->br_stack->nr *sizeof (struct perf_branch_entry ); }
Signature · 1 line
2.17.1
[tip: perf/core] perf/core: Add new branch sample type for HW index of raw branch records
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: bbfd5e4fab63703375eafaf241a0c696024a59e1 Gitweb: https://git.kernel.org/tip/bbfd5e4fab63703375eafaf241a0c696024a59e1 Author: Kan Liang <[email protected]> AuthorDate: Mon, 27 Jan 2020 08:53:54 -08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Tue, 11 Feb 2020 13:23:49 +01:00
perf/core: Add new branch sample type for HW index of raw branch records
The low level index is the index in the underlying hardware buffer of the most recently captured taken branch which is always saved in branch_entries[0]. It is very useful for reconstructing the call stack. For example, in Intel LBR call stack mode, the depth of reconstructed LBR call stack limits to the number of LBR registers. With the low level index information, perf tool may stitch the stacks of two samples. The reconstructed LBR call stack can break the HW limitation.
Add a new branch sample type to retrieve low level index of raw branch records. The low level index is between -1 (unknown) and max depth which can be retrieved in /sys/devices/cpu/caps/branches.
Only when the new branch sample type is set, the low level index information is dumped into the PERF_SAMPLE_BRANCH_STACK output. Perf tool should check the attr.branch_sample_type, and apply the corresponding format for PERF_SAMPLE_BRANCH_STACK samples. Otherwise, some user case may be broken. For example, users may parse a perf.data, which include the new branch sample type, with an old version perf tool (without the check). Users probably get incorrect information without any warning.
--- arch/powerpc/perf/core-book3s.c | 1 + arch/x86/events/intel/lbr.c | 3 +++ include/linux/perf_event.h | 12 ++++++++++++ include/uapi/linux/perf_event.h | 8 +++++++- kernel/events/core.c | 10 ++++++++++ 5 files changed, 33 insertions(+), 1 deletion(-)
arch/powerpc/perf/core-book3s.c +1 -0
@@ -518,6 +518,7 @@ static void power_pmu_bhrb_read(struct perf_event *event, struct cpu_hw_events * } } cpuhw->bhrb_stack.nr = u_index; + cpuhw->bhrb_stack.hw_idx =-1ULL ;return ; }
arch/x86/events/intel/lbr.c +3 -0
@@ -585,6 +585,7 @@ static void intel_pmu_lbr_read_32(struct cpu_hw_events *cpuc) cpuc->lbr_entries[i].reserved =0 ; } cpuc->lbr_stack.nr = i; + cpuc->lbr_stack.hw_idx =-1ULL ; }/*
@@ -680,6 +681,7 @@ static void intel_pmu_lbr_read_64(struct cpu_hw_events *cpuc) out++; } cpuc->lbr_stack.nr = out; + cpuc->lbr_stack.hw_idx =-1ULL ; }void intel_pmu_lbr_read (void )
@@ -1120,6 +1122,7 @@ void intel_pmu_store_pebs_lbrs(struct pebs_lbr *lbr)int i; cpuc->lbr_stack.nr = x86_pmu.lbr_nr; + cpuc->lbr_stack.hw_idx =-1ULL ;for (i =0 ; i < x86_pmu.lbr_nr; i++) {u64 info = lbr->lbr[i].info;struct perf_branch_entry *e = &cpuc->lbr_entries[i];
include/linux/perf_event.h +12 -0
@@ -93,14 +93,26 @@ struct perf_raw_record {/* * branch stack layout: * nr: number of taken branches stored in entries[] +* hw_idx: The low level index of raw branch records +* for the most recent branch. +* -1ULL means invalid/unknown. * * Note that nr can vary from sample to sample * branches (to, from) are stored from most recent * to least recent, i.e., entries[0] contains the most * recent branch. +* The entries[] is an abstraction of raw branch records, +* which may not be stored in age order in HW, e.g. Intel LBR. +* The hw_idx is to expose the low level index of raw +* branch record for the most recent branch aka entries[0]. +* The hw_idx index is between -1 (unknown) and max depth, +* which can be retrieved in /sys/devices/cpu/caps/branches. +* For the architectures whose raw branch records are +* already stored in age order, the hw_idx should be 0. */ struct perf_branch_stack {__u64 nr; +__u64 hw_idx;struct perf_branch_entry entries[0 ]; };
include/uapi/linux/perf_event.h +7 -1
@@ -181,6 +181,8 @@ enum perf_branch_sample_type_shift {PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT =16 ,/* save branch type */ +PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT =17 ,/* save low level index of raw branch records */ + PERF_SAMPLE_BRANCH_MAX_SHIFT /* non-ABI */ };
@@ -208,6 +210,8 @@ enum perf_branch_sample_type {PERF_SAMPLE_BRANCH_TYPE_SAVE =1U <<PERF_SAMPLE_BRANCH_TYPE_SAVE_SHIFT , +PERF_SAMPLE_BRANCH_HW_INDEX =1U <<PERF_SAMPLE_BRANCH_HW_INDEX_SHIFT , + PERF_SAMPLE_BRANCH_MAX = 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT, };
@@ -853,7 +857,9 @@ enum perf_event_type {* char data[size];}&& PERF_SAMPLE_RAW * * { u64 nr; -* { u64 from, to, flags } lbr[nr];} && PERF_SAMPLE_BRANCH_STACK +* { u64 hw_idx; } && PERF_SAMPLE_BRANCH_HW_INDEX +* { u64 from, to, flags } lbr[nr]; +* } && PERF_SAMPLE_BRANCH_STACK * * { u64 abi; # enum perf_sample_regs_abi * u64 regs[weight(mask)]; } && PERF_SAMPLE_REGS_USER
kernel/events/core.c +10 -0
@@ -6555,6 +6555,11 @@ static void perf_output_read(struct perf_output_handle *handle,perf_output_read_one (handle, event, enabled, running); } +static inline bool perf_sample_save_hw_index (struct perf_event *event) +{ +return event->attr.branch_sample_type &PERF_SAMPLE_BRANCH_HW_INDEX ; +} + void perf_output_sample(struct perf_output_handle *handle, struct perf_event_header *header, struct perf_sample_data *data,
@@ -6643,6 +6648,8 @@ void perf_output_sample(struct perf_output_handle *handle, *sizeof (struct perf_branch_entry );perf_output_put (handle, data->br_stack->nr); +if (perf_sample_save_hw_index (event)) +perf_output_put (handle, data->br_stack->hw_idx);perf_output_copy (handle, data->br_stack->entries, size); }else {/*
@@ -6836,6 +6843,9 @@ void perf_prepare_sample(struct perf_event_header *header,if (sample_type &PERF_SAMPLE_BRANCH_STACK ) {int size =sizeof (u64);/* nr */ if (data->br_stack) { +if (perf_sample_save_hw_index (event)) + size +=sizeof (u64); + size += data->br_stack->nr *sizeof (struct perf_branch_entry ); }
PATCH v6 2/2 perf/x86/intel: Output LBR TOS information
In reply to [email protected]From: Kan Liang <[email protected]>
For Intel LBR, the LBR Top-of-Stack (TOS) information is the HW index of raw branch record for the most recent branch.
For non-adaptive PEBS and non-PEBS, the TOS information can be directly retrieved from TOS MSR read in intel_pmu_lbr_read().
For adaptive PEBS, the LBR information stored in PEBS record doesn't include the TOS information. For single PEBS, TOS can be directly read from MSR, because the PMI is triggered immediately after PEBS is written. TOS MSR is still unchanged.
For large PEBS, TOS MSR has stale value. Set -1ULL to indicate that the TOS information is not available.
--- arch/x86/events/intel/lbr.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
arch/x86/events/intel/lbr.c +9 -3
@@ -585,7 +585,7 @@ static void intel_pmu_lbr_read_32(struct cpu_hw_events *cpuc) cpuc->lbr_entries[i].reserved =0 ; } cpuc->lbr_stack.nr = i; - cpuc->lbr_stack.hw_idx =-1ULL ; + cpuc->lbr_stack.hw_idx = tos; }/*
@@ -681,7 +681,7 @@ static void intel_pmu_lbr_read_64(struct cpu_hw_events *cpuc) out++; } cpuc->lbr_stack.nr = out; - cpuc->lbr_stack.hw_idx =-1ULL ; + cpuc->lbr_stack.hw_idx = tos; }void intel_pmu_lbr_read (void )
@@ -1122,7 +1122,13 @@ void intel_pmu_store_pebs_lbrs(struct pebs_lbr *lbr)int i; cpuc->lbr_stack.nr = x86_pmu.lbr_nr; - cpuc->lbr_stack.hw_idx =-1ULL ; + +/* Cannot get TOS for large PEBS */ +if (cpuc->n_pebs == cpuc->n_large_pebs) + cpuc->lbr_stack.hw_idx =-1ULL ; +else + cpuc->lbr_stack.hw_idx =intel_pmu_lbr_tos (); +for (i =0 ; i < x86_pmu.lbr_nr; i++) {u64 info = lbr->lbr[i].info;struct perf_branch_entry *e = &cpuc->lbr_entries[i];
Signature · 1 line
2.17.1
[tip: perf/core] perf/x86/intel: Output LBR TOS information correctly
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: db278b90c326ce5895be09b6171f5ff3df1e3cca Gitweb: https://git.kernel.org/tip/db278b90c326ce5895be09b6171f5ff3df1e3cca Author: Kan Liang <[email protected]> AuthorDate: Mon, 27 Jan 2020 08:53:55 -08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Tue, 11 Feb 2020 13:23:49 +01:00
perf/x86/intel: Output LBR TOS information correctly
For Intel LBR, the LBR Top-of-Stack (TOS) information is the HW index of raw branch record for the most recent branch.
For non-adaptive PEBS and non-PEBS, the TOS information can be directly retrieved from TOS MSR read in intel_pmu_lbr_read().
For adaptive PEBS, the LBR information stored in PEBS record doesn't include the TOS information. For single PEBS, TOS can be directly read from MSR, because the PMI is triggered immediately after PEBS is written. TOS MSR is still unchanged.
For large PEBS, TOS MSR has stale value. Set -1ULL to indicate that the TOS information is not available.
--- arch/x86/events/intel/lbr.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
arch/x86/events/intel/lbr.c +9 -3
@@ -585,7 +585,7 @@ static void intel_pmu_lbr_read_32(struct cpu_hw_events *cpuc) cpuc->lbr_entries[i].reserved =0 ; } cpuc->lbr_stack.nr = i; - cpuc->lbr_stack.hw_idx =-1ULL ; + cpuc->lbr_stack.hw_idx = tos; }/*
@@ -681,7 +681,7 @@ static void intel_pmu_lbr_read_64(struct cpu_hw_events *cpuc) out++; } cpuc->lbr_stack.nr = out; - cpuc->lbr_stack.hw_idx =-1ULL ; + cpuc->lbr_stack.hw_idx = tos; }void intel_pmu_lbr_read (void )
@@ -1122,7 +1122,13 @@ void intel_pmu_store_pebs_lbrs(struct pebs_lbr *lbr)int i; cpuc->lbr_stack.nr = x86_pmu.lbr_nr; - cpuc->lbr_stack.hw_idx =-1ULL ; + +/* Cannot get TOS for large PEBS */ +if (cpuc->n_pebs == cpuc->n_large_pebs) + cpuc->lbr_stack.hw_idx =-1ULL ; +else + cpuc->lbr_stack.hw_idx =intel_pmu_lbr_tos (); +for (i =0 ; i < x86_pmu.lbr_nr; i++) {u64 info = lbr->lbr[i].info;struct perf_branch_entry *e = &cpuc->lbr_entries[i];
Peter Zijlstra
maintainerQuoted 6 lines
Kan Liang (2):
perf/core: Add new branch sample type for HW index of raw branch
records
perf/x86/intel: Output LBR TOS information
Quoted 6 lines
arch/powerpc/perf/core-book3s.c | 1 + arch/x86/events/intel/lbr.c | 9 +++++++++ include/linux/perf_event.h | 12 ++++++++++++ include/uapi/linux/perf_event.h | 8 +++++++- kernel/events/core.c | 10 ++++++++++ 5 files changed, 39 insertions(+), 1 deletion(-)
Thanks!