Re: Linux 2.6.39-rc4 (regression: NUMA on multi-node CPUs broken)

[David Rientjes]

On Wed, 20 Apr 2011, Andreas Herrmann wrote:

> Following patch breaks real NUMA on multi-node CPUs like AMD
> Magny-Cours and should be reverted (or changed to just take effect in
> case of numa=fake):
> 
>   commit 7d6b46707f2491a94f4bd3b4329d2d7f809e9368
>   Author: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
>   Date:   Fri Apr 15 20:39:01 2011 +0900
> 
>     x86, NUMA: Fix fakenuma boot failure
> 
>     ...
> 
>     Thus, this patch implements a reassignment of node-ids if buggy firmware
>     or numa emulation makes wrong cpu node map. Tt enforce all logical cpus
>     in the same physical cpu share the same node.
> 
>     ...
> 
>   +static void __cpuinit check_cpu_siblings_on_same_node(int cpu1, int cpu2)
>   +{
>   +       int node1 = early_cpu_to_node(cpu1);
>   +       int node2 = early_cpu_to_node(cpu2);
>   +
>   +       /*
>   +        * Our CPU scheduler assumes all logical cpus in the same physical cpu
>   +        * share the same node. But, buggy ACPI or NUMA emulation might assign
>   +        * them to different node. Fix it.
>   +        */
> 
>    ...
> 
> This is a false assumption. Magny-Cours has two nodes in the same
> physical package. The scheduler was (kind of) fixed to work around
> this boot problem for multi-node CPUs (with 2.6.32). If this is also
> an issue with wrong cpu node maps in case of NUMA emulation this might
> be fixed similar or this quirk should only be applied in case of NUMA
> emulation.
> 

Right, this yields cpuless nodes that the scheduler can't handle.  Prior 
to the unification and cleanup, NUMA emulation would bind cpus to all 
nodes that are allocated on the physical node that it has affinity with on 
the board.  This causes all nodes to have bound cpus such that 
node_to_cpumask() correctly reveals the proximity that cpus have to its 
nodes, either emulated or otherwise.

We usually don't touch NUMA code for real architectures to fix a problem 
that can only happen with NUMA emulation, so 7d6b46707f24 should probably 
be reverted.

With that patch reverted, NUMA emulation works fine for me; for example, 
with numa=fake=8:

	/sys/devices/system/node/node0/cpulist:0-3
	/sys/devices/system/node/node1/cpulist:4-7
	/sys/devices/system/node/node2/cpulist:8-11
	/sys/devices/system/node/node3/cpulist:12-15
	/sys/devices/system/node/node4/cpulist:0-3
	/sys/devices/system/node/node5/cpulist:4-7
	/sys/devices/system/node/node6/cpulist:8-11
	/sys/devices/system/node/node7/cpulist:12-15

I'm not sure what it's trying to address (yes, there is a problem with the 
binding for CONFIG_NUMA_EMU && CONFIG_DEBUG_PER_CPU_MAPS, but not 
otherwise).

KOSAKI-san?
--
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/