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

Commit 7acc6f94 authored by Vladimir Kondratiev's avatar Vladimir Kondratiev Committed by Greg Kroah-Hartman
Browse files

mips: cacheinfo: report shared CPU map 



[ Upstream commit 3b1313eb32c499d46dc4c3e896d19d9564c879c4 ]

Report L1 caches as shared per core; L2 - per cluster.

This fixes "perf" that went crazy if shared_cpu_map attribute not
reported on sysfs, in form of

/sys/devices/system/cpu/cpu*/cache/index*/shared_cpu_list
/sys/devices/system/cpu/cpu*/cache/index*/shared_cpu_map

Signed-off-by: default avatarVladimir Kondratiev <vladimir.kondratiev@intel.com>
Signed-off-by: default avatarPaul Burton <paulburton@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ef75fc2e

arch/mips/kernel/cacheinfo.c

+26 −1
Original line number Diff line number Diff line
@@ -50,6 +50,25 @@ static int __init_cache_level(unsigned int cpu) 
	return 0;

}



static void fill_cpumask_siblings(int cpu, cpumask_t *cpu_map)

{

	int cpu1;



	for_each_possible_cpu(cpu1)

		if (cpus_are_siblings(cpu, cpu1))

			cpumask_set_cpu(cpu1, cpu_map);

}



static void fill_cpumask_cluster(int cpu, cpumask_t *cpu_map)

{

	int cpu1;

	int cluster = cpu_cluster(&cpu_data[cpu]);



	for_each_possible_cpu(cpu1)

		if (cpu_cluster(&cpu_data[cpu1]) == cluster)

			cpumask_set_cpu(cpu1, cpu_map);

}



static int __populate_cache_leaves(unsigned int cpu)

{

	struct cpuinfo_mips *c = &current_cpu_data;
@@ -57,14 +76,20 @@ static int __populate_cache_leaves(unsigned int cpu) 
	struct cacheinfo *this_leaf = this_cpu_ci->info_list;



	if (c->icache.waysize) {

		/* L1 caches are per core */

		fill_cpumask_siblings(cpu, &this_leaf->shared_cpu_map);

		populate_cache(dcache, this_leaf, 1, CACHE_TYPE_DATA);

		fill_cpumask_siblings(cpu, &this_leaf->shared_cpu_map);

		populate_cache(icache, this_leaf, 1, CACHE_TYPE_INST);

	} else {

		populate_cache(dcache, this_leaf, 1, CACHE_TYPE_UNIFIED);

	}



	if (c->scache.waysize)

	if (c->scache.waysize) {

		/* L2 cache is per cluster */

		fill_cpumask_cluster(cpu, &this_leaf->shared_cpu_map);

		populate_cache(scache, this_leaf, 2, CACHE_TYPE_UNIFIED);

	}



	if (c->tcache.waysize)

		populate_cache(tcache, this_leaf, 3, CACHE_TYPE_UNIFIED);