Skip to contentSkip to conversation

sched/numa: Fix the new NUMA topology bits

tip:sched/core tip-bot for Peter Zijlstra 2 participants 2 messages May 14, 2012 – May 15, 2012 Scheduler

lore
Share & tools
lore

tip-bot for Peter Zijlstra

author
#0 lore raw
Commit-ID:  dd7d8634e619b715a537402672d1383535ff4c54
Gitweb:     http://git.kernel.org/tip/dd7d8634e619b715a537402672d1383535ff4c54
Author:     Peter Zijlstra <[email protected]>
AuthorDate: Fri, 11 May 2012 00:56:20 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Mon, 14 May 2012 15:05:25 +0200

sched/numa: Fix the new NUMA topology bits

There's no need to convert a node number to a node number by pretending its a cpu number..

Reported-by Yinghai Lu <[email protected]>
Reported-and-Tested-by Greg Pearson <[email protected]>
Signed-off-by Peter Zijlstra <[email protected]>
Link http://lkml.kernel.org/n/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
---
 kernel/sched/core.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
kernel/sched/core.c +1 -2
index b4f2096..0738036 100644
@@ -6395,8 +6395,7 @@ static void sched_init_numa(void)
 			sched_domains_numa_masks[i][j] = mask;
 
 			for (k = 0; k < nr_node_ids; k++) {
-				if (node_distance(cpu_to_node(j), k) >
-						sched_domains_numa_distance[i])
+				if (node_distance(j, k) > sched_domains_numa_distance[i])
 					continue;
 
 				cpumask_or(mask, mask, cpumask_of_node(k));
#1 lore raw
Quoted 26 lines · tip-bot for Peter Zijlstra

Commit-ID:  dd7d8634e619b715a537402672d1383535ff4c54
Gitweb:     http://git.kernel.org/tip/dd7d8634e619b715a537402672d1383535ff4c54
Author:     Peter Zijlstra <[email protected]>
AuthorDate: Fri, 11 May 2012 00:56:20 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Mon, 14 May 2012 15:05:25 +0200

sched/numa: Fix the new NUMA topology bits

There's no need to convert a node number to a node number by pretending its a cpu number..

Reported-by Yinghai Lu <[email protected]>
Reported-and-Tested-by Greg Pearson <[email protected]>
Signed-off-by Peter Zijlstra <[email protected]>
Link http://lkml.kernel.org/n/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>

---
 kernel/sched/core.c |    3 +--

 1 files changed, 1 insertions(+), 2 deletions(-)
kernel/sched/core.c +0 -0
index b4f2096..0738036 100644

kernel/sched/core.c static void sched_init_numa(void) · line 6401

Quoted 9 lines
kernel/sched/core.c +1 -2
@@ -6395,8 +6395,7 @@ static void sched_init_numa(void)
                        sched_domains_numa_masks[i][j] = mask;
 
                        for (k = 0; k < nr_node_ids; k++) {
-                               if (node_distance(cpu_to_node(j), k) >
-                                               sched_domains_numa_distance[i])
+                               if (node_distance(j, k) > sched_domains_numa_distance[i])
                                        continue;
 
                                cpumask_or(mask, mask, cpumask_of_node(k));

this one should be folded into offending commit

Commit-ID:  cb83b629bae0327cf9f44f096adc38d150ceb913
Gitweb:     http://git.kernel.org/tip/cb83b629bae0327cf9f44f096adc38d150ceb913
Author:     Peter Zijlstra <[email protected]>
AuthorDate: Tue, 17 Apr 2012 15:49:36 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 9 May 2012 15:00:55 +0200

sched/numa: Rewrite the CONFIG_NUMA sched domain support

Thanks

Yinghai