* [PATCH 2/3] perf/x86/rapl: Support multiple rapl unit quirks
2020-07-16 15:18 [PATCH 1/3] perf/x86/rapl: Fix missing psys sysfs attributes Zhang Rui
@ 2020-07-16 15:18 ` Zhang Rui
2020-07-16 15:18 ` [PATCH 3/3] perf/x86/rapl: Add support for Intel SPR platform Zhang Rui
2020-07-17 8:33 ` [PATCH 1/3] perf/x86/rapl: Fix missing psys sysfs attributes Jiri Olsa
2 siblings, 0 replies; 5+ messages in thread
From: Zhang Rui @ 2020-07-16 15:18 UTC (permalink / raw)
To: peterz, mingo, acme
Cc: mark.rutland, alexander.shishkin, jolsa, namhyung, linux-kernel,
kan.liang, len.brown
There will be more platforms with different fixed energy units.
Enhance the code to support different rapl unit quirks for different
platforms.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Reviewed-by: Len Brown <len.brown@intel.com>
---
arch/x86/events/rapl.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index 51ff9a3618c9..5b3e11299c8d 100644
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -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,
};
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] perf/x86/rapl: Add support for Intel SPR platform
2020-07-16 15:18 [PATCH 1/3] perf/x86/rapl: Fix missing psys sysfs attributes Zhang Rui
2020-07-16 15:18 ` [PATCH 2/3] perf/x86/rapl: Support multiple rapl unit quirks Zhang Rui
@ 2020-07-16 15:18 ` Zhang Rui
2020-07-17 8:33 ` [PATCH 1/3] perf/x86/rapl: Fix missing psys sysfs attributes Jiri Olsa
2 siblings, 0 replies; 5+ messages in thread
From: Zhang Rui @ 2020-07-16 15:18 UTC (permalink / raw)
To: peterz, mingo, acme
Cc: mark.rutland, alexander.shishkin, jolsa, namhyung, linux-kernel,
kan.liang, len.brown
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.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Acked-by: Len Brown <len.brown@intel.com>
---
arch/x86/events/rapl.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index 5b3e11299c8d..731e3a32f723 100644
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -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),
{},
};
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/3] perf/x86/rapl: Fix missing psys sysfs attributes
2020-07-16 15:18 [PATCH 1/3] perf/x86/rapl: Fix missing psys sysfs attributes Zhang Rui
2020-07-16 15:18 ` [PATCH 2/3] perf/x86/rapl: Support multiple rapl unit quirks Zhang Rui
2020-07-16 15:18 ` [PATCH 3/3] perf/x86/rapl: Add support for Intel SPR platform Zhang Rui
@ 2020-07-17 8:33 ` Jiri Olsa
2020-07-28 13:16 ` Zhang Rui
2 siblings, 1 reply; 5+ messages in thread
From: Jiri Olsa @ 2020-07-17 8:33 UTC (permalink / raw)
To: Zhang Rui
Cc: peterz, mingo, acme, mark.rutland, alexander.shishkin, namhyung,
linux-kernel, kan.liang, len.brown
On Thu, Jul 16, 2020 at 11:18:57PM +0800, Zhang Rui wrote:
> 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.
>
> Fixes: 5fb5273a905c ("perf/x86/rapl: Use new MSR detection interface")
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
> Reviewed-by: Len Brown <len.brown@intel.com>
> ---
> arch/x86/events/rapl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
> index 0f2bf59f4354..51ff9a3618c9 100644
> --- a/arch/x86/events/rapl.c
> +++ b/arch/x86/events/rapl.c
> @@ -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,
I did copy & paste but did not change to psys :-\
Acked-by: Jiri Olsa <jolsa@redhat.com>
thanks,
jirka
> NULL,
> };
>
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/3] perf/x86/rapl: Fix missing psys sysfs attributes
2020-07-17 8:33 ` [PATCH 1/3] perf/x86/rapl: Fix missing psys sysfs attributes Jiri Olsa
@ 2020-07-28 13:16 ` Zhang Rui
0 siblings, 0 replies; 5+ messages in thread
From: Zhang Rui @ 2020-07-28 13:16 UTC (permalink / raw)
To: Jiri Olsa
Cc: peterz, mingo, acme, mark.rutland, alexander.shishkin, namhyung,
linux-kernel, kan.liang, len.brown
On Fri, 2020-07-17 at 10:33 +0200, Jiri Olsa wrote:
> On Thu, Jul 16, 2020 at 11:18:57PM +0800, Zhang Rui wrote:
> > 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.
> >
> > Fixes: 5fb5273a905c ("perf/x86/rapl: Use new MSR detection
> > interface")
> > Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> > Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
> > Reviewed-by: Len Brown <len.brown@intel.com>
> > ---
> > arch/x86/events/rapl.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
> > index 0f2bf59f4354..51ff9a3618c9 100644
> > --- a/arch/x86/events/rapl.c
> > +++ b/arch/x86/events/rapl.c
> > @@ -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,
>
> I did copy & paste but did not change to psys :-\
>
> Acked-by: Jiri Olsa <jolsa@redhat.com>
Hi, jirka,
Thanks for your ACK.
Hi, Peter,
A gentle ping on this patch series.
thanks,
rui
>
> thanks,
> jirka
>
> > NULL,
> > };
> >
> > --
> > 2.17.1
> >
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread