diff for duplicates of <4D0AD486.9020704@kernel.org> diff --git a/a/1.txt b/N1/1.txt index c06f0dc..eb1bf32 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,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 @@ -27,7 +27,7 @@ Also add apicid checking with MAX_LOCAL_APIC, in case We could out of boundaries apicid_to_node[]. it fixes following bug too. -https://bugzilla.kernel.org/show_bug.cgi?id"662 +https://bugzilla.kernel.org/show_bug.cgi?id=22662 -v2: expand to 32bit according to hpa need to add MAX_LOCAL_APIC for 32bit @@ -45,7 +45,8 @@ Signed-off-by: Yinghai Lu <yinghai@kernel.org> 4 files changed, 28 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,11 @@ static void __cpuinit acpi_register_lapi { @@ -60,7 +61,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 } @@ -87,7 +89,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) @@ -97,7 +100,8 @@ Index: linux-2.6/drivers/acpi/numa.c + +#ifdef CONFIG_X86 + /* -+ * Should not limit number with cpu num that is from NR_CPUS or nr_cpus+ * SRAT cpu entries could have different order with that in MADT. ++ * Should not limit number with cpu num that is from NR_CPUS or nr_cpus= ++ * SRAT cpu entries could have different order with that in MADT. + * So go over all cpu entries in SRAT to get apicid to node mapping. + */ + nr_cpu_entries = MAX_LOCAL_APIC; @@ -115,7 +119,8 @@ Index: linux-2.6/drivers/acpi/numa.c acpi_parse_memory_affinity, NR_NODE_MEMBLKS); Index: linux-2.6/arch/x86/mm/srat_32.c -=================================--- linux-2.6.orig/arch/x86/mm/srat_32.c +=================================================================== +--- linux-2.6.orig/arch/x86/mm/srat_32.c +++ linux-2.6/arch/x86/mm/srat_32.c @@ -92,6 +92,7 @@ acpi_numa_processor_affinity_init(struct /* mark this node as "seen" in node bitmap */ diff --git a/a/content_digest b/N1/content_digest index 0a8edb6..7cc82f8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -15,8 +15,8 @@ "ref\04D094703.7080701@zytor.com\0" "ref\04D0AD464.2020408@kernel.org\0" "From\0Yinghai Lu <yinghai@kernel.org>\0" - "Subject\0[PATCH -v2 2/2] x86, acpi: Parse all SRAT cpu entries even have cpu\0" - "Date\0Fri, 17 Dec 2010 03:09:58 +0000\0" + "Subject\0[PATCH -v2 2/2] x86, acpi: Parse all SRAT cpu entries even have cpu num limitation\0" + "Date\0Thu, 16 Dec 2010 19:09:58 -0800\0" "To\0H. Peter Anvin <hpa@zytor.com>\0" "Cc\0Ingo Molnar <mingo@elte.hu>" Andrew Morton <akpm@linux-foundation.org> @@ -44,7 +44,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" @@ -65,7 +65,7 @@ "apicid_to_node[].\n" "\n" "it fixes following bug too.\n" - "https://bugzilla.kernel.org/show_bug.cgi?id\"662\n" + "https://bugzilla.kernel.org/show_bug.cgi?id=22662\n" "\n" "-v2: expand to 32bit according to hpa\n" " need to add MAX_LOCAL_APIC for 32bit\n" @@ -83,7 +83,8 @@ " 4 files changed, 28 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,11 @@ static void __cpuinit acpi_register_lapi\n" " {\n" @@ -98,7 +99,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" @@ -125,7 +127,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" @@ -135,7 +138,8 @@ "+\n" "+#ifdef CONFIG_X86\n" "+\t/*\n" - "+\t * Should not limit number with cpu num that is from NR_CPUS or nr_cpus+\t * SRAT cpu entries could have different order with that in MADT.\n" + "+\t * Should not limit number with cpu num that is from NR_CPUS or nr_cpus=\n" + "+\t * SRAT cpu entries could have different order with that in MADT.\n" "+\t * So go over all cpu entries in SRAT to get apicid to node mapping.\n" "+\t */\n" "+\tnr_cpu_entries = MAX_LOCAL_APIC;\n" @@ -153,7 +157,8 @@ " \t\t\t\t\t acpi_parse_memory_affinity,\n" " \t\t\t\t\t NR_NODE_MEMBLKS);\n" "Index: linux-2.6/arch/x86/mm/srat_32.c\n" - "=================================--- linux-2.6.orig/arch/x86/mm/srat_32.c\n" + "===================================================================\n" + "--- linux-2.6.orig/arch/x86/mm/srat_32.c\n" "+++ linux-2.6/arch/x86/mm/srat_32.c\n" "@@ -92,6 +92,7 @@ acpi_numa_processor_affinity_init(struct\n" " \t/* mark this node as \"seen\" in node bitmap */\n" @@ -164,4 +169,4 @@ " \n" " \tprintk(KERN_DEBUG \"CPU %02x in proximity domain %02x\\n\"," -440d43360f3904d23bbe15767d58e25b25ded0b974a4b85d07802797d49b1b88 +c2ba10adf9a30b5f5a1447c2c1ca2032b13a5bddb0836fc0c287fd109b191126
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.