perf/x86/intel: Fix the FRONTEND encoding on GNR and MTL
Subsystems (3)
PATCH 1/1 perf/x86/intel: Fix the FRONTEND encoding on GNR and MTL
From: Kan Liang <[email protected]>
When counting a FRONTEND event, the MSR_PEBS_FRONTEND is not correctly set on GNR and MTL p-core.
The umask value for the FRONTEND events is changed on GNR and MTL. The new umask is missing in the extra_regs[] table.
Add a dedicated intel_gnr_extra_regs[] for GNR and MTL p-core.
--- arch/x86/events/intel/core.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
arch/x86/events/intel/core.c +14 -1
@@ -349,6 +349,16 @@ static struct event_constraint intel_spr_event_constraints[] = { EVENT_CONSTRAINT_END }; +static struct extra_reg intel_gnr_extra_regs[]__read_mostly = { +INTEL_UEVENT_EXTRA_REG (0x012a ,MSR_OFFCORE_RSP_0 ,0x3fffffffffull ,RSP_0 ), +INTEL_UEVENT_EXTRA_REG (0x012b ,MSR_OFFCORE_RSP_1 ,0x3fffffffffull ,RSP_1 ), +INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG (0x01cd ), +INTEL_UEVENT_EXTRA_REG (0x02c6 ,MSR_PEBS_FRONTEND ,0x9 ,FE ), +INTEL_UEVENT_EXTRA_REG (0x03c6 ,MSR_PEBS_FRONTEND ,0x7fff1f ,FE ), +INTEL_UEVENT_EXTRA_REG (0x40ad ,MSR_PEBS_FRONTEND ,0x7 ,FE ), +INTEL_UEVENT_EXTRA_REG (0x04c2 ,MSR_PEBS_FRONTEND ,0x8 ,FE ), +EVENT_EXTRA_END +};EVENT_ATTR_STR (mem-loads, mem_ld_nhm,"event=0x0b,umask=0x10,ldlat=3" );EVENT_ATTR_STR (mem-loads, mem_ld_snb,"event=0xcd,umask=0x1,ldlat=3" );
@@ -6496,6 +6506,7 @@ __init int intel_pmu_init(void)case INTEL_FAM6_SAPPHIRERAPIDS_X :case INTEL_FAM6_EMERALDRAPIDS_X : x86_pmu.flags |=PMU_FL_MEM_LOADS_AUX ; + x86_pmu.extra_regs = intel_spr_extra_regs; fallthrough;case INTEL_FAM6_GRANITERAPIDS_X :case INTEL_FAM6_GRANITERAPIDS_D :
@@ -6506,7 +6517,8 @@ __init int intel_pmu_init(void) x86_pmu.event_constraints = intel_spr_event_constraints; x86_pmu.pebs_constraints = intel_spr_pebs_event_constraints; - x86_pmu.extra_regs = intel_spr_extra_regs; +if (!x86_pmu.extra_regs) + x86_pmu.extra_regs = intel_gnr_extra_regs; x86_pmu.limit_period = spr_limit_period; x86_pmu.pebs_ept =1 ; x86_pmu.pebs_aliases =NULL ;
@@ -6650,6 +6662,7 @@ __init int intel_pmu_init(void) pmu->pebs_constraints = intel_grt_pebs_event_constraints; pmu->extra_regs = intel_grt_extra_regs;if (is_mtl (boot_cpu_data.x86_model)) { + x86_pmu.hybrid_pmu[X86_HYBRID_PMU_CORE_IDX ].extra_regs = intel_gnr_extra_regs; x86_pmu.pebs_latency_data = mtl_latency_data_small; extra_attr =boot_cpu_has (X86_FEATURE_RTM ) ? mtl_hybrid_extra_attr_rtm : mtl_hybrid_extra_attr;
Signature · 1 line
2.35.1
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: a6742cb90b567f952a95efa27dee345748d09fc7 Gitweb: https://git.kernel.org/tip/a6742cb90b567f952a95efa27dee345748d09fc7 Author: Kan Liang <[email protected]> AuthorDate: Thu, 15 Jun 2023 10:32:42 -07:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 16 Jun 2023 16:46:33 +02:00
perf/x86/intel: Fix the FRONTEND encoding on GNR and MTL
When counting a FRONTEND event, the MSR_PEBS_FRONTEND is not correctly set on GNR and MTL p-core.
The umask value for the FRONTEND events is changed on GNR and MTL. The new umask is missing in the extra_regs[] table.
Add a dedicated intel_gnr_extra_regs[] for GNR and MTL p-core.
--- arch/x86/events/intel/core.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
arch/x86/events/intel/core.c +14 -1
@@ -349,6 +349,16 @@ static struct event_constraint intel_spr_event_constraints[] = { EVENT_CONSTRAINT_END }; +static struct extra_reg intel_gnr_extra_regs[]__read_mostly = { +INTEL_UEVENT_EXTRA_REG (0x012a ,MSR_OFFCORE_RSP_0 ,0x3fffffffffull ,RSP_0 ), +INTEL_UEVENT_EXTRA_REG (0x012b ,MSR_OFFCORE_RSP_1 ,0x3fffffffffull ,RSP_1 ), +INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG (0x01cd ), +INTEL_UEVENT_EXTRA_REG (0x02c6 ,MSR_PEBS_FRONTEND ,0x9 ,FE ), +INTEL_UEVENT_EXTRA_REG (0x03c6 ,MSR_PEBS_FRONTEND ,0x7fff1f ,FE ), +INTEL_UEVENT_EXTRA_REG (0x40ad ,MSR_PEBS_FRONTEND ,0x7 ,FE ), +INTEL_UEVENT_EXTRA_REG (0x04c2 ,MSR_PEBS_FRONTEND ,0x8 ,FE ), +EVENT_EXTRA_END +};EVENT_ATTR_STR (mem-loads, mem_ld_nhm,"event=0x0b,umask=0x10,ldlat=3" );EVENT_ATTR_STR (mem-loads, mem_ld_snb,"event=0xcd,umask=0x1,ldlat=3" );
@@ -6496,6 +6506,7 @@ __init int intel_pmu_init(void)case INTEL_FAM6_SAPPHIRERAPIDS_X :case INTEL_FAM6_EMERALDRAPIDS_X : x86_pmu.flags |=PMU_FL_MEM_LOADS_AUX ; + x86_pmu.extra_regs = intel_spr_extra_regs; fallthrough;case INTEL_FAM6_GRANITERAPIDS_X :case INTEL_FAM6_GRANITERAPIDS_D :
@@ -6506,7 +6517,8 @@ __init int intel_pmu_init(void) x86_pmu.event_constraints = intel_spr_event_constraints; x86_pmu.pebs_constraints = intel_spr_pebs_event_constraints; - x86_pmu.extra_regs = intel_spr_extra_regs; +if (!x86_pmu.extra_regs) + x86_pmu.extra_regs = intel_gnr_extra_regs; x86_pmu.limit_period = spr_limit_period; x86_pmu.pebs_ept =1 ; x86_pmu.pebs_aliases =NULL ;
@@ -6650,6 +6662,7 @@ __init int intel_pmu_init(void) pmu->pebs_constraints = intel_grt_pebs_event_constraints; pmu->extra_regs = intel_grt_extra_regs;if (is_mtl (boot_cpu_data.x86_model)) { + x86_pmu.hybrid_pmu[X86_HYBRID_PMU_CORE_IDX ].extra_regs = intel_gnr_extra_regs; x86_pmu.pebs_latency_data = mtl_latency_data_small; extra_attr =boot_cpu_has (X86_FEATURE_RTM ) ? mtl_hybrid_extra_attr_rtm : mtl_hybrid_extra_attr;