Commit cd105aed authored by Jiri Olsa's avatar Jiri Olsa Committed by Ingo Molnar
Browse files

perf/x86/rapl: Get rapl_cntr_mask from new probe framework 



We get rapl_cntr_mask from perf_msr_probe call, as a replacement
for current intel_rapl_init_fun::cntr_mask value for each model.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kan <kan.liang@linux.intel.com>
Cc: Liang
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Namhyung Kim <namhyung@kernel.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>
Link: https://lkml.kernel.org/r/20190616140358.27799-6-jolsa@kernel.org


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

arch/x86/events/intel/rapl.c

+2 −36
Original line number Diff line number Diff line
@@ -96,33 +96,6 @@ static const char *const rapl_domain_names[NR_RAPL_DOMAINS] __initconst = { 
	"psys",

};



/* Clients have PP0, PKG */

#define RAPL_IDX_CLN	(1<<RAPL_IDX_PP0_NRG_STAT|\

			 1<<RAPL_IDX_PKG_NRG_STAT|\

			 1<<RAPL_IDX_PP1_NRG_STAT)



/* Servers have PP0, PKG, RAM */

#define RAPL_IDX_SRV	(1<<RAPL_IDX_PP0_NRG_STAT|\

			 1<<RAPL_IDX_PKG_NRG_STAT|\

			 1<<RAPL_IDX_RAM_NRG_STAT)



/* Servers have PP0, PKG, RAM, PP1 */

#define RAPL_IDX_HSW	(1<<RAPL_IDX_PP0_NRG_STAT|\

			 1<<RAPL_IDX_PKG_NRG_STAT|\

			 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)



/*

 * event code: LSB 8 bits, passed in attr->config

 * any other bit is reserved
@@ -812,43 +785,36 @@ static int __init init_rapl_pmus(void) 


struct intel_rapl_init_fun {

	bool apply_quirk;

	int cntr_mask;

	struct attribute **attrs;

};



static const struct intel_rapl_init_fun snb_rapl_init __initconst = {

	.apply_quirk = false,

	.cntr_mask = RAPL_IDX_CLN,

	.attrs = rapl_events_cln_attr,

};



static const struct intel_rapl_init_fun hsx_rapl_init __initconst = {

	.apply_quirk = true,

	.cntr_mask = RAPL_IDX_SRV,

	.attrs = rapl_events_srv_attr,

};



static const struct intel_rapl_init_fun hsw_rapl_init __initconst = {

	.apply_quirk = false,

	.cntr_mask = RAPL_IDX_HSW,

	.attrs = rapl_events_hsw_attr,

};



static const struct intel_rapl_init_fun snbep_rapl_init __initconst = {

	.apply_quirk = false,

	.cntr_mask = RAPL_IDX_SRV,

	.attrs = rapl_events_srv_attr,

};



static const struct intel_rapl_init_fun knl_rapl_init __initconst = {

	.apply_quirk = true,

	.cntr_mask = RAPL_IDX_KNL,

	.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,

};
@@ -979,7 +945,8 @@ static int __init rapl_pmu_init(void) 
		return -ENODEV;



	rm = (struct rapl_model *) id->driver_data;

	perf_msr_probe(rapl_msrs, PERF_RAPL_MAX, false, (void *) &rm->events);

	rapl_cntr_mask = perf_msr_probe(rapl_msrs, PERF_RAPL_MAX,

					false, (void *) &rm->events);



	id = x86_match_cpu(rapl_cpu_match);

	if (!id)
@@ -987,7 +954,6 @@ static int __init rapl_pmu_init(void) 


	rapl_init = (struct intel_rapl_init_fun *)id->driver_data;

	apply_quirk = rapl_init->apply_quirk;

	rapl_cntr_mask = rapl_init->cntr_mask;

	rapl_pmu_events_group.attrs = rapl_init->attrs;



	ret = rapl_check_hw_unit(apply_quirk);

CRA Git | Maintained and supported by SUSTech CRA and CCSE