Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b10b3efb authored by Kan Liang's avatar Kan Liang Committed by Thomas Gleixner
Browse files

perf/x86/intel/rapl: Support multi-die/package 



RAPL becomes die-scope on Xeon Cascade Lake-AP. Perf RAPL driver needs to
support die-scope RAPL domain.

Use topology_logical_die_id() to replace topology_logical_package_id().
For previous platforms which doesn't have multi-die,
topology_logical_die_id() is identical as topology_logical_package_id().

Use topology_die_cpumask() to replace topology_core_cpumask().  For
previous platforms which doesn't have multi-die, topology_die_cpumask() is
identical as topology_core_cpumask().

There is no functional change for previous platforms.

Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/851320c8c87ba7a54e58ee8579c1bf566ce23cbb.1557769318.git.len.brown@intel.com
parent 1ff4a47b

arch/x86/events/intel/rapl.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -161,7 +161,7 @@ static u64 rapl_timer_ms; 




static inline struct rapl_pmu *cpu_to_rapl_pmu(unsigned int cpu)

static inline struct rapl_pmu *cpu_to_rapl_pmu(unsigned int cpu)

{

{

	unsigned int pkgid = topology_logical_package_id(cpu);

	unsigned int pkgid = topology_logical_die_id(cpu);





	/*

	/*

	 * The unsigned check also catches the '-1' return value for non

	 * The unsigned check also catches the '-1' return value for non
@@ -571,7 +571,7 @@ static int rapl_cpu_offline(unsigned int cpu) 




	pmu->cpu = -1;

	pmu->cpu = -1;

	/* Find a new cpu to collect rapl events */

	/* Find a new cpu to collect rapl events */

	target = cpumask_any_but(topology_core_cpumask(cpu), cpu);

	target = cpumask_any_but(topology_die_cpumask(cpu), cpu);





	/* Migrate rapl events to the new target */

	/* Migrate rapl events to the new target */

	if (target < nr_cpu_ids) {

	if (target < nr_cpu_ids) {
@@ -598,14 +598,14 @@ static int rapl_cpu_online(unsigned int cpu) 
		pmu->timer_interval = ms_to_ktime(rapl_timer_ms);

		pmu->timer_interval = ms_to_ktime(rapl_timer_ms);

		rapl_hrtimer_init(pmu);

		rapl_hrtimer_init(pmu);





		rapl_pmus->pmus[topology_logical_package_id(cpu)] = pmu;

		rapl_pmus->pmus[topology_logical_die_id(cpu)] = pmu;

	}

	}





	/*

	/*

	 * Check if there is an online cpu in the package which collects rapl

	 * Check if there is an online cpu in the package which collects rapl

	 * events already.

	 * events already.

	 */

	 */

	target = cpumask_any_and(&rapl_cpu_mask, topology_core_cpumask(cpu));

	target = cpumask_any_and(&rapl_cpu_mask, topology_die_cpumask(cpu));

	if (target < nr_cpu_ids)

	if (target < nr_cpu_ids)

		return 0;

		return 0;
@@ -675,7 +675,7 @@ static void cleanup_rapl_pmus(void) 




static int __init init_rapl_pmus(void)

static int __init init_rapl_pmus(void)

{

{

	int maxpkg = topology_max_packages();

	int maxpkg = topology_max_packages() * topology_max_die_per_package();

	size_t size;

	size_t size;





	size = sizeof(*rapl_pmus) + maxpkg * sizeof(struct rapl_pmu *);

	size = sizeof(*rapl_pmus) + maxpkg * sizeof(struct rapl_pmu *);