Commit dcee75b3 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Ingo Molnar
Browse files

perf/x86/intel/rapl: Support Skylake RAPL domains 



Add Skylake client support for RAPL domains. In addition to RAPL domains
in Broadwell clients, it has support for platform domain (aka PSys). The
PSys domain controls the entire SoC instead of just a CPU package. Unlike
package domain, PSys support requires more than just processor level
implementation. The other parts in the system need additional HW level
signaling, which OEMs need to support. When not supported, the energy
counter register in PSys domain returns 0.

Also corrected error in comment for GPU counter, which previously was
DRAM counter.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
[ Cnverted to model_match stuff. ]
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: bp@alien8.de
Cc: hpa@zytor.com
Cc: jacob.jun.pan@linux.intel.com
Cc: rjw@rjwysocki.net
Link: http://lkml.kernel.org/r/1460930581-29748-2-git-send-email-srinivas.pandruvada@linux.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 9ecda41a

arch/x86/events/intel/rapl.c

+52 −2
Original line number Diff line number Diff line
@@ -27,10 +27,14 @@ 
 *	  event: rapl_energy_dram

 *    perf code: 0x3

 *

 * dram counter: consumption of the builtin-gpu domain (client only)

 * gpu counter: consumption of the builtin-gpu domain (client only)

 *	  event: rapl_energy_gpu

 *    perf code: 0x4

 *

 *  psys counter: consumption of the builtin-psys domain (client only)

 *	  event: rapl_energy_psys

 *    perf code: 0x5

 *

 * We manage those counters as free running (read-only). They may be

 * use simultaneously by other tools, such as turbostat.

 *
@@ -66,13 +70,16 @@ MODULE_LICENSE("GPL"); 
#define INTEL_RAPL_RAM		0x3	/* pseudo-encoding */

#define RAPL_IDX_PP1_NRG_STAT	3	/* gpu */

#define INTEL_RAPL_PP1		0x4	/* pseudo-encoding */

#define RAPL_IDX_PSYS_NRG_STAT	4	/* psys */

#define INTEL_RAPL_PSYS		0x5	/* pseudo-encoding */



#define NR_RAPL_DOMAINS         0x4

#define NR_RAPL_DOMAINS         0x5

static const char *const rapl_domain_names[NR_RAPL_DOMAINS] __initconst = {

	"pp0-core",

	"package",

	"dram",

	"pp1-gpu",

	"psys",

};



/* Clients have PP0, PKG */
@@ -91,6 +98,13 @@ static const char *const rapl_domain_names[NR_RAPL_DOMAINS] __initconst = { 
			 1<<RAPL_IDX_RAM_NRG_STAT|\

			 1<<RAPL_IDX_PP1_NRG_STAT)



/* SKL clients have PP0, PKG, RAM, PP1, PSYS */

#define RAPL_IDX_SKL_CLN (1<<RAPL_IDX_PP0_NRG_STAT|\

			  1<<RAPL_IDX_PKG_NRG_STAT|\

			  1<<RAPL_IDX_RAM_NRG_STAT|\

			  1<<RAPL_IDX_PP1_NRG_STAT|\

			  1<<RAPL_IDX_PSYS_NRG_STAT)



/* Knights Landing has PKG, RAM */

#define RAPL_IDX_KNL	(1<<RAPL_IDX_PKG_NRG_STAT|\

			 1<<RAPL_IDX_RAM_NRG_STAT)
@@ -362,6 +376,10 @@ static int rapl_pmu_event_init(struct perf_event *event) 
		bit = RAPL_IDX_PP1_NRG_STAT;

		msr = MSR_PP1_ENERGY_STATUS;

		break;

	case INTEL_RAPL_PSYS:

		bit = RAPL_IDX_PSYS_NRG_STAT;

		msr = MSR_PLATFORM_ENERGY_STATUS;

		break;

	default:

		return -EINVAL;

	}
@@ -416,11 +434,13 @@ RAPL_EVENT_ATTR_STR(energy-cores, rapl_cores, "event=0x01"); 
RAPL_EVENT_ATTR_STR(energy-pkg  ,   rapl_pkg, "event=0x02");

RAPL_EVENT_ATTR_STR(energy-ram  ,   rapl_ram, "event=0x03");

RAPL_EVENT_ATTR_STR(energy-gpu  ,   rapl_gpu, "event=0x04");

RAPL_EVENT_ATTR_STR(energy-psys,   rapl_psys, "event=0x05");



RAPL_EVENT_ATTR_STR(energy-cores.unit, rapl_cores_unit, "Joules");

RAPL_EVENT_ATTR_STR(energy-pkg.unit  ,   rapl_pkg_unit, "Joules");

RAPL_EVENT_ATTR_STR(energy-ram.unit  ,   rapl_ram_unit, "Joules");

RAPL_EVENT_ATTR_STR(energy-gpu.unit  ,   rapl_gpu_unit, "Joules");

RAPL_EVENT_ATTR_STR(energy-psys.unit,   rapl_psys_unit, "Joules");



/*

 * we compute in 0.23 nJ increments regardless of MSR
@@ -429,6 +449,7 @@ RAPL_EVENT_ATTR_STR(energy-cores.scale, rapl_cores_scale, "2.3283064365386962890 
RAPL_EVENT_ATTR_STR(energy-pkg.scale,     rapl_pkg_scale, "2.3283064365386962890625e-10");

RAPL_EVENT_ATTR_STR(energy-ram.scale,     rapl_ram_scale, "2.3283064365386962890625e-10");

RAPL_EVENT_ATTR_STR(energy-gpu.scale,     rapl_gpu_scale, "2.3283064365386962890625e-10");

RAPL_EVENT_ATTR_STR(energy-psys.scale,   rapl_psys_scale, "2.3283064365386962890625e-10");



static struct attribute *rapl_events_srv_attr[] = {

	EVENT_PTR(rapl_cores),
@@ -478,6 +499,27 @@ static struct attribute *rapl_events_hsw_attr[] = { 
	NULL,

};



static struct attribute *rapl_events_skl_attr[] = {

	EVENT_PTR(rapl_cores),

	EVENT_PTR(rapl_pkg),

	EVENT_PTR(rapl_gpu),

	EVENT_PTR(rapl_ram),

	EVENT_PTR(rapl_psys),



	EVENT_PTR(rapl_cores_unit),

	EVENT_PTR(rapl_pkg_unit),

	EVENT_PTR(rapl_gpu_unit),

	EVENT_PTR(rapl_ram_unit),

	EVENT_PTR(rapl_psys_unit),



	EVENT_PTR(rapl_cores_scale),

	EVENT_PTR(rapl_pkg_scale),

	EVENT_PTR(rapl_gpu_scale),

	EVENT_PTR(rapl_ram_scale),

	EVENT_PTR(rapl_psys_scale),

	NULL,

};



static struct attribute *rapl_events_knl_attr[] = {

	EVENT_PTR(rapl_pkg),

	EVENT_PTR(rapl_ram),
@@ -737,6 +779,12 @@ static const struct intel_rapl_init_fun knl_rapl_init __initconst = { 
	.attrs = rapl_events_knl_attr,

};



static const struct intel_rapl_init_fun skl_rapl_init __initconst = {

	.apply_quirk = false,

	.cntr_mask = RAPL_IDX_SKL_CLN,

	.attrs = rapl_events_skl_attr,

};



static const struct x86_cpu_id rapl_cpu_match[] __initconst = {

	X86_RAPL_MODEL_MATCH(42, snb_rapl_init),	/* Sandy Bridge */

	X86_RAPL_MODEL_MATCH(58, snb_rapl_init),	/* Ivy Bridge */
@@ -750,6 +798,8 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = { 
	X86_RAPL_MODEL_MATCH(45, snbep_rapl_init),	/* Sandy Bridge-EP */

	X86_RAPL_MODEL_MATCH(62, snbep_rapl_init),	/* IvyTown */

	X86_RAPL_MODEL_MATCH(87, knl_rapl_init),	/* Knights Landing */

	X86_RAPL_MODEL_MATCH(78, skl_rapl_init),	/* Skylake */

	X86_RAPL_MODEL_MATCH(94, skl_rapl_init),	/* Skylake H/S */

	{},

};

arch/x86/include/asm/msr-index.h

+2 −0
Original line number Diff line number Diff line
@@ -205,6 +205,8 @@ 
#define MSR_CONFIG_TDP_CONTROL		0x0000064B

#define MSR_TURBO_ACTIVATION_RATIO	0x0000064C



#define MSR_PLATFORM_ENERGY_STATUS	0x0000064D



#define MSR_PKG_WEIGHTED_CORE_C0_RES	0x00000658

#define MSR_PKG_ANY_CORE_C0_RES		0x00000659

#define MSR_PKG_ANY_GFXE_C0_RES		0x0000065A

CRA Git | Maintained and supported by SUSTech CRA and CCSE