diff for duplicates of <4CDF2AF3.20902@kernel.org> diff --git a/a/1.txt b/N1/1.txt index e62750d..9cc087e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -50,7 +50,7 @@ On 11/13/2010 03:57 PM, Wu Fengguang wrote: >>> [ 0.000000] hpet clockevent registered >>> [ 0.001000] Fast TSC calibration using PIT >>> [ 0.002000] Detected 2800.469 MHz processor. ->>> [ 0.000010] Calibrating delay loop (skipped), value calculated using timer frequency.. 5600.93 BogoMIPS (lpj(00469) +>>> [ 0.000010] Calibrating delay loop (skipped), value calculated using timer frequency.. 5600.93 BogoMIPS (lpj=2800469) >>> [ 0.010818] pid_max: default: 32768 minimum: 301 >>> [ 0.021745] Dentry cache hash table entries: 2097152 (order: 12, 16777216 bytes) >>> [ 0.035657] Inode-cache hash table entries: 1048576 (order: 11, 8388608 bytes) @@ -99,13 +99,13 @@ On 11/13/2010 03:57 PM, Wu Fengguang wrote: >>> [ 0.633006] Total of 8 processors activated (44799.46 BogoMIPS). >> >> assume that when you have ->> CONFIG_NR_CPUS\x16 +>> CONFIG_NR_CPUS=16 >> instead of >> CONFIG_NR_CPUS=8 >> >> it will boot ok? > -> No. But it boots OK with CONFIG_NR_CPUSd: it actually has 24 CPUs, a bit more +> No. But it boots OK with CONFIG_NR_CPUS=64: it actually has 24 CPUs, a bit more > than your expectation :) > > This also boots the other 16 CPU box that used to lockup in find_busiest_group(). @@ -125,7 +125,7 @@ But SRAT table still old order, it will list cpus in one socket all together. If the user have compiled limited NR_CPUS or boot with nr_cpus=, could have missed to put some cpus apic id to node mapping into apicid_to_node[]. -for example for 4 sockets system with 64 cpus with nr_cpus2 will get crash... +for example for 4 sockets system with 64 cpus with nr_cpus=32 will get crash... [ 9.106288] Total of 32 processors activated (136190.88 BogoMIPS). [ 9.235021] divide error: 0000 [#1] SMP @@ -185,7 +185,8 @@ Signed-off-by: Yinghai Lu <yinghai@kernel.org> 3 files changed, 27 insertions(+), 2 deletions(-) Index: linux-2.6/arch/x86/kernel/acpi/boot.c -=================================--- linux-2.6.orig/arch/x86/kernel/acpi/boot.c +=================================================================== +--- linux-2.6.orig/arch/x86/kernel/acpi/boot.c +++ linux-2.6/arch/x86/kernel/acpi/boot.c @@ -198,6 +198,13 @@ static void __cpuinit acpi_register_lapi { @@ -202,7 +203,8 @@ Index: linux-2.6/arch/x86/kernel/acpi/boot.c ++disabled_cpus; return; Index: linux-2.6/arch/x86/mm/srat_64.c -=================================--- linux-2.6.orig/arch/x86/mm/srat_64.c +=================================================================== +--- linux-2.6.orig/arch/x86/mm/srat_64.c +++ linux-2.6/arch/x86/mm/srat_64.c @@ -134,6 +134,10 @@ acpi_numa_x2apic_affinity_init(struct ac } @@ -227,7 +229,8 @@ Index: linux-2.6/arch/x86/mm/srat_64.c node_set(node, cpu_nodes_parsed); acpi_numa = 1; Index: linux-2.6/drivers/acpi/numa.c -=================================--- linux-2.6.orig/drivers/acpi/numa.c +=================================================================== +--- linux-2.6.orig/drivers/acpi/numa.c +++ linux-2.6/drivers/acpi/numa.c @@ -275,13 +275,23 @@ acpi_table_parse_srat(enum acpi_srat_typ int __init acpi_numa_init(void) diff --git a/a/content_digest b/N1/content_digest index bb68849..d4c83bc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -11,7 +11,7 @@ "ref\020101113235746.GA9458@localhost\0" "From\0Yinghai Lu <yinghai@kernel.org>\0" "Subject\0Re: [BUG 2.6.27-rc1] find_busiest_group() LOCKUP\0" - "Date\0Sun, 14 Nov 2010 00:18:59 +0000\0" + "Date\0Sat, 13 Nov 2010 16:18:59 -0800\0" "To\0Wu Fengguang <fengguang.wu@intel.com>\0" "Cc\0Peter Zijlstra <peterz@infradead.org>" LKML <linux-kernel@vger.kernel.org> @@ -81,7 +81,7 @@ ">>> [ 0.000000] hpet clockevent registered\n" ">>> [ 0.001000] Fast TSC calibration using PIT\n" ">>> [ 0.002000] Detected 2800.469 MHz processor.\n" - ">>> [ 0.000010] Calibrating delay loop (skipped), value calculated using timer frequency.. 5600.93 BogoMIPS (lpj(00469)\n" + ">>> [ 0.000010] Calibrating delay loop (skipped), value calculated using timer frequency.. 5600.93 BogoMIPS (lpj=2800469)\n" ">>> [ 0.010818] pid_max: default: 32768 minimum: 301\n" ">>> [ 0.021745] Dentry cache hash table entries: 2097152 (order: 12, 16777216 bytes)\n" ">>> [ 0.035657] Inode-cache hash table entries: 1048576 (order: 11, 8388608 bytes)\n" @@ -130,13 +130,13 @@ ">>> [ 0.633006] Total of 8 processors activated (44799.46 BogoMIPS).\n" ">>\n" ">> assume that when you have \n" - ">> CONFIG_NR_CPUS\026\n" + ">> CONFIG_NR_CPUS=16\n" ">> instead of\n" ">> CONFIG_NR_CPUS=8\n" ">>\n" ">> it will boot ok?\n" "> \n" - "> No. But it boots OK with CONFIG_NR_CPUSd: it actually has 24 CPUs, a bit more\n" + "> No. But it boots OK with CONFIG_NR_CPUS=64: it actually has 24 CPUs, a bit more\n" "> than your expectation :)\n" "> \n" "> This also boots the other 16 CPU box that used to lockup in find_busiest_group().\n" @@ -156,7 +156,7 @@ "If the user have compiled limited NR_CPUS or boot with nr_cpus=, could have missed\n" "to put some cpus apic id to node mapping into apicid_to_node[].\n" "\n" - "for example for 4 sockets system with 64 cpus with nr_cpus2 will get crash...\n" + "for example for 4 sockets system with 64 cpus with nr_cpus=32 will get crash...\n" "\n" "[ 9.106288] Total of 32 processors activated (136190.88 BogoMIPS).\n" "[ 9.235021] divide error: 0000 [#1] SMP \n" @@ -216,7 +216,8 @@ " 3 files changed, 27 insertions(+), 2 deletions(-)\n" "\n" "Index: linux-2.6/arch/x86/kernel/acpi/boot.c\n" - "=================================--- linux-2.6.orig/arch/x86/kernel/acpi/boot.c\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/x86/kernel/acpi/boot.c\n" "+++ linux-2.6/arch/x86/kernel/acpi/boot.c\n" "@@ -198,6 +198,13 @@ static void __cpuinit acpi_register_lapi\n" " {\n" @@ -233,7 +234,8 @@ " \t\t++disabled_cpus;\n" " \t\treturn;\n" "Index: linux-2.6/arch/x86/mm/srat_64.c\n" - "=================================--- linux-2.6.orig/arch/x86/mm/srat_64.c\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/x86/mm/srat_64.c\n" "+++ linux-2.6/arch/x86/mm/srat_64.c\n" "@@ -134,6 +134,10 @@ acpi_numa_x2apic_affinity_init(struct ac\n" " \t}\n" @@ -258,7 +260,8 @@ " \tnode_set(node, cpu_nodes_parsed);\n" " \tacpi_numa = 1;\n" "Index: linux-2.6/drivers/acpi/numa.c\n" - "=================================--- linux-2.6.orig/drivers/acpi/numa.c\n" + "===================================================================\n" + "--- linux-2.6.orig/drivers/acpi/numa.c\n" "+++ linux-2.6/drivers/acpi/numa.c\n" "@@ -275,13 +275,23 @@ acpi_table_parse_srat(enum acpi_srat_typ\n" " int __init acpi_numa_init(void)\n" @@ -287,4 +290,4 @@ " \t\t\t\t\t acpi_parse_memory_affinity,\n" " \t\t\t\t\t NR_NODE_MEMBLKS);" -fb36d994e5239d243e6eb5198410d5664df895748201c43c3f61026937132956 +54771840f8f9c44f076ce25ef8634aa6e8c4c0a8dd2fe36538b423b52fdfcd43
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.