perf/x86/intel: Fix rtm_abort_event encoding on Ice Lake
Subsystems (3)
PATCH 1/2 perf/x86/intel: Fix rtm_abort_event encoding on Ice Lake
From: Kan Liang <[email protected]>
According to the event list from icelake_core_v1.09.json, the encoding of the RTM_RETIRED.ABORTED event on Ice Lake should be,
"EventCode": "0xc9",
"UMask": "0x04",
"EventName": "RTM_RETIRED.ABORTED",Correct the wrong encoding.
--- arch/x86/events/intel/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/core.c +1 -1
@@ -5321,7 +5321,7 @@ __init int intel_pmu_init(void) mem_attr = icl_events_attrs; td_attr = icl_td_events_attrs; tsx_attr = icl_tsx_events_attrs; - x86_pmu.rtm_abort_event = X86_CONFIG(.event=0xca, .umask=0x02); + x86_pmu.rtm_abort_event = X86_CONFIG(.event=0xc9, .umask=0x04); x86_pmu.lbr_pt_coexist = true;intel_pmu_pebs_data_source_skl (pmem); x86_pmu.update_topdown_event = icl_update_topdown_event;
Signature · 1 line
2.17.1
PATCH 2/2 perf/x86/intel/lbr: Fix the return type of get_lbr_cycles()
From: Kan Liang <[email protected]>
The cycle count of a timed LBR is always 1 in perf record -D.
The cycle count is stored in the first 16 bits of the IA32_LBR_x_INFO register, but the get_lbr_cycles() return Boolean type.
Use u16 to replace the Boolean type.
--- arch/x86/events/intel/lbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/lbr.c +1 -1
@@ -919,7 +919,7 @@ static __always_inline bool get_lbr_predicted(u64 info)return !(info &LBR_INFO_MISPRED ); } -static __always_inline bool get_lbr_cycles(u64 info) +static __always_inline u16 get_lbr_cycles(u64 info) {if (static_cpu_has (X86_FEATURE_ARCH_LBR ) && !(x86_pmu.lbr_timed_lbr && info &LBR_INFO_CYC_CNT_VALID ))
Signature · 1 line
2.17.1
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: 46b72e1bf4fc571da0c29c6fb3e5b2a2107a4c26 Gitweb: https://git.kernel.org/tip/46b72e1bf4fc571da0c29c6fb3e5b2a2107a4c26 Author: Kan Liang <[email protected]> AuthorDate: Wed, 25 Nov 2020 13:37:19 -08:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 09 Dec 2020 17:08:57 +01:00
perf/x86/intel: Fix rtm_abort_event encoding on Ice Lake
According to the event list from icelake_core_v1.09.json, the encoding of the RTM_RETIRED.ABORTED event on Ice Lake should be,
"EventCode": "0xc9",
"UMask": "0x04",
"EventName": "RTM_RETIRED.ABORTED",Correct the wrong encoding.
--- arch/x86/events/intel/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/core.c +1 -1
@@ -5466,7 +5466,7 @@ __init int intel_pmu_init(void) mem_attr = icl_events_attrs; td_attr = icl_td_events_attrs; tsx_attr = icl_tsx_events_attrs; - x86_pmu.rtm_abort_event = X86_CONFIG(.event=0xca, .umask=0x02); + x86_pmu.rtm_abort_event = X86_CONFIG(.event=0xc9, .umask=0x04); x86_pmu.lbr_pt_coexist = true;intel_pmu_pebs_data_source_skl (pmem); x86_pmu.update_topdown_event = icl_update_topdown_event;
[tip: perf/core] perf/x86/intel/lbr: Fix the return type of get_lbr_cycles()
In reply to [email protected]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: f8129cd958b395575e5543ce25a8434874b04d3a Gitweb: https://git.kernel.org/tip/f8129cd958b395575e5543ce25a8434874b04d3a Author: Kan Liang <[email protected]> AuthorDate: Wed, 25 Nov 2020 13:37:20 -08:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 09 Dec 2020 17:08:58 +01:00
perf/x86/intel/lbr: Fix the return type of get_lbr_cycles()
The cycle count of a timed LBR is always 1 in perf record -D.
The cycle count is stored in the first 16 bits of the IA32_LBR_x_INFO register, but the get_lbr_cycles() return Boolean type.
Use u16 to replace the Boolean type.
--- arch/x86/events/intel/lbr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/lbr.c +1 -1
@@ -919,7 +919,7 @@ static __always_inline bool get_lbr_predicted(u64 info)return !(info &LBR_INFO_MISPRED ); } -static __always_inline bool get_lbr_cycles(u64 info) +static __always_inline u16 get_lbr_cycles(u64 info) {if (static_cpu_has (X86_FEATURE_ARCH_LBR ) && !(x86_pmu.lbr_timed_lbr && info &LBR_INFO_CYC_CNT_VALID ))