Re: linux-next: Tree for June 5

Ingo Molnar
2008-06-06T11:58:32Z

* Andrew Morton <akpm@linux-foundation.org> wrote:

> Good
>
> a9ad585c8a18f7ba754b85f5786976609b9d7d29
> Author: Mike Travis <travis@sgi.com> 2008-05-12 12:21:12
> Committer: Thomas Gleixner <tglx@linutronix.de> 2008-05-23 09:07:47
> Parent: 543e21916497be5a4005fd5820264ce1de9bd56d (x86: restore pda nodenumber field)
> Child: 78d49c6d890aee9cf8aea371011c9d7b0121b822 (x86: remove static boot_cpu_pda array v2)
> Branch:
> Follows: v2.6.26-rc2
> Precedes: next-20080526
>
> x86: remove the static 256k node_to_cpumask_map
>
> crash, as described earlier.

thanks for tracking it down! This was the origin of the commit:

# tip/x86/numa: a9ad585: x86: remove the static 256k node_to_cpumask_map

which has been in -tip since May 12 and in linux-next for two weeks
AFAICS, which is beyond the point of being something freshly wrong.

So i suspect something more subtle here. What compiler version are you
using? This crash is not something that has been found in testing before
- i use rather new compilers, gcc 4.2.2 most of the time. Previous
compilers miscompile the kernel seriously so it's not usable for our
regression testing grid.

until more is found out i've put the revert into tip/x86/numa for now.
Note, you'll also need the commit below for 32-bit NUMA.

Ingo

---------------->
commit f418f2b4a9b6ef4035cc8c9a166873a2b275e4ef
Author: Ingo Molnar <mingo@elte.hu>
Date: Fri Jun 6 13:54:52 2008 +0200

x86: fix revert side-effects

fix 32-bit NUMA.

diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h
index c0e6ff7..abd3aa8 100644
--- a/include/asm-x86/topology.h
+++ b/include/asm-x86/topology.h
@@ -57,6 +57,18 @@ static inline int cpu_to_node(int cpu)
}
#define early_cpu_to_node(cpu) cpu_to_node(cpu)

+/* Returns a pointer to the cpumask of CPUs on Node 'node'. */
+static inline cpumask_t *_node_to_cpumask_ptr(int node)
+{
+ return &node_to_cpumask_map[node];
+}
+
+/* Returns a bitmask of CPUs on Node 'node'. */
+static inline cpumask_t node_to_cpumask(int node)
+{
+ return node_to_cpumask_map[node];
+}
+
#else /* CONFIG_X86_64 */

/* Mappings between node number and cpus on that node. */