Re: [PATCH 5/7] perf: Optimise topology iteration

From: Peter Zijlstra
Date: Wed Jan 05 2011 - 04:51:01 EST


On Wed, 2011-01-05 at 13:24 +0800, Lin Ming wrote:
> > > > + for_each_cpu(i, topology_core_cpumask(cpu)) {
> > > > nb = per_cpu(cpu_hw_events, i).amd_nb;
> > > > if (WARN_ON_ONCE(!nb))
> > > > continue;
> > >
> > > Borislav, is topology_core_cpumask() the right mask for northbridge_id
> > > span? I could imagine Magny-Cours would have all 12 cores in the
> > > core_cpumask() and have the node_mask() be half that.
> >
> > So, topology_core_cpumask() or cpu_core_mask() both are cpu_core_map
> > which represents the socket mask. I.e., on a multisocket cpu you'll have
> > in it all the cores on one socket. A 12-cores Magny-Cours contains two
> > internal northbridges and this mask will have 12 bits set.
> >
> > AFAICT, you want to iterate over the cores on a single node here
> > (an internal node in the Magny-Cours case) so for this we have the
> > llc_shared_map. See near the top of cache_shared_cpu_map_setup() in
> > <arch/x86/kernel/cpu/intel_cacheinfo.c> for an example.
>
> cpu_coregroup_mask() seems the right mask for northbridge_id span.
>
> arch/x86/kernel/smpboot.c:
>
> /* maps the cpu to the sched domain representing multi-core */
> const struct cpumask *cpu_coregroup_mask(int cpu)
> {
> struct cpuinfo_x86 *c = &cpu_data(cpu);
> /*
> * For perf, we return last level cache shared map.
> * And for power savings, we return cpu_core_map
> */
> if ((sched_mc_power_savings || sched_smt_power_savings) &&
> !(cpu_has(c, X86_FEATURE_AMD_DCM)))
> return cpu_core_mask(cpu);
> else
> return c->llc_shared_map;
> }

Argh, that function really must die, its the most horrible brain damage
around. Andreas promised he'd clean that up after making it worse for
Magny-Cours.

But yes, assuming all Magny-Cours have this AMD_DCM thing set, it seems
to return the right map.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/