Commit 7122beee authored Mar 22, 2013 by Vaidyanathan Srinivasan Committed by Michael Ellerman Apr 18, 2013

powerpc: fix numa distance for form0 device tree



The following commit breaks numa distance setup for old powerpc
systems that use form0 encoding in device tree.

commit 41eab6f8
powerpc/numa: Use form 1 affinity to setup node distance

Device tree node /rtas/ibm,associativity-reference-points would
index into /cpus/PowerPCxxxx/ibm,associativity based on form0 or
form1 encoding detected by ibm,architecture-vec-5 property.

All modern systems use form1 and current kernel code is correct.
However, on older systems with form0 encoding, the numa distance
will get hard coded as LOCAL_DISTANCE for all nodes.  This causes
task scheduling anomaly since scheduler will skip building numa
level domain (topmost domain with all cpus) if all numa distances
are same.  (value of 'level' in sched_init_numa() will remain 0)

Prior to the above commit:
((from) == (to) ? LOCAL_DISTANCE : REMOTE_DISTANCE)

Restoring compatible behavior with this patch for old powerpc systems
with device tree where numa distance are encoded as form0.

Signed-off-by: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>

parent 517b7314

arch/powerpc/mm/numa.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -201,7 +201,7 @@ int __node_distance(int a, int b)
		int distance = LOCAL_DISTANCE;

		if (!form1_affinity)
		return distance;
		return ((a == b) ? LOCAL_DISTANCE : REMOTE_DISTANCE);

		for (i = 0; i < distance_ref_points_depth; i++) {
		if (distance_lookup_table[a][i] == distance_lookup_table[b][i])

Admin message