Re: [PATCH 4/5] x86: Add config variables for SMP_MAX
- From: Mike Travis <travis@xxxxxxx>
- Date: Sat, 19 Jan 2008 15:24:58 -0800
Ingo Molnar wrote:
* Ingo Molnar <mingo@xxxxxxx> wrote:
and then it crashes with:
[ 0.000000] Bootmem setup node 0 0000000000000000-000000003fff0000
[ 0.000000] KERN_NOTICE cpu_to_node(0): usage too early!
PANIC: early exception 06 rip 10:ffffffff81f77f30 error 0 cr2 f06f53
[ 0.000000] Pid: 0, comm: swapper Not tainted 2.6.24-rc8 #422
[ 0.000000]
[ 0.000000] Call Trace:
[ 0.000000] [<ffffffff81f76b4a>] ? setup_node_bootmem+0x1a0/0x1b8
[ 0.000000] [<ffffffff81f77f30>] ? acpi_scan_nodes+0x204/0x255
[ 0.000000] [<ffffffff81f77f30>] ? acpi_scan_nodes+0x204/0x255
[ 0.000000] [<ffffffff81f77103>] ? numa_initmem_init+0x343/0x471
moral: PLEASE do not use BUG() on in early init code, unless
absolutely necessary.
the right fix is below.
Ingo
---
include/asm-x86/topology.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: linux/include/asm-x86/topology.h
===================================================================
--- linux.orig/include/asm-x86/topology.h
+++ linux/include/asm-x86/topology.h
@@ -70,10 +70,10 @@ static inline int cpu_to_node(int cpu)
if(x86_cpu_to_node_map_early_ptr) {
printk("KERN_NOTICE cpu_to_node(%d): usage too early!\n",
(int)cpu);
- BUG();
+ dump_stack();
}
#endif
- if(per_cpu_offset(cpu))
+ if (per_cpu_offset(cpu))
return per_cpu(x86_cpu_to_node_map, cpu);
else
return NUMA_NO_NODE;
--
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/
Except the function needs to return a valid node id if it's to continue:
--- linux.orig/include/asm-x86/topology.h 2008-01-19 15:23:04.996551867 -0800
+++ linux/include/asm-x86/topology.h 2008-01-19 15:23:05.208564537 -0800
@@ -67,10 +67,11 @@ static inline int early_cpu_to_node(int
static inline int cpu_to_node(int cpu)
{
#ifdef CONFIG_DEBUG_PER_CPU_MAPS
- if(x86_cpu_to_node_map_early_ptr) {
+ if (x86_cpu_to_node_map_early_ptr) {
printk("KERN_NOTICE cpu_to_node(%d): usage too early!\n",
(int)cpu);
dump_stack();
+ return ((numanode_t *)x86_cpu_to_node_map_early_ptr)[cpu];
}
#endif
if (per_cpu_offset(cpu))
??
Thannks,
Mike
--
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/
- References:
- [PATCH 0/5] x86: Reduce memory usage for large count NR_CPUs fixup
- From: travis
- [PATCH 4/5] x86: Add config variables for SMP_MAX
- From: travis
- Re: [PATCH 4/5] x86: Add config variables for SMP_MAX
- From: Ingo Molnar
- Re: [PATCH 4/5] x86: Add config variables for SMP_MAX
- From: Ingo Molnar
- Re: [PATCH 4/5] x86: Add config variables for SMP_MAX
- From: Ingo Molnar
- [PATCH 0/5] x86: Reduce memory usage for large count NR_CPUs fixup
- Prev by Date: Re: [PATCH] x86: Construct 32 bit boot time page tables in native format.
- Next by Date: Re: [lguest build regression fix] Re: 2.6.24-rc8-git1: Reported regressions from 2.6.23
- Previous by thread: Re: [PATCH 4/5] x86: Add config variables for SMP_MAX
- Next by thread: Re: [PATCH 4/5] x86: Add config variables for SMP_MAX
- Index(es):
Relevant Pages
|
|
