perf/x86/rapl: Add Intel SapphireRapids support
Subsystems (2)
v2 cover perf/x86/rapl: Add Intel SapphireRapids support
Hi, all,
This patch set adds rapl perf event support for Intel SapphireRapids platform.
Patch 1/3 fixes a regression that Psys RAPL Domain sysfs I/F is missing. Patch 2/3 introduces support for different energy unit quirks. Patch 3/3 introduces support for Intel SapphireRapids platform, which has
fixed energy units for DRAM RAPL Domain and Psys RAPL Domain.
Any feedbacks are appreciated.
thanks,
rui
v1..v2:
- add ACK from Jiri Olsa.
- update patch 3/3 to solve a conflict introduced in the merge window.
PATCH v2 1/3 perf/x86/rapl: Fix missing psys sysfs attributes
This fixes a problem introduced by
commit 5fb5273a905c ("perf/x86/rapl: Use new MSR detection interface") that perf event sysfs attributes for psys RAPL domain are missing.
--- arch/x86/events/rapl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/rapl.c +1 -1
@@ -665,7 +665,7 @@ static const struct attribute_group *rapl_attr_update[] = { &rapl_events_pkg_group, &rapl_events_ram_group, &rapl_events_gpu_group, - &rapl_events_gpu_group, + &rapl_events_psys_group, NULL, };
Signature · 1 line
2.17.1
[tip: perf/urgent] perf/x86/rapl: Fix missing psys sysfs attributes
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: 4bb5fcb97a5df0bbc0a27e0252b1e7ce140a8431 Gitweb: https://git.kernel.org/tip/4bb5fcb97a5df0bbc0a27e0252b1e7ce140a8431 Author: Zhang Rui <[email protected]> AuthorDate: Tue, 11 Aug 2020 23:31:47 +08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Fri, 14 Aug 2020 12:35:11 +02:00
perf/x86/rapl: Fix missing psys sysfs attributes
This fixes a problem introduced by commit:
5fb5273a905c ("perf/x86/rapl: Use new MSR detection interface")
that perf event sysfs attributes for psys RAPL domain are missing.
--- arch/x86/events/rapl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/rapl.c +1 -1
@@ -665,7 +665,7 @@ static const struct attribute_group *rapl_attr_update[] = { &rapl_events_pkg_group, &rapl_events_ram_group, &rapl_events_gpu_group, - &rapl_events_gpu_group, + &rapl_events_psys_group, NULL, };
PATCH v2 2/3 perf/x86/rapl: Support multiple rapl unit quirks
In reply to Zhang RuiThere will be more platforms with different fixed energy units. Enhance the code to support different rapl unit quirks for different platforms.
--- arch/x86/events/rapl.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
arch/x86/events/rapl.c +15 -9
@@ -130,11 +130,16 @@ struct rapl_pmus {struct rapl_pmu *pmus[]; }; +enum rapl_unit_quirk { +RAPL_UNIT_QUIRK_NONE , +RAPL_UNIT_QUIRK_INTEL_HSW , +}; +struct rapl_model {struct perf_msr *rapl_msrs;unsigned long events;unsigned int msr_power_unit; -bool apply_quirk; +enum rapl_unit_quirk unit_quirk; };/* 1/2^hw_unit Joule */
@@ -612,14 +617,20 @@ static int rapl_check_hw_unit(struct rapl_model *rm)for (i =0 ; i <NR_RAPL_DOMAINS ; i++) rapl_hw_unit[i] = (msr_rapl_power_unit_bits >>8 ) &0x1FULL ; +switch (rm->unit_quirk) {/* * DRAM domain on HSW server and KNL has fixed energy unit which can be * different than the unit from power unit MSR. See * "Intel Xeon Processor E5-1600 and E5-2600 v3 Product Families, V2 * of 2. Datasheet, September 2014, Reference Number: 330784-001 " */ -if (rm->apply_quirk) +case RAPL_UNIT_QUIRK_INTEL_HSW : rapl_hw_unit[PERF_RAPL_RAM ] =16 ; +break ; +default : +break ; + } +/* * Calculate the timer rate:
@@ -698,7 +709,6 @@ static struct rapl_model model_snb = { .events = BIT(PERF_RAPL_PP0) | BIT(PERF_RAPL_PKG) | BIT(PERF_RAPL_PP1), - .apply_quirk = false, .msr_power_unit = MSR_RAPL_POWER_UNIT, .rapl_msrs = intel_rapl_msrs, };
@@ -707,7 +717,6 @@ static struct rapl_model model_snbep = { .events = BIT(PERF_RAPL_PP0) | BIT(PERF_RAPL_PKG) | BIT(PERF_RAPL_RAM), - .apply_quirk = false, .msr_power_unit = MSR_RAPL_POWER_UNIT, .rapl_msrs = intel_rapl_msrs, };
@@ -717,7 +726,6 @@ static struct rapl_model model_hsw = {BIT (PERF_RAPL_PKG ) |BIT (PERF_RAPL_RAM ) | BIT(PERF_RAPL_PP1), - .apply_quirk = false, .msr_power_unit = MSR_RAPL_POWER_UNIT, .rapl_msrs = intel_rapl_msrs, };
@@ -726,7 +734,7 @@ static struct rapl_model model_hsx = { .events = BIT(PERF_RAPL_PP0) | BIT(PERF_RAPL_PKG) | BIT(PERF_RAPL_RAM), - .apply_quirk = true, + .unit_quirk = RAPL_UNIT_QUIRK_INTEL_HSW, .msr_power_unit = MSR_RAPL_POWER_UNIT, .rapl_msrs = intel_rapl_msrs, };
@@ -734,7 +742,7 @@ static struct rapl_model model_hsx = {static struct rapl_model model_knl = { .events =BIT (PERF_RAPL_PKG ) |BIT (PERF_RAPL_RAM ), - .apply_quirk = true, + .unit_quirk =RAPL_UNIT_QUIRK_INTEL_HSW , .msr_power_unit =MSR_RAPL_POWER_UNIT , .rapl_msrs = intel_rapl_msrs, };
@@ -745,14 +753,12 @@ static struct rapl_model model_skl = {BIT (PERF_RAPL_RAM ) |BIT (PERF_RAPL_PP1 ) | BIT(PERF_RAPL_PSYS), - .apply_quirk = false, .msr_power_unit = MSR_RAPL_POWER_UNIT, .rapl_msrs = intel_rapl_msrs, };static struct rapl_model model_amd_fam17h = { .events =BIT (PERF_RAPL_PKG ), - .apply_quirk = false, .msr_power_unit =MSR_AMD_RAPL_POWER_UNIT , .rapl_msrs = amd_rapl_msrs, };
Signature · 1 line
2.17.1
Re: [PATCH v2 2/3] perf/x86/rapl: Support multiple rapl unit quirks
Quoted 3 lines · Zhang Rui
There will be more platforms with different fixed energy units. Enhance the code to support different rapl unit quirks for different platforms.
This seems like one quirk per platform.
Should multiple quirks on individual platforms be supported?
arch/x86/events/rapl.c
Quoted 1 line
arch/x86/events/rapl.c +0
-0
[]
Quoted 16 lines
arch/x86/events/rapl.c +6
-1@@ -130,11 +130,16 @@ struct rapl_pmus {struct rapl_pmu *pmus[]; }; +enum rapl_unit_quirk { +RAPL_UNIT_QUIRK_NONE , +RAPL_UNIT_QUIRK_INTEL_HSW , +}; +struct rapl_model {struct perf_msr *rapl_msrs;unsigned long events;unsigned int msr_power_unit; -bool apply_quirk; +enum rapl_unit_quirk unit_quirk; };
Re: [PATCH v2 2/3] perf/x86/rapl: Support multiple rapl unit quirks
Hi,
Thanks for reviewing.
Quoted 10 lines · Joe Perches
Quoted 4 lines · Zhang Rui
There will be more platforms with different fixed energy units. Enhance the code to support different rapl unit quirks for different
platforms.This seems like one quirk per platform.
Should multiple quirks on individual platforms be supported?
enum rapl_unit_quirk is just used as a flag.
multiple quirks can be deployed with the same flag, just like what I did in patch 3/3.
Also different platforms can either have different flags or share the same flag.
thanks,
rui
Quoted 21 lines
arch/x86/events/rapl.c
Quoted 1 line
arch/x86/events/rapl.c +0
-0[]
Quoted 16 lines
arch/x86/events/rapl.c +6
-1@@ -130,11 +130,16 @@ struct rapl_pmus {struct rapl_pmu *pmus[]; }; +enum rapl_unit_quirk { +RAPL_UNIT_QUIRK_NONE , +RAPL_UNIT_QUIRK_INTEL_HSW , +}; +struct rapl_model {struct perf_msr *rapl_msrs;unsigned long events;unsigned int msr_power_unit; -bool apply_quirk; +enum rapl_unit_quirk unit_quirk; };
Re: [PATCH v2 2/3] perf/x86/rapl: Support multiple rapl unit quirks
Quoted 13 lines · Zhang Rui
Hi,
Thanks for reviewing.
Quoted 8 lines · Joe Perches
Quoted 4 lines · Zhang Rui
There will be more platforms with different fixed energy units. Enhance the code to support different rapl unit quirks for different
platforms.This seems like one quirk per platform.
Quoted 7 lines
Quoted 2 lines
Should multiple quirks on individual platforms be supported?
enum
rapl_unit_quirkis just used as a flag.
multiple quirks can be deployed with the same flag, just like what I did in patch 3/3.
Also different platforms can either have different flags or share the same flag.
Sure, but it does lead to possible code duplication in the quirks as enums can not be combined like bit flags.
No worries, your code, your choice...
[tip: perf/urgent] perf/x86/rapl: Support multiple RAPL unit quirks
In reply to Zhang RuiThe 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: 74f41adab0f4a61857833e1b6fa8e9ad12c251b6 Gitweb: https://git.kernel.org/tip/74f41adab0f4a61857833e1b6fa8e9ad12c251b6 Author: Zhang Rui <[email protected]> AuthorDate: Tue, 11 Aug 2020 23:31:48 +08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Fri, 14 Aug 2020 12:35:12 +02:00
perf/x86/rapl: Support multiple RAPL unit quirks
There will be more platforms with different fixed energy units. Enhance the code to support different RAPL unit quirks for different platforms.
--- arch/x86/events/rapl.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
arch/x86/events/rapl.c +15 -9
@@ -130,11 +130,16 @@ struct rapl_pmus {struct rapl_pmu *pmus[]; }; +enum rapl_unit_quirk { +RAPL_UNIT_QUIRK_NONE , +RAPL_UNIT_QUIRK_INTEL_HSW , +}; +struct rapl_model {struct perf_msr *rapl_msrs;unsigned long events;unsigned int msr_power_unit; -bool apply_quirk; +enum rapl_unit_quirk unit_quirk; };/* 1/2^hw_unit Joule */
@@ -612,14 +617,20 @@ static int rapl_check_hw_unit(struct rapl_model *rm)for (i =0 ; i <NR_RAPL_DOMAINS ; i++) rapl_hw_unit[i] = (msr_rapl_power_unit_bits >>8 ) &0x1FULL ; +switch (rm->unit_quirk) {/* * DRAM domain on HSW server and KNL has fixed energy unit which can be * different than the unit from power unit MSR. See * "Intel Xeon Processor E5-1600 and E5-2600 v3 Product Families, V2 * of 2. Datasheet, September 2014, Reference Number: 330784-001 " */ -if (rm->apply_quirk) +case RAPL_UNIT_QUIRK_INTEL_HSW : rapl_hw_unit[PERF_RAPL_RAM ] =16 ; +break ; +default : +break ; + } +/* * Calculate the timer rate:
@@ -698,7 +709,6 @@ static struct rapl_model model_snb = { .events = BIT(PERF_RAPL_PP0) | BIT(PERF_RAPL_PKG) | BIT(PERF_RAPL_PP1), - .apply_quirk = false, .msr_power_unit = MSR_RAPL_POWER_UNIT, .rapl_msrs = intel_rapl_msrs, };
@@ -707,7 +717,6 @@ static struct rapl_model model_snbep = { .events = BIT(PERF_RAPL_PP0) | BIT(PERF_RAPL_PKG) | BIT(PERF_RAPL_RAM), - .apply_quirk = false, .msr_power_unit = MSR_RAPL_POWER_UNIT, .rapl_msrs = intel_rapl_msrs, };
@@ -717,7 +726,6 @@ static struct rapl_model model_hsw = {BIT (PERF_RAPL_PKG ) |BIT (PERF_RAPL_RAM ) | BIT(PERF_RAPL_PP1), - .apply_quirk = false, .msr_power_unit = MSR_RAPL_POWER_UNIT, .rapl_msrs = intel_rapl_msrs, };
@@ -726,7 +734,7 @@ static struct rapl_model model_hsx = { .events = BIT(PERF_RAPL_PP0) | BIT(PERF_RAPL_PKG) | BIT(PERF_RAPL_RAM), - .apply_quirk = true, + .unit_quirk = RAPL_UNIT_QUIRK_INTEL_HSW, .msr_power_unit = MSR_RAPL_POWER_UNIT, .rapl_msrs = intel_rapl_msrs, };
@@ -734,7 +742,7 @@ static struct rapl_model model_hsx = {static struct rapl_model model_knl = { .events =BIT (PERF_RAPL_PKG ) |BIT (PERF_RAPL_RAM ), - .apply_quirk = true, + .unit_quirk =RAPL_UNIT_QUIRK_INTEL_HSW , .msr_power_unit =MSR_RAPL_POWER_UNIT , .rapl_msrs = intel_rapl_msrs, };
@@ -745,14 +753,12 @@ static struct rapl_model model_skl = {BIT (PERF_RAPL_RAM ) |BIT (PERF_RAPL_PP1 ) | BIT(PERF_RAPL_PSYS), - .apply_quirk = false, .msr_power_unit = MSR_RAPL_POWER_UNIT, .rapl_msrs = intel_rapl_msrs, };static struct rapl_model model_amd_fam17h = { .events =BIT (PERF_RAPL_PKG ), - .apply_quirk = false, .msr_power_unit =MSR_AMD_RAPL_POWER_UNIT , .rapl_msrs = amd_rapl_msrs, };
PATCH v2 3/3 perf/x86/rapl: Add support for Intel SPR platform
In reply to Zhang RuiIntel SPR platform uses fixed 16 bit energy unit for DRAM RAPL domain, and fixed 0 bit energy unit for Psys RAPL domain.
After this, on SPR platform the energy counters appear in perf list.
--- arch/x86/events/rapl.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
arch/x86/events/rapl.c +20 -0
@@ -133,6 +133,7 @@ struct rapl_pmus {enum rapl_unit_quirk {RAPL_UNIT_QUIRK_NONE ,RAPL_UNIT_QUIRK_INTEL_HSW , +RAPL_UNIT_QUIRK_INTEL_SPR , };struct rapl_model {
@@ -627,6 +628,14 @@ static int rapl_check_hw_unit(struct rapl_model *rm)case RAPL_UNIT_QUIRK_INTEL_HSW : rapl_hw_unit[PERF_RAPL_RAM ] =16 ;break ; +/* +* SPR shares the same DRAM domain energy unit as HSW, plus it +* also has a fixed energy unit for Psys domain. +*/ +case RAPL_UNIT_QUIRK_INTEL_SPR : + rapl_hw_unit[PERF_RAPL_RAM ] =16 ; + rapl_hw_unit[PERF_RAPL_PSYS ] =0 ; +break ;default :break ; }
@@ -757,6 +766,16 @@ static struct rapl_model model_skl = { .rapl_msrs = intel_rapl_msrs, }; +static struct rapl_model model_spr = { + .events =BIT (PERF_RAPL_PP0 ) | +BIT (PERF_RAPL_PKG ) | +BIT (PERF_RAPL_RAM ) | +BIT (PERF_RAPL_PSYS ), + .unit_quirk =RAPL_UNIT_QUIRK_INTEL_SPR , + .msr_power_unit =MSR_RAPL_POWER_UNIT , + .rapl_msrs = intel_rapl_msrs, +}; +static struct rapl_model model_amd_fam17h = { .events =BIT (PERF_RAPL_PKG ), .msr_power_unit =MSR_AMD_RAPL_POWER_UNIT ,
@@ -793,6 +812,7 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ICELAKE_X , &model_hsx),X86_MATCH_INTEL_FAM6_MODEL (COMETLAKE_L , &model_skl),X86_MATCH_INTEL_FAM6_MODEL (COMETLAKE , &model_skl), +X86_MATCH_INTEL_FAM6_MODEL (SAPPHIRERAPIDS_X , &model_spr),X86_MATCH_VENDOR_FAM (AMD ,0x17 , &model_amd_fam17h), X86_MATCH_VENDOR_FAM(HYGON, 0x18, &model_amd_fam17h), {},
Signature · 1 line
2.17.1
[tip: perf/urgent] perf/x86/rapl: Add support for Intel SPR platform
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: bcfd218b66790243ef303c1b35ce59f786ded225 Gitweb: https://git.kernel.org/tip/bcfd218b66790243ef303c1b35ce59f786ded225 Author: Zhang Rui <[email protected]> AuthorDate: Tue, 11 Aug 2020 23:31:49 +08:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Fri, 14 Aug 2020 12:35:12 +02:00
perf/x86/rapl: Add support for Intel SPR platform
Intel SPR platform uses fixed 16 bit energy unit for DRAM RAPL domain, and fixed 0 bit energy unit for Psys RAPL domain.
After this, on SPR platform the energy counters appear in perf list.
--- arch/x86/events/rapl.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
arch/x86/events/rapl.c +20 -0
@@ -133,6 +133,7 @@ struct rapl_pmus {enum rapl_unit_quirk {RAPL_UNIT_QUIRK_NONE ,RAPL_UNIT_QUIRK_INTEL_HSW , +RAPL_UNIT_QUIRK_INTEL_SPR , };struct rapl_model {
@@ -627,6 +628,14 @@ static int rapl_check_hw_unit(struct rapl_model *rm)case RAPL_UNIT_QUIRK_INTEL_HSW : rapl_hw_unit[PERF_RAPL_RAM ] =16 ;break ; +/* +* SPR shares the same DRAM domain energy unit as HSW, plus it +* also has a fixed energy unit for Psys domain. +*/ +case RAPL_UNIT_QUIRK_INTEL_SPR : + rapl_hw_unit[PERF_RAPL_RAM ] =16 ; + rapl_hw_unit[PERF_RAPL_PSYS ] =0 ; +break ;default :break ; }
@@ -757,6 +766,16 @@ static struct rapl_model model_skl = { .rapl_msrs = intel_rapl_msrs, }; +static struct rapl_model model_spr = { + .events =BIT (PERF_RAPL_PP0 ) | +BIT (PERF_RAPL_PKG ) | +BIT (PERF_RAPL_RAM ) | +BIT (PERF_RAPL_PSYS ), + .unit_quirk =RAPL_UNIT_QUIRK_INTEL_SPR , + .msr_power_unit =MSR_RAPL_POWER_UNIT , + .rapl_msrs = intel_rapl_msrs, +}; +static struct rapl_model model_amd_fam17h = { .events =BIT (PERF_RAPL_PKG ), .msr_power_unit =MSR_AMD_RAPL_POWER_UNIT ,
@@ -793,6 +812,7 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ICELAKE_X , &model_hsx),X86_MATCH_INTEL_FAM6_MODEL (COMETLAKE_L , &model_skl),X86_MATCH_INTEL_FAM6_MODEL (COMETLAKE , &model_skl), +X86_MATCH_INTEL_FAM6_MODEL (SAPPHIRERAPIDS_X , &model_spr),X86_MATCH_VENDOR_FAM (AMD ,0x17 , &model_amd_fam17h), X86_MATCH_VENDOR_FAM(HYGON, 0x18, &model_amd_fam17h), {},