[PATCH v2 0/4] acpi: do some changes for numa info

[PATCH v2 0/4] acpi: do some changes for numa info

[liguang]

just do some trivial changes to make acpi's numa info
operation more cleaner.

ChangeLog
v1->v2
 1. fix-up several coding issues
 2. finish srat.c change
 spotted by David Rientjes <rientjes@google.com>

Li Guang(4)
        numa: avoid export acpi_numa variable
        acpi: move x86/mm/srat.c to x86/kernel/acpi/srat.c
        acpi: add clock_domain field to acpi_srat_cpu_affinity
        remove include asm/acpi.h in process_driver.c

 arch/x86/include/asm/acpi.h 		|    2 +-
 arch/x86/kernel/acpi/srat.c 		|  212 +++++++++++++++++++++++++++++++++++++++++++---
 arch/x86/mm/srat.c          		|  197 -------------------------------------------
 arch/x86/mm/numa.c          		|    2 +-
 arch/x86/xen/enlighten.c    		|    2 +-
 include/acpi/actbl1.h       		|    2 +-
 drivers/acpi/processor_driver.c |    1 -
 7 files changed, 211 insertions(+), 207 deletions(-)
 create mode 100644 arch/x86/kernel/acpi/srat.c
 delete mode 100644 arch/x86/mm/srat.c

 

[PATCH v2 1/4] acpi: move x86/mm/srat.c to x86/kernel/acpi/srat.c

[liguang]

srat table should present only on acpi domain,
seems mm/ is not the right place for it.

Reviewed-by: David Rientjes <rientjes@google.com>
Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
---
 arch/x86/kernel/acpi/srat.c |  197 +++++++++++++++++++++++++++++++++++++++++++
 arch/x86/mm/srat.c          |  197 -------------------------------------------
 2 files changed, 197 insertions(+), 197 deletions(-)
 create mode 100644 arch/x86/kernel/acpi/srat.c
 delete mode 100644 arch/x86/mm/srat.c

diff --git a/arch/x86/kernel/acpi/srat.c b/arch/x86/kernel/acpi/srat.c
new file mode 100644
index 0000000..4ddf497
--- /dev/null
+++ b/arch/x86/kernel/acpi/srat.c
@@ -0,0 +1,197 @@
+/*
+ * ACPI 3.0 based NUMA setup
+ * Copyright 2004 Andi Kleen, SuSE Labs.
+ *
+ * Reads the ACPI SRAT table to figure out what memory belongs to which CPUs.
+ *
+ * Called from acpi_numa_init while reading the SRAT and SLIT tables.
+ * Assumes all memory regions belonging to a single proximity domain
+ * are in one chunk. Holes between them will be included in the node.
+ */
+
+#include <linux/kernel.h>
+#include <linux/acpi.h>
+#include <linux/mmzone.h>
+#include <linux/bitmap.h>
+#include <linux/module.h>
+#include <linux/topology.h>
+#include <linux/bootmem.h>
+#include <linux/memblock.h>
+#include <linux/mm.h>
+#include <asm/proto.h>
+#include <asm/numa.h>
+#include <asm/e820.h>
+#include <asm/apic.h>
+#include <asm/uv/uv.h>
+
+int acpi_numa __initdata;
+
+static __init int setup_node(int pxm)
+{
+	return acpi_map_pxm_to_node(pxm);
+}
+
+static __init void bad_srat(void)
+{
+	printk(KERN_ERR "SRAT: SRAT not used.\n");
+	acpi_numa = -1;
+}
+
+static __init inline int srat_disabled(void)
+{
+	return acpi_numa < 0;
+}
+
+/* Callback for SLIT parsing */
+void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
+{
+	int i, j;
+
+	for (i = 0; i < slit->locality_count; i++)
+		for (j = 0; j < slit->locality_count; j++)
+			numa_set_distance(pxm_to_node(i), pxm_to_node(j),
+				slit->entry[slit->locality_count * i + j]);
+}
+
+/* Callback for Proximity Domain -> x2APIC mapping */
+void __init
+acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
+{
+	int pxm, node;
+	int apic_id;
+
+	if (srat_disabled())
+		return;
+	if (pa->header.length < sizeof(struct acpi_srat_x2apic_cpu_affinity)) {
+		bad_srat();
+		return;
+	}
+	if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
+		return;
+	pxm = pa->proximity_domain;
+	apic_id = pa->apic_id;
+	if (!apic->apic_id_valid(apic_id)) {
+		printk(KERN_INFO "SRAT: PXM %u -> X2APIC 0x%04x ignored\n",
+			 pxm, apic_id);
+		return;
+	}
+	node = setup_node(pxm);
+	if (node < 0) {
+		printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
+		bad_srat();
+		return;
+	}
+
+	if (apic_id >= MAX_LOCAL_APIC) {
+		printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
+		return;
+	}
+	set_apicid_to_node(apic_id, node);
+	node_set(node, numa_nodes_parsed);
+	acpi_numa = 1;
+	printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u\n",
+	       pxm, apic_id, node);
+}
+
+/* Callback for Proximity Domain -> LAPIC mapping */
+void __init
+acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
+{
+	int pxm, node;
+	int apic_id;
+
+	if (srat_disabled())
+		return;
+	if (pa->header.length != sizeof(struct acpi_srat_cpu_affinity)) {
+		bad_srat();
+		return;
+	}
+	if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
+		return;
+	pxm = pa->proximity_domain_lo;
+	if (acpi_srat_revision >= 2)
+		pxm |= *((unsigned int*)pa->proximity_domain_hi) << 8;
+	node = setup_node(pxm);
+	if (node < 0) {
+		printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
+		bad_srat();
+		return;
+	}
+
+	if (get_uv_system_type() >= UV_X2APIC)
+		apic_id = (pa->apic_id << 8) | pa->local_sapic_eid;
+	else
+		apic_id = pa->apic_id;
+
+	if (apic_id >= MAX_LOCAL_APIC) {
+		printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
+		return;
+	}
+
+	set_apicid_to_node(apic_id, node);
+	node_set(node, numa_nodes_parsed);
+	acpi_numa = 1;
+	printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u\n",
+	       pxm, apic_id, node);
+}
+
+#ifdef CONFIG_MEMORY_HOTPLUG
+static inline int save_add_info(void) {return 1;}
+#else
+static inline int save_add_info(void) {return 0;}
+#endif
+
+/* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
+int __init
+acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
+{
+	u64 start, end;
+	int node, pxm;
+
+	if (srat_disabled())
+		return -1;
+	if (ma->header.length != sizeof(struct acpi_srat_mem_affinity)) {
+		bad_srat();
+		return -1;
+	}
+	if ((ma->flags & ACPI_SRAT_MEM_ENABLED) == 0)
+		return -1;
+
+	if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && !save_add_info())
+		return -1;
+	start = ma->base_address;
+	end = start + ma->length;
+	pxm = ma->proximity_domain;
+	if (acpi_srat_revision <= 1)
+		pxm &= 0xff;
+	node = setup_node(pxm);
+	if (node < 0) {
+		printk(KERN_ERR "SRAT: Too many proximity domains.\n");
+		bad_srat();
+		return -1;
+	}
+
+	if (numa_add_memblk(node, start, end) < 0) {
+		bad_srat();
+		return -1;
+	}
+
+	node_set(node, numa_nodes_parsed);
+
+	printk(KERN_INFO "SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]\n",
+	       node, pxm,
+	       (unsigned long long) start, (unsigned long long) end - 1);
+	return 0;
+}
+
+void __init acpi_numa_arch_fixup(void) {}
+
+int __init x86_acpi_numa_init(void)
+{
+	int ret;
+
+	ret = acpi_numa_init();
+	if (ret < 0)
+		return ret;
+	return srat_disabled() ? -EINVAL : 0;
+}
diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c
deleted file mode 100644
index 4ddf497..0000000
--- a/arch/x86/mm/srat.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * ACPI 3.0 based NUMA setup
- * Copyright 2004 Andi Kleen, SuSE Labs.
- *
- * Reads the ACPI SRAT table to figure out what memory belongs to which CPUs.
- *
- * Called from acpi_numa_init while reading the SRAT and SLIT tables.
- * Assumes all memory regions belonging to a single proximity domain
- * are in one chunk. Holes between them will be included in the node.
- */
-
-#include <linux/kernel.h>
-#include <linux/acpi.h>
-#include <linux/mmzone.h>
-#include <linux/bitmap.h>
-#include <linux/module.h>
-#include <linux/topology.h>
-#include <linux/bootmem.h>
-#include <linux/memblock.h>
-#include <linux/mm.h>
-#include <asm/proto.h>
-#include <asm/numa.h>
-#include <asm/e820.h>
-#include <asm/apic.h>
-#include <asm/uv/uv.h>
-
-int acpi_numa __initdata;
-
-static __init int setup_node(int pxm)
-{
-	return acpi_map_pxm_to_node(pxm);
-}
-
-static __init void bad_srat(void)
-{
-	printk(KERN_ERR "SRAT: SRAT not used.\n");
-	acpi_numa = -1;
-}
-
-static __init inline int srat_disabled(void)
-{
-	return acpi_numa < 0;
-}
-
-/* Callback for SLIT parsing */
-void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
-{
-	int i, j;
-
-	for (i = 0; i < slit->locality_count; i++)
-		for (j = 0; j < slit->locality_count; j++)
-			numa_set_distance(pxm_to_node(i), pxm_to_node(j),
-				slit->entry[slit->locality_count * i + j]);
-}
-
-/* Callback for Proximity Domain -> x2APIC mapping */
-void __init
-acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
-{
-	int pxm, node;
-	int apic_id;
-
-	if (srat_disabled())
-		return;
-	if (pa->header.length < sizeof(struct acpi_srat_x2apic_cpu_affinity)) {
-		bad_srat();
-		return;
-	}
-	if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
-		return;
-	pxm = pa->proximity_domain;
-	apic_id = pa->apic_id;
-	if (!apic->apic_id_valid(apic_id)) {
-		printk(KERN_INFO "SRAT: PXM %u -> X2APIC 0x%04x ignored\n",
-			 pxm, apic_id);
-		return;
-	}
-	node = setup_node(pxm);
-	if (node < 0) {
-		printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
-		bad_srat();
-		return;
-	}
-
-	if (apic_id >= MAX_LOCAL_APIC) {
-		printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
-		return;
-	}
-	set_apicid_to_node(apic_id, node);
-	node_set(node, numa_nodes_parsed);
-	acpi_numa = 1;
-	printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u\n",
-	       pxm, apic_id, node);
-}
-
-/* Callback for Proximity Domain -> LAPIC mapping */
-void __init
-acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
-{
-	int pxm, node;
-	int apic_id;
-
-	if (srat_disabled())
-		return;
-	if (pa->header.length != sizeof(struct acpi_srat_cpu_affinity)) {
-		bad_srat();
-		return;
-	}
-	if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
-		return;
-	pxm = pa->proximity_domain_lo;
-	if (acpi_srat_revision >= 2)
-		pxm |= *((unsigned int*)pa->proximity_domain_hi) << 8;
-	node = setup_node(pxm);
-	if (node < 0) {
-		printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
-		bad_srat();
-		return;
-	}
-
-	if (get_uv_system_type() >= UV_X2APIC)
-		apic_id = (pa->apic_id << 8) | pa->local_sapic_eid;
-	else
-		apic_id = pa->apic_id;
-
-	if (apic_id >= MAX_LOCAL_APIC) {
-		printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
-		return;
-	}
-
-	set_apicid_to_node(apic_id, node);
-	node_set(node, numa_nodes_parsed);
-	acpi_numa = 1;
-	printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u\n",
-	       pxm, apic_id, node);
-}
-
-#ifdef CONFIG_MEMORY_HOTPLUG
-static inline int save_add_info(void) {return 1;}
-#else
-static inline int save_add_info(void) {return 0;}
-#endif
-
-/* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
-int __init
-acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
-{
-	u64 start, end;
-	int node, pxm;
-
-	if (srat_disabled())
-		return -1;
-	if (ma->header.length != sizeof(struct acpi_srat_mem_affinity)) {
-		bad_srat();
-		return -1;
-	}
-	if ((ma->flags & ACPI_SRAT_MEM_ENABLED) == 0)
-		return -1;
-
-	if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && !save_add_info())
-		return -1;
-	start = ma->base_address;
-	end = start + ma->length;
-	pxm = ma->proximity_domain;
-	if (acpi_srat_revision <= 1)
-		pxm &= 0xff;
-	node = setup_node(pxm);
-	if (node < 0) {
-		printk(KERN_ERR "SRAT: Too many proximity domains.\n");
-		bad_srat();
-		return -1;
-	}
-
-	if (numa_add_memblk(node, start, end) < 0) {
-		bad_srat();
-		return -1;
-	}
-
-	node_set(node, numa_nodes_parsed);
-
-	printk(KERN_INFO "SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]\n",
-	       node, pxm,
-	       (unsigned long long) start, (unsigned long long) end - 1);
-	return 0;
-}
-
-void __init acpi_numa_arch_fixup(void) {}
-
-int __init x86_acpi_numa_init(void)
-{
-	int ret;
-
-	ret = acpi_numa_init();
-	if (ret < 0)
-		return ret;
-	return srat_disabled() ? -EINVAL : 0;
-}
-- 
1.7.2.5

[PATCH v2 2/4] numa: avoid export acpi_numa variable

[liguang]

acpi_numa is used to prevent srat table
being parsed, seems a little miss-named,
if 'noacpi' was specified by cmdline and
CONFIG_ACPI_NUMA was enabled, acpi_numa
will be operated directly from everywhere
it needed to disable/enable numa in acpi
mode which was a bad thing, so, try to
export a fuction to get srat table
enable/disable info.

Reviewed-by: David Rientjes <rientjes@google.com>
Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
---
 arch/x86/include/asm/acpi.h |    2 +-
 arch/x86/kernel/acpi/srat.c |   15 ++++++++++-----
 arch/x86/mm/numa.c          |    2 +-
 arch/x86/xen/enlighten.c    |    2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 0c44630..6b9c861 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -181,7 +181,7 @@ static inline void disable_acpi(void) { }
 #define ARCH_HAS_POWER_INIT	1
 
 #ifdef CONFIG_ACPI_NUMA
-extern int acpi_numa;
+extern void disable_acpi_numa(void);
 extern int x86_acpi_numa_init(void);
 #endif /* CONFIG_ACPI_NUMA */
 
diff --git a/arch/x86/kernel/acpi/srat.c b/arch/x86/kernel/acpi/srat.c
index 4ddf497..0a4d7ee 100644
--- a/arch/x86/kernel/acpi/srat.c
+++ b/arch/x86/kernel/acpi/srat.c
@@ -24,22 +24,27 @@
 #include <asm/apic.h>
 #include <asm/uv/uv.h>
 
-int acpi_numa __initdata;
+static bool acpi_numa __initdata;
 
 static __init int setup_node(int pxm)
 {
 	return acpi_map_pxm_to_node(pxm);
 }
 
-static __init void bad_srat(void)
+void __init disable_acpi_numa(void)
+{
+	acpi_numa = false;
+}
+
+static void __init bad_srat(void)
 {
-	printk(KERN_ERR "SRAT: SRAT not used.\n");
 	acpi_numa = -1;
+	printk(KERN_ERR "SRAT: SRAT will not be used.\n");
 }
 
-static __init inline int srat_disabled(void)
+static bool __init srat_disabled(void)
 {
-	return acpi_numa < 0;
+	return acpi_numa;
 }
 
 /* Callback for SLIT parsing */
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 2d125be..870ca6b 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -47,7 +47,7 @@ static __init int numa_setup(char *opt)
 #endif
 #ifdef CONFIG_ACPI_NUMA
 	if (!strncmp(opt, "noacpi", 6))
-		acpi_numa = -1;
+		disable_acpi_numa();
 #endif
 	return 0;
 }
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 138e566..a5f6353 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1415,7 +1415,7 @@ asmlinkage void __init xen_start_kernel(void)
 	 * any NUMA information the kernel tries to get from ACPI will
 	 * be meaningless.  Prevent it from trying.
 	 */
-	acpi_numa = -1;
+	disable_acpi_numa();
 #endif
 
 	/* Don't do the full vcpu_info placement stuff until we have a
-- 
1.7.2.5

[PATCH v2 3/4] acpi: add clock_domain field to acpi_srat_cpu_affinity

[liguang]

according to ACPI SPEC v5.0, page 152,
5.2.16.1 Processor Local APIC/SAPIC Affinity Structure,
the last member of it is clock_domain.

Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
---
 include/acpi/actbl1.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 280fc45..98031a3 100644
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -922,7 +922,7 @@ struct acpi_srat_cpu_affinity {
 	u32 flags;
 	u8 local_sapic_eid;
 	u8 proximity_domain_hi[3];
-	u32 reserved;		/* Reserved, must be zero */
+	u32 clock_domain;
 };
 
 /* Flags */
-- 
1.7.2.5

[PATCH v2 4/4] remove include asm/acpi.h in process_driver.c

[liguang]

process_driver.c include linux/acpi.h which already
include asm/acpi.h, so remove it.

Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
---
 drivers/acpi/processor_driver.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index e83311b..752eedb 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -52,7 +52,6 @@
 #include <asm/uaccess.h>
 #include <asm/processor.h>
 #include <asm/smp.h>
-#include <asm/acpi.h>
 
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
-- 
1.7.2.5

Re: [PATCH v2 1/4] acpi: move x86/mm/srat.c to x86/kernel/acpi/srat.c

[Yasuaki Ishimatsu]

Hi Liguang,

2013/02/05 11:37, liguang wrote:
> srat table should present only on acpi domain,
> seems mm/ is not the right place for it.
> 
> Reviewed-by: David Rientjes <rientjes@google.com>
> Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
> ---
>
>   arch/x86/kernel/acpi/srat.c |  197 +++++++++++++++++++++++++++++++++++++++++++
>   arch/x86/mm/srat.c          |  197 -------------------------------------------
>   2 files changed, 197 insertions(+), 197 deletions(-)
>   create mode 100644 arch/x86/kernel/acpi/srat.c
>   delete mode 100644 arch/x86/mm/srat.c

Changes of Makefile disappeared.

Thanks,
Yasuaki Ishimatsu

> 
> diff --git a/arch/x86/kernel/acpi/srat.c b/arch/x86/kernel/acpi/srat.c
> new file mode 100644
> index 0000000..4ddf497
> --- /dev/null
> +++ b/arch/x86/kernel/acpi/srat.c
> @@ -0,0 +1,197 @@
> +/*
> + * ACPI 3.0 based NUMA setup
> + * Copyright 2004 Andi Kleen, SuSE Labs.
> + *
> + * Reads the ACPI SRAT table to figure out what memory belongs to which CPUs.
> + *
> + * Called from acpi_numa_init while reading the SRAT and SLIT tables.
> + * Assumes all memory regions belonging to a single proximity domain
> + * are in one chunk. Holes between them will be included in the node.
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/acpi.h>
> +#include <linux/mmzone.h>
> +#include <linux/bitmap.h>
> +#include <linux/module.h>
> +#include <linux/topology.h>
> +#include <linux/bootmem.h>
> +#include <linux/memblock.h>
> +#include <linux/mm.h>
> +#include <asm/proto.h>
> +#include <asm/numa.h>
> +#include <asm/e820.h>
> +#include <asm/apic.h>
> +#include <asm/uv/uv.h>
> +
> +int acpi_numa __initdata;
> +
> +static __init int setup_node(int pxm)
> +{
> +	return acpi_map_pxm_to_node(pxm);
> +}
> +
> +static __init void bad_srat(void)
> +{
> +	printk(KERN_ERR "SRAT: SRAT not used.\n");
> +	acpi_numa = -1;
> +}
> +
> +static __init inline int srat_disabled(void)
> +{
> +	return acpi_numa < 0;
> +}
> +
> +/* Callback for SLIT parsing */
> +void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
> +{
> +	int i, j;
> +
> +	for (i = 0; i < slit->locality_count; i++)
> +		for (j = 0; j < slit->locality_count; j++)
> +			numa_set_distance(pxm_to_node(i), pxm_to_node(j),
> +				slit->entry[slit->locality_count * i + j]);
> +}
> +
> +/* Callback for Proximity Domain -> x2APIC mapping */
> +void __init
> +acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
> +{
> +	int pxm, node;
> +	int apic_id;
> +
> +	if (srat_disabled())
> +		return;
> +	if (pa->header.length < sizeof(struct acpi_srat_x2apic_cpu_affinity)) {
> +		bad_srat();
> +		return;
> +	}
> +	if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
> +		return;
> +	pxm = pa->proximity_domain;
> +	apic_id = pa->apic_id;
> +	if (!apic->apic_id_valid(apic_id)) {
> +		printk(KERN_INFO "SRAT: PXM %u -> X2APIC 0x%04x ignored\n",
> +			 pxm, apic_id);
> +		return;
> +	}
> +	node = setup_node(pxm);
> +	if (node < 0) {
> +		printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
> +		bad_srat();
> +		return;
> +	}
> +
> +	if (apic_id >= MAX_LOCAL_APIC) {
> +		printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
> +		return;
> +	}
> +	set_apicid_to_node(apic_id, node);
> +	node_set(node, numa_nodes_parsed);
> +	acpi_numa = 1;
> +	printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u\n",
> +	       pxm, apic_id, node);
> +}
> +
> +/* Callback for Proximity Domain -> LAPIC mapping */
> +void __init
> +acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
> +{
> +	int pxm, node;
> +	int apic_id;
> +
> +	if (srat_disabled())
> +		return;
> +	if (pa->header.length != sizeof(struct acpi_srat_cpu_affinity)) {
> +		bad_srat();
> +		return;
> +	}
> +	if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
> +		return;
> +	pxm = pa->proximity_domain_lo;
> +	if (acpi_srat_revision >= 2)
> +		pxm |= *((unsigned int*)pa->proximity_domain_hi) << 8;
> +	node = setup_node(pxm);
> +	if (node < 0) {
> +		printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
> +		bad_srat();
> +		return;
> +	}
> +
> +	if (get_uv_system_type() >= UV_X2APIC)
> +		apic_id = (pa->apic_id << 8) | pa->local_sapic_eid;
> +	else
> +		apic_id = pa->apic_id;
> +
> +	if (apic_id >= MAX_LOCAL_APIC) {
> +		printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
> +		return;
> +	}
> +
> +	set_apicid_to_node(apic_id, node);
> +	node_set(node, numa_nodes_parsed);
> +	acpi_numa = 1;
> +	printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u\n",
> +	       pxm, apic_id, node);
> +}
> +
> +#ifdef CONFIG_MEMORY_HOTPLUG
> +static inline int save_add_info(void) {return 1;}
> +#else
> +static inline int save_add_info(void) {return 0;}
> +#endif
> +
> +/* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
> +int __init
> +acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
> +{
> +	u64 start, end;
> +	int node, pxm;
> +
> +	if (srat_disabled())
> +		return -1;
> +	if (ma->header.length != sizeof(struct acpi_srat_mem_affinity)) {
> +		bad_srat();
> +		return -1;
> +	}
> +	if ((ma->flags & ACPI_SRAT_MEM_ENABLED) == 0)
> +		return -1;
> +
> +	if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && !save_add_info())
> +		return -1;
> +	start = ma->base_address;
> +	end = start + ma->length;
> +	pxm = ma->proximity_domain;
> +	if (acpi_srat_revision <= 1)
> +		pxm &= 0xff;
> +	node = setup_node(pxm);
> +	if (node < 0) {
> +		printk(KERN_ERR "SRAT: Too many proximity domains.\n");
> +		bad_srat();
> +		return -1;
> +	}
> +
> +	if (numa_add_memblk(node, start, end) < 0) {
> +		bad_srat();
> +		return -1;
> +	}
> +
> +	node_set(node, numa_nodes_parsed);
> +
> +	printk(KERN_INFO "SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]\n",
> +	       node, pxm,
> +	       (unsigned long long) start, (unsigned long long) end - 1);
> +	return 0;
> +}
> +
> +void __init acpi_numa_arch_fixup(void) {}
> +
> +int __init x86_acpi_numa_init(void)
> +{
> +	int ret;
> +
> +	ret = acpi_numa_init();
> +	if (ret < 0)
> +		return ret;
> +	return srat_disabled() ? -EINVAL : 0;
> +}
> diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c
> deleted file mode 100644
> index 4ddf497..0000000
> --- a/arch/x86/mm/srat.c
> +++ /dev/null
> @@ -1,197 +0,0 @@
> -/*
> - * ACPI 3.0 based NUMA setup
> - * Copyright 2004 Andi Kleen, SuSE Labs.
> - *
> - * Reads the ACPI SRAT table to figure out what memory belongs to which CPUs.
> - *
> - * Called from acpi_numa_init while reading the SRAT and SLIT tables.
> - * Assumes all memory regions belonging to a single proximity domain
> - * are in one chunk. Holes between them will be included in the node.
> - */
> -
> -#include <linux/kernel.h>
> -#include <linux/acpi.h>
> -#include <linux/mmzone.h>
> -#include <linux/bitmap.h>
> -#include <linux/module.h>
> -#include <linux/topology.h>
> -#include <linux/bootmem.h>
> -#include <linux/memblock.h>
> -#include <linux/mm.h>
> -#include <asm/proto.h>
> -#include <asm/numa.h>
> -#include <asm/e820.h>
> -#include <asm/apic.h>
> -#include <asm/uv/uv.h>
> -
> -int acpi_numa __initdata;
> -
> -static __init int setup_node(int pxm)
> -{
> -	return acpi_map_pxm_to_node(pxm);
> -}
> -
> -static __init void bad_srat(void)
> -{
> -	printk(KERN_ERR "SRAT: SRAT not used.\n");
> -	acpi_numa = -1;
> -}
> -
> -static __init inline int srat_disabled(void)
> -{
> -	return acpi_numa < 0;
> -}
> -
> -/* Callback for SLIT parsing */
> -void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
> -{
> -	int i, j;
> -
> -	for (i = 0; i < slit->locality_count; i++)
> -		for (j = 0; j < slit->locality_count; j++)
> -			numa_set_distance(pxm_to_node(i), pxm_to_node(j),
> -				slit->entry[slit->locality_count * i + j]);
> -}
> -
> -/* Callback for Proximity Domain -> x2APIC mapping */
> -void __init
> -acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
> -{
> -	int pxm, node;
> -	int apic_id;
> -
> -	if (srat_disabled())
> -		return;
> -	if (pa->header.length < sizeof(struct acpi_srat_x2apic_cpu_affinity)) {
> -		bad_srat();
> -		return;
> -	}
> -	if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
> -		return;
> -	pxm = pa->proximity_domain;
> -	apic_id = pa->apic_id;
> -	if (!apic->apic_id_valid(apic_id)) {
> -		printk(KERN_INFO "SRAT: PXM %u -> X2APIC 0x%04x ignored\n",
> -			 pxm, apic_id);
> -		return;
> -	}
> -	node = setup_node(pxm);
> -	if (node < 0) {
> -		printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
> -		bad_srat();
> -		return;
> -	}
> -
> -	if (apic_id >= MAX_LOCAL_APIC) {
> -		printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
> -		return;
> -	}
> -	set_apicid_to_node(apic_id, node);
> -	node_set(node, numa_nodes_parsed);
> -	acpi_numa = 1;
> -	printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u\n",
> -	       pxm, apic_id, node);
> -}
> -
> -/* Callback for Proximity Domain -> LAPIC mapping */
> -void __init
> -acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
> -{
> -	int pxm, node;
> -	int apic_id;
> -
> -	if (srat_disabled())
> -		return;
> -	if (pa->header.length != sizeof(struct acpi_srat_cpu_affinity)) {
> -		bad_srat();
> -		return;
> -	}
> -	if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
> -		return;
> -	pxm = pa->proximity_domain_lo;
> -	if (acpi_srat_revision >= 2)
> -		pxm |= *((unsigned int*)pa->proximity_domain_hi) << 8;
> -	node = setup_node(pxm);
> -	if (node < 0) {
> -		printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
> -		bad_srat();
> -		return;
> -	}
> -
> -	if (get_uv_system_type() >= UV_X2APIC)
> -		apic_id = (pa->apic_id << 8) | pa->local_sapic_eid;
> -	else
> -		apic_id = pa->apic_id;
> -
> -	if (apic_id >= MAX_LOCAL_APIC) {
> -		printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
> -		return;
> -	}
> -
> -	set_apicid_to_node(apic_id, node);
> -	node_set(node, numa_nodes_parsed);
> -	acpi_numa = 1;
> -	printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u\n",
> -	       pxm, apic_id, node);
> -}
> -
> -#ifdef CONFIG_MEMORY_HOTPLUG
> -static inline int save_add_info(void) {return 1;}
> -#else
> -static inline int save_add_info(void) {return 0;}
> -#endif
> -
> -/* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
> -int __init
> -acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
> -{
> -	u64 start, end;
> -	int node, pxm;
> -
> -	if (srat_disabled())
> -		return -1;
> -	if (ma->header.length != sizeof(struct acpi_srat_mem_affinity)) {
> -		bad_srat();
> -		return -1;
> -	}
> -	if ((ma->flags & ACPI_SRAT_MEM_ENABLED) == 0)
> -		return -1;
> -
> -	if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && !save_add_info())
> -		return -1;
> -	start = ma->base_address;
> -	end = start + ma->length;
> -	pxm = ma->proximity_domain;
> -	if (acpi_srat_revision <= 1)
> -		pxm &= 0xff;
> -	node = setup_node(pxm);
> -	if (node < 0) {
> -		printk(KERN_ERR "SRAT: Too many proximity domains.\n");
> -		bad_srat();
> -		return -1;
> -	}
> -
> -	if (numa_add_memblk(node, start, end) < 0) {
> -		bad_srat();
> -		return -1;
> -	}
> -
> -	node_set(node, numa_nodes_parsed);
> -
> -	printk(KERN_INFO "SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]\n",
> -	       node, pxm,
> -	       (unsigned long long) start, (unsigned long long) end - 1);
> -	return 0;
> -}
> -
> -void __init acpi_numa_arch_fixup(void) {}
> -
> -int __init x86_acpi_numa_init(void)
> -{
> -	int ret;
> -
> -	ret = acpi_numa_init();
> -	if (ret < 0)
> -		return ret;
> -	return srat_disabled() ? -EINVAL : 0;
> -}
> 

Re: [PATCH v2 1/4] acpi: move x86/mm/srat.c to x86/kernel/acpi/srat.c

[li guang]

在 2013-02-05二的 13:44 +0900，Yasuaki Ishimatsu写道：
> Hi Liguang,
> 
> 2013/02/05 11:37, liguang wrote:
> > srat table should present only on acpi domain,
> > seems mm/ is not the right place for it.
> > 
> > Reviewed-by: David Rientjes <rientjes@google.com>
> > Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
> > ---
> >
> >   arch/x86/kernel/acpi/srat.c |  197 +++++++++++++++++++++++++++++++++++++++++++
> >   arch/x86/mm/srat.c          |  197 -------------------------------------------
> >   2 files changed, 197 insertions(+), 197 deletions(-)
> >   create mode 100644 arch/x86/kernel/acpi/srat.c
> >   delete mode 100644 arch/x86/mm/srat.c
> 
> Changes of Makefile disappeared.
> 
> Thanks,
> Yasuaki Ishimatsu

Oh, fogot it, 
Thank you so much for reminding me!

> 
> > 
> > diff --git a/arch/x86/kernel/acpi/srat.c b/arch/x86/kernel/acpi/srat.c
> > new file mode 100644
> > index 0000000..4ddf497
> > --- /dev/null
> > +++ b/arch/x86/kernel/acpi/srat.c
> > @@ -0,0 +1,197 @@
> > +/*
> > + * ACPI 3.0 based NUMA setup
> > + * Copyright 2004 Andi Kleen, SuSE Labs.
> > + *
> > + * Reads the ACPI SRAT table to figure out what memory belongs to which CPUs.
> > + *
> > + * Called from acpi_numa_init while reading the SRAT and SLIT tables.
> > + * Assumes all memory regions belonging to a single proximity domain
> > + * are in one chunk. Holes between them will be included in the node.
> > + */
> > +
> > +#include <linux/kernel.h>
> > +#include <linux/acpi.h>
> > +#include <linux/mmzone.h>
> > +#include <linux/bitmap.h>
> > +#include <linux/module.h>
> > +#include <linux/topology.h>
> > +#include <linux/bootmem.h>
> > +#include <linux/memblock.h>
> > +#include <linux/mm.h>
> > +#include <asm/proto.h>
> > +#include <asm/numa.h>
> > +#include <asm/e820.h>
> > +#include <asm/apic.h>
> > +#include <asm/uv/uv.h>
> > +
> > +int acpi_numa __initdata;
> > +
> > +static __init int setup_node(int pxm)
> > +{
> > +	return acpi_map_pxm_to_node(pxm);
> > +}
> > +
> > +static __init void bad_srat(void)
> > +{
> > +	printk(KERN_ERR "SRAT: SRAT not used.\n");
> > +	acpi_numa = -1;
> > +}
> > +
> > +static __init inline int srat_disabled(void)
> > +{
> > +	return acpi_numa < 0;
> > +}
> > +
> > +/* Callback for SLIT parsing */
> > +void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
> > +{
> > +	int i, j;
> > +
> > +	for (i = 0; i < slit->locality_count; i++)
> > +		for (j = 0; j < slit->locality_count; j++)
> > +			numa_set_distance(pxm_to_node(i), pxm_to_node(j),
> > +				slit->entry[slit->locality_count * i + j]);
> > +}
> > +
> > +/* Callback for Proximity Domain -> x2APIC mapping */
> > +void __init
> > +acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
> > +{
> > +	int pxm, node;
> > +	int apic_id;
> > +
> > +	if (srat_disabled())
> > +		return;
> > +	if (pa->header.length < sizeof(struct acpi_srat_x2apic_cpu_affinity)) {
> > +		bad_srat();
> > +		return;
> > +	}
> > +	if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
> > +		return;
> > +	pxm = pa->proximity_domain;
> > +	apic_id = pa->apic_id;
> > +	if (!apic->apic_id_valid(apic_id)) {
> > +		printk(KERN_INFO "SRAT: PXM %u -> X2APIC 0x%04x ignored\n",
> > +			 pxm, apic_id);
> > +		return;
> > +	}
> > +	node = setup_node(pxm);
> > +	if (node < 0) {
> > +		printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
> > +		bad_srat();
> > +		return;
> > +	}
> > +
> > +	if (apic_id >= MAX_LOCAL_APIC) {
> > +		printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
> > +		return;
> > +	}
> > +	set_apicid_to_node(apic_id, node);
> > +	node_set(node, numa_nodes_parsed);
> > +	acpi_numa = 1;
> > +	printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u\n",
> > +	       pxm, apic_id, node);
> > +}
> > +
> > +/* Callback for Proximity Domain -> LAPIC mapping */
> > +void __init
> > +acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
> > +{
> > +	int pxm, node;
> > +	int apic_id;
> > +
> > +	if (srat_disabled())
> > +		return;
> > +	if (pa->header.length != sizeof(struct acpi_srat_cpu_affinity)) {
> > +		bad_srat();
> > +		return;
> > +	}
> > +	if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
> > +		return;
> > +	pxm = pa->proximity_domain_lo;
> > +	if (acpi_srat_revision >= 2)
> > +		pxm |= *((unsigned int*)pa->proximity_domain_hi) << 8;
> > +	node = setup_node(pxm);
> > +	if (node < 0) {
> > +		printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
> > +		bad_srat();
> > +		return;
> > +	}
> > +
> > +	if (get_uv_system_type() >= UV_X2APIC)
> > +		apic_id = (pa->apic_id << 8) | pa->local_sapic_eid;
> > +	else
> > +		apic_id = pa->apic_id;
> > +
> > +	if (apic_id >= MAX_LOCAL_APIC) {
> > +		printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
> > +		return;
> > +	}
> > +
> > +	set_apicid_to_node(apic_id, node);
> > +	node_set(node, numa_nodes_parsed);
> > +	acpi_numa = 1;
> > +	printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u\n",
> > +	       pxm, apic_id, node);
> > +}
> > +
> > +#ifdef CONFIG_MEMORY_HOTPLUG
> > +static inline int save_add_info(void) {return 1;}
> > +#else
> > +static inline int save_add_info(void) {return 0;}
> > +#endif
> > +
> > +/* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
> > +int __init
> > +acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
> > +{
> > +	u64 start, end;
> > +	int node, pxm;
> > +
> > +	if (srat_disabled())
> > +		return -1;
> > +	if (ma->header.length != sizeof(struct acpi_srat_mem_affinity)) {
> > +		bad_srat();
> > +		return -1;
> > +	}
> > +	if ((ma->flags & ACPI_SRAT_MEM_ENABLED) == 0)
> > +		return -1;
> > +
> > +	if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && !save_add_info())
> > +		return -1;
> > +	start = ma->base_address;
> > +	end = start + ma->length;
> > +	pxm = ma->proximity_domain;
> > +	if (acpi_srat_revision <= 1)
> > +		pxm &= 0xff;
> > +	node = setup_node(pxm);
> > +	if (node < 0) {
> > +		printk(KERN_ERR "SRAT: Too many proximity domains.\n");
> > +		bad_srat();
> > +		return -1;
> > +	}
> > +
> > +	if (numa_add_memblk(node, start, end) < 0) {
> > +		bad_srat();
> > +		return -1;
> > +	}
> > +
> > +	node_set(node, numa_nodes_parsed);
> > +
> > +	printk(KERN_INFO "SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]\n",
> > +	       node, pxm,
> > +	       (unsigned long long) start, (unsigned long long) end - 1);
> > +	return 0;
> > +}
> > +
> > +void __init acpi_numa_arch_fixup(void) {}
> > +
> > +int __init x86_acpi_numa_init(void)
> > +{
> > +	int ret;
> > +
> > +	ret = acpi_numa_init();
> > +	if (ret < 0)
> > +		return ret;
> > +	return srat_disabled() ? -EINVAL : 0;
> > +}
> > diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c
> > deleted file mode 100644
> > index 4ddf497..0000000
> > --- a/arch/x86/mm/srat.c
> > +++ /dev/null
> > @@ -1,197 +0,0 @@
> > -/*
> > - * ACPI 3.0 based NUMA setup
> > - * Copyright 2004 Andi Kleen, SuSE Labs.
> > - *
> > - * Reads the ACPI SRAT table to figure out what memory belongs to which CPUs.
> > - *
> > - * Called from acpi_numa_init while reading the SRAT and SLIT tables.
> > - * Assumes all memory regions belonging to a single proximity domain
> > - * are in one chunk. Holes between them will be included in the node.
> > - */
> > -
> > -#include <linux/kernel.h>
> > -#include <linux/acpi.h>
> > -#include <linux/mmzone.h>
> > -#include <linux/bitmap.h>
> > -#include <linux/module.h>
> > -#include <linux/topology.h>
> > -#include <linux/bootmem.h>
> > -#include <linux/memblock.h>
> > -#include <linux/mm.h>
> > -#include <asm/proto.h>
> > -#include <asm/numa.h>
> > -#include <asm/e820.h>
> > -#include <asm/apic.h>
> > -#include <asm/uv/uv.h>
> > -
> > -int acpi_numa __initdata;
> > -
> > -static __init int setup_node(int pxm)
> > -{
> > -	return acpi_map_pxm_to_node(pxm);
> > -}
> > -
> > -static __init void bad_srat(void)
> > -{
> > -	printk(KERN_ERR "SRAT: SRAT not used.\n");
> > -	acpi_numa = -1;
> > -}
> > -
> > -static __init inline int srat_disabled(void)
> > -{
> > -	return acpi_numa < 0;
> > -}
> > -
> > -/* Callback for SLIT parsing */
> > -void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
> > -{
> > -	int i, j;
> > -
> > -	for (i = 0; i < slit->locality_count; i++)
> > -		for (j = 0; j < slit->locality_count; j++)
> > -			numa_set_distance(pxm_to_node(i), pxm_to_node(j),
> > -				slit->entry[slit->locality_count * i + j]);
> > -}
> > -
> > -/* Callback for Proximity Domain -> x2APIC mapping */
> > -void __init
> > -acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
> > -{
> > -	int pxm, node;
> > -	int apic_id;
> > -
> > -	if (srat_disabled())
> > -		return;
> > -	if (pa->header.length < sizeof(struct acpi_srat_x2apic_cpu_affinity)) {
> > -		bad_srat();
> > -		return;
> > -	}
> > -	if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
> > -		return;
> > -	pxm = pa->proximity_domain;
> > -	apic_id = pa->apic_id;
> > -	if (!apic->apic_id_valid(apic_id)) {
> > -		printk(KERN_INFO "SRAT: PXM %u -> X2APIC 0x%04x ignored\n",
> > -			 pxm, apic_id);
> > -		return;
> > -	}
> > -	node = setup_node(pxm);
> > -	if (node < 0) {
> > -		printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
> > -		bad_srat();
> > -		return;
> > -	}
> > -
> > -	if (apic_id >= MAX_LOCAL_APIC) {
> > -		printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
> > -		return;
> > -	}
> > -	set_apicid_to_node(apic_id, node);
> > -	node_set(node, numa_nodes_parsed);
> > -	acpi_numa = 1;
> > -	printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u\n",
> > -	       pxm, apic_id, node);
> > -}
> > -
> > -/* Callback for Proximity Domain -> LAPIC mapping */
> > -void __init
> > -acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
> > -{
> > -	int pxm, node;
> > -	int apic_id;
> > -
> > -	if (srat_disabled())
> > -		return;
> > -	if (pa->header.length != sizeof(struct acpi_srat_cpu_affinity)) {
> > -		bad_srat();
> > -		return;
> > -	}
> > -	if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
> > -		return;
> > -	pxm = pa->proximity_domain_lo;
> > -	if (acpi_srat_revision >= 2)
> > -		pxm |= *((unsigned int*)pa->proximity_domain_hi) << 8;
> > -	node = setup_node(pxm);
> > -	if (node < 0) {
> > -		printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
> > -		bad_srat();
> > -		return;
> > -	}
> > -
> > -	if (get_uv_system_type() >= UV_X2APIC)
> > -		apic_id = (pa->apic_id << 8) | pa->local_sapic_eid;
> > -	else
> > -		apic_id = pa->apic_id;
> > -
> > -	if (apic_id >= MAX_LOCAL_APIC) {
> > -		printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
> > -		return;
> > -	}
> > -
> > -	set_apicid_to_node(apic_id, node);
> > -	node_set(node, numa_nodes_parsed);
> > -	acpi_numa = 1;
> > -	printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u\n",
> > -	       pxm, apic_id, node);
> > -}
> > -
> > -#ifdef CONFIG_MEMORY_HOTPLUG
> > -static inline int save_add_info(void) {return 1;}
> > -#else
> > -static inline int save_add_info(void) {return 0;}
> > -#endif
> > -
> > -/* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
> > -int __init
> > -acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
> > -{
> > -	u64 start, end;
> > -	int node, pxm;
> > -
> > -	if (srat_disabled())
> > -		return -1;
> > -	if (ma->header.length != sizeof(struct acpi_srat_mem_affinity)) {
> > -		bad_srat();
> > -		return -1;
> > -	}
> > -	if ((ma->flags & ACPI_SRAT_MEM_ENABLED) == 0)
> > -		return -1;
> > -
> > -	if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && !save_add_info())
> > -		return -1;
> > -	start = ma->base_address;
> > -	end = start + ma->length;
> > -	pxm = ma->proximity_domain;
> > -	if (acpi_srat_revision <= 1)
> > -		pxm &= 0xff;
> > -	node = setup_node(pxm);
> > -	if (node < 0) {
> > -		printk(KERN_ERR "SRAT: Too many proximity domains.\n");
> > -		bad_srat();
> > -		return -1;
> > -	}
> > -
> > -	if (numa_add_memblk(node, start, end) < 0) {
> > -		bad_srat();
> > -		return -1;
> > -	}
> > -
> > -	node_set(node, numa_nodes_parsed);
> > -
> > -	printk(KERN_INFO "SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]\n",
> > -	       node, pxm,
> > -	       (unsigned long long) start, (unsigned long long) end - 1);
> > -	return 0;
> > -}
> > -
> > -void __init acpi_numa_arch_fixup(void) {}
> > -
> > -int __init x86_acpi_numa_init(void)
> > -{
> > -	int ret;
> > -
> > -	ret = acpi_numa_init();
> > -	if (ret < 0)
> > -		return ret;
> > -	return srat_disabled() ? -EINVAL : 0;
> > -}
> > 
> 
> 

Re: [PATCH v2 2/4] numa: avoid export acpi_numa variable

[Yasuaki Ishimatsu]

2013/02/05 11:37, liguang wrote:
> acpi_numa is used to prevent srat table
> being parsed, seems a little miss-named,
> if 'noacpi' was specified by cmdline and
> CONFIG_ACPI_NUMA was enabled, acpi_numa
> will be operated directly from everywhere
> it needed to disable/enable numa in acpi
> mode which was a bad thing, so, try to
> export a fuction to get srat table
> enable/disable info.

The patch is wrong.
By the patch, acpi_numa is set to one of three values, either -1, false(0), 1.
By this, x86_acpi_numa_init() goes wrong.

How about using bool to acpi_numa?

Thanks,
Yasuaki Ishimatsu

> Reviewed-by: David Rientjes <rientjes@google.com>
> Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
> ---
>   arch/x86/include/asm/acpi.h |    2 +-
>   arch/x86/kernel/acpi/srat.c |   15 ++++++++++-----
>   arch/x86/mm/numa.c          |    2 +-
>   arch/x86/xen/enlighten.c    |    2 +-
>   4 files changed, 13 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
> index 0c44630..6b9c861 100644
> --- a/arch/x86/include/asm/acpi.h
> +++ b/arch/x86/include/asm/acpi.h
> @@ -181,7 +181,7 @@ static inline void disable_acpi(void) { }
>   #define ARCH_HAS_POWER_INIT	1
>   
>   #ifdef CONFIG_ACPI_NUMA
> -extern int acpi_numa;
> +extern void disable_acpi_numa(void);
>   extern int x86_acpi_numa_init(void);
>   #endif /* CONFIG_ACPI_NUMA */
>   
> diff --git a/arch/x86/kernel/acpi/srat.c b/arch/x86/kernel/acpi/srat.c
> index 4ddf497..0a4d7ee 100644
> --- a/arch/x86/kernel/acpi/srat.c
> +++ b/arch/x86/kernel/acpi/srat.c
> @@ -24,22 +24,27 @@
>   #include <asm/apic.h>
>   #include <asm/uv/uv.h>
>   
> -int acpi_numa __initdata;
> +static bool acpi_numa __initdata;
>   
>   static __init int setup_node(int pxm)
>   {
>   	return acpi_map_pxm_to_node(pxm);
>   }
>   
> -static __init void bad_srat(void)
> +void __init disable_acpi_numa(void)
> +{
> +	acpi_numa = false;
> +}
> +
> +static void __init bad_srat(void)
>   {
> -	printk(KERN_ERR "SRAT: SRAT not used.\n");
>   	acpi_numa = -1;
> +	printk(KERN_ERR "SRAT: SRAT will not be used.\n");
>   }
>   
> -static __init inline int srat_disabled(void)
> +static bool __init srat_disabled(void)
>   {
> -	return acpi_numa < 0;
> +	return acpi_numa;
>   }
>   
>   /* Callback for SLIT parsing */
> diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
> index 2d125be..870ca6b 100644
> --- a/arch/x86/mm/numa.c
> +++ b/arch/x86/mm/numa.c
> @@ -47,7 +47,7 @@ static __init int numa_setup(char *opt)
>   #endif
>   #ifdef CONFIG_ACPI_NUMA
>   	if (!strncmp(opt, "noacpi", 6))
> -		acpi_numa = -1;
> +		disable_acpi_numa();
>   #endif
>   	return 0;
>   }
> diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
> index 138e566..a5f6353 100644
> --- a/arch/x86/xen/enlighten.c
> +++ b/arch/x86/xen/enlighten.c
> @@ -1415,7 +1415,7 @@ asmlinkage void __init xen_start_kernel(void)
>   	 * any NUMA information the kernel tries to get from ACPI will
>   	 * be meaningless.  Prevent it from trying.
>   	 */
> -	acpi_numa = -1;
> +	disable_acpi_numa();
>   #endif
>   
>   	/* Don't do the full vcpu_info placement stuff until we have a
> 

Re: [PATCH v2 3/4] acpi: add clock_domain field to acpi_srat_cpu_affinity

[David Rientjes]

On Tue, 5 Feb 2013, liguang wrote:

> according to ACPI SPEC v5.0, page 152,
> 5.2.16.1 Processor Local APIC/SAPIC Affinity Structure,
> the last member of it is clock_domain.
> 
> Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>

Acked-by: David Rientjes <rientjes@google.com>

Re: [PATCH v2 3/4] acpi: add clock_domain field to acpi_srat_cpu_affinity

[Yasuaki Ishimatsu]

2013/02/05 11:37, liguang wrote:
> according to ACPI SPEC v5.0, page 152,
> 5.2.16.1 Processor Local APIC/SAPIC Affinity Structure,
> the last member of it is clock_domain.
> 
> Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
> ---

Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>

Thanks,
Yasuaki Ishimatsu

>   include/acpi/actbl1.h |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
> index 280fc45..98031a3 100644
> --- a/include/acpi/actbl1.h
> +++ b/include/acpi/actbl1.h
> @@ -922,7 +922,7 @@ struct acpi_srat_cpu_affinity {
>   	u32 flags;
>   	u8 local_sapic_eid;
>   	u8 proximity_domain_hi[3];
> -	u32 reserved;		/* Reserved, must be zero */
> +	u32 clock_domain;
>   };
>   
>   /* Flags */
> 

Re: [PATCH v2 1/4] acpi: move x86/mm/srat.c to x86/kernel/acpi/srat.c

[David Rientjes]

On Tue, 5 Feb 2013, liguang wrote:

> srat table should present only on acpi domain,
> seems mm/ is not the right place for it.
> 
> Reviewed-by: David Rientjes <rientjes@google.com>

I certainly didn't review this, please read 
Documentation/SubmittingPatches.

> Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>

Couple of issues with this:

 - it doesn't include your followup change "acpi: change Makefile for
   srat.c building" which is required for this to build, please fold it in 
   and repost,

 - there is whitespace damage, we use tabs for indentation in Makefiles,

 - you're basing your patches on Linus' tree when arch/x86/mm/srat has
   changed in linux-next (15 insertions(+), 14 deletions(-)), please 
   rebase this on the linux-next tree at git.kernel.org.

Otherwise, looks good.

Re: [PATCH v2 2/4] numa: avoid export acpi_numa variable

[David Rientjes]

On Tue, 5 Feb 2013, liguang wrote:

> acpi_numa is used to prevent srat table
> being parsed, seems a little miss-named,
> if 'noacpi' was specified by cmdline and
> CONFIG_ACPI_NUMA was enabled, acpi_numa
> will be operated directly from everywhere
> it needed to disable/enable numa in acpi
> mode which was a bad thing, so, try to
> export a fuction to get srat table
> enable/disable info.
> 
> Reviewed-by: David Rientjes <rientjes@google.com>

Again, this was never reviewed by me, please learn how to use these tags 
appropriately by reading Documentation/SubmittingPatches.

> Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
> ---
>  arch/x86/include/asm/acpi.h |    2 +-
>  arch/x86/kernel/acpi/srat.c |   15 ++++++++++-----
>  arch/x86/mm/numa.c          |    2 +-
>  arch/x86/xen/enlighten.c    |    2 +-
>  4 files changed, 13 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
> index 0c44630..6b9c861 100644
> --- a/arch/x86/include/asm/acpi.h
> +++ b/arch/x86/include/asm/acpi.h
> @@ -181,7 +181,7 @@ static inline void disable_acpi(void) { }
>  #define ARCH_HAS_POWER_INIT	1
>  
>  #ifdef CONFIG_ACPI_NUMA
> -extern int acpi_numa;
> +extern void disable_acpi_numa(void);
>  extern int x86_acpi_numa_init(void);
>  #endif /* CONFIG_ACPI_NUMA */
>  
> diff --git a/arch/x86/kernel/acpi/srat.c b/arch/x86/kernel/acpi/srat.c
> index 4ddf497..0a4d7ee 100644
> --- a/arch/x86/kernel/acpi/srat.c
> +++ b/arch/x86/kernel/acpi/srat.c
> @@ -24,22 +24,27 @@
>  #include <asm/apic.h>
>  #include <asm/uv/uv.h>
>  
> -int acpi_numa __initdata;
> +static bool acpi_numa __initdata;
>  
>  static __init int setup_node(int pxm)
>  {
>  	return acpi_map_pxm_to_node(pxm);
>  }
>  
> -static __init void bad_srat(void)
> +void __init disable_acpi_numa(void)
> +{
> +	acpi_numa = false;
> +}
> +
> +static void __init bad_srat(void)
>  {
> -	printk(KERN_ERR "SRAT: SRAT not used.\n");
>  	acpi_numa = -1;
> +	printk(KERN_ERR "SRAT: SRAT will not be used.\n");
>  }
>  
> -static __init inline int srat_disabled(void)
> +static bool __init srat_disabled(void)
>  {
> -	return acpi_numa < 0;
> +	return acpi_numa;
>  }
>  
>  /* Callback for SLIT parsing */
> diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
> index 2d125be..870ca6b 100644
> --- a/arch/x86/mm/numa.c
> +++ b/arch/x86/mm/numa.c
> @@ -47,7 +47,7 @@ static __init int numa_setup(char *opt)
>  #endif
>  #ifdef CONFIG_ACPI_NUMA
>  	if (!strncmp(opt, "noacpi", 6))
> -		acpi_numa = -1;
> +		disable_acpi_numa();
>  #endif
>  	return 0;
>  }
> diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
> index 138e566..a5f6353 100644
> --- a/arch/x86/xen/enlighten.c
> +++ b/arch/x86/xen/enlighten.c
> @@ -1415,7 +1415,7 @@ asmlinkage void __init xen_start_kernel(void)
>  	 * any NUMA information the kernel tries to get from ACPI will
>  	 * be meaningless.  Prevent it from trying.
>  	 */
> -	acpi_numa = -1;
> +	disable_acpi_numa();
>  #endif
>  
>  	/* Don't do the full vcpu_info placement stuff until we have a

You've declared disable_acpi_numa() but never defined it so this will 
fail at link time.  Please compile and test all of your changes with care 
before posting them or people will start to ignore your contributions.

Re: [PATCH v2 4/4] remove include asm/acpi.h in process_driver.c

[David Rientjes]

On Tue, 5 Feb 2013, liguang wrote:

> process_driver.c include linux/acpi.h which already
> include asm/acpi.h, so remove it.
> 
> Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>

Acked-by: David Rientjes <rientjes@google.com>

Re: [PATCH v2 4/4] remove include asm/acpi.h in process_driver.c

[Yasuaki Ishimatsu]

2013/02/05 11:37, liguang wrote:
> process_driver.c include linux/acpi.h which already
> include asm/acpi.h, so remove it.
> 
> Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
> ---

Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>

Thanks,
Yasuaki Ishimatsu

>   drivers/acpi/processor_driver.c |    1 -
>   1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
> index e83311b..752eedb 100644
> --- a/drivers/acpi/processor_driver.c
> +++ b/drivers/acpi/processor_driver.c
> @@ -52,7 +52,6 @@
>   #include <asm/uaccess.h>
>   #include <asm/processor.h>
>   #include <asm/smp.h>
> -#include <asm/acpi.h>
>   
>   #include <acpi/acpi_bus.h>
>   #include <acpi/acpi_drivers.h>
> 

Re: [PATCH v2 2/4] numa: avoid export acpi_numa variable

[li guang]

在 2013-02-04一的 21:39 -0800，David Rientjes写道：
> On Tue, 5 Feb 2013, liguang wrote:
> 
> > acpi_numa is used to prevent srat table
> > being parsed, seems a little miss-named,
> > if 'noacpi' was specified by cmdline and
> > CONFIG_ACPI_NUMA was enabled, acpi_numa
> > will be operated directly from everywhere
> > it needed to disable/enable numa in acpi
> > mode which was a bad thing, so, try to
> > export a fuction to get srat table
> > enable/disable info.
> > 
> > Reviewed-by: David Rientjes <rientjes@google.com>
> 
> Again, this was never reviewed by me, please learn how to use these tags 
> appropriately by reading Documentation/SubmittingPatches.

OK.

> 
> > Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
> > ---
> >  arch/x86/include/asm/acpi.h |    2 +-
> >  arch/x86/kernel/acpi/srat.c |   15 ++++++++++-----
> >  arch/x86/mm/numa.c          |    2 +-
> >  arch/x86/xen/enlighten.c    |    2 +-
> >  4 files changed, 13 insertions(+), 8 deletions(-)
> > 
> > diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
> > index 0c44630..6b9c861 100644
> > --- a/arch/x86/include/asm/acpi.h
> > +++ b/arch/x86/include/asm/acpi.h
> > @@ -181,7 +181,7 @@ static inline void disable_acpi(void) { }
> >  #define ARCH_HAS_POWER_INIT	1
> >  
> >  #ifdef CONFIG_ACPI_NUMA
> > -extern int acpi_numa;
> > +extern void disable_acpi_numa(void);
> >  extern int x86_acpi_numa_init(void);
> >  #endif /* CONFIG_ACPI_NUMA */
> >  
> > diff --git a/arch/x86/kernel/acpi/srat.c b/arch/x86/kernel/acpi/srat.c
> > index 4ddf497..0a4d7ee 100644
> > --- a/arch/x86/kernel/acpi/srat.c
> > +++ b/arch/x86/kernel/acpi/srat.c
> > @@ -24,22 +24,27 @@
> >  #include <asm/apic.h>
> >  #include <asm/uv/uv.h>
> >  
> > -int acpi_numa __initdata;
> > +static bool acpi_numa __initdata;
> >  
> >  static __init int setup_node(int pxm)
> >  {
> >  	return acpi_map_pxm_to_node(pxm);
> >  }
> >  
> > -static __init void bad_srat(void)
> > +void __init disable_acpi_numa(void)
> > +{
> > +	acpi_numa = false;
> > +}
> > +
> > +static void __init bad_srat(void)
> >  {
> > -	printk(KERN_ERR "SRAT: SRAT not used.\n");
> >  	acpi_numa = -1;
> > +	printk(KERN_ERR "SRAT: SRAT will not be used.\n");
> >  }
> >  
> > -static __init inline int srat_disabled(void)
> > +static bool __init srat_disabled(void)
> >  {
> > -	return acpi_numa < 0;
> > +	return acpi_numa;
> >  }
> >  
> >  /* Callback for SLIT parsing */
> > diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
> > index 2d125be..870ca6b 100644
> > --- a/arch/x86/mm/numa.c
> > +++ b/arch/x86/mm/numa.c
> > @@ -47,7 +47,7 @@ static __init int numa_setup(char *opt)
> >  #endif
> >  #ifdef CONFIG_ACPI_NUMA
> >  	if (!strncmp(opt, "noacpi", 6))
> > -		acpi_numa = -1;
> > +		disable_acpi_numa();
> >  #endif
> >  	return 0;
> >  }
> > diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
> > index 138e566..a5f6353 100644
> > --- a/arch/x86/xen/enlighten.c
> > +++ b/arch/x86/xen/enlighten.c
> > @@ -1415,7 +1415,7 @@ asmlinkage void __init xen_start_kernel(void)
> >  	 * any NUMA information the kernel tries to get from ACPI will
> >  	 * be meaningless.  Prevent it from trying.
> >  	 */
> > -	acpi_numa = -1;
> > +	disable_acpi_numa();
> >  #endif
> >  
> >  	/* Don't do the full vcpu_info placement stuff until we have a
> 
> You've declared disable_acpi_numa() but never defined it so this will 
> fail at link time.  Please compile and test all of your changes with care 
> before posting them or people will start to ignore your contributions.

It did pass build.

Re: [PATCH v2 1/4] acpi: move x86/mm/srat.c to x86/kernel/acpi/srat.c

[li guang]

在 2013-02-04一的 21:35 -0800，David Rientjes写道：
> On Tue, 5 Feb 2013, liguang wrote:
> 
> > srat table should present only on acpi domain,
> > seems mm/ is not the right place for it.
> > 
> > Reviewed-by: David Rientjes <rientjes@google.com>
> 
> I certainly didn't review this, please read 
> Documentation/SubmittingPatches.
> 
> > Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
> 
> Couple of issues with this:
> 
>  - it doesn't include your followup change "acpi: change Makefile for
>    srat.c building" which is required for this to build, please fold it in 
>    and repost,
> 
>  - there is whitespace damage, we use tabs for indentation in Makefiles,
> 
>  - you're basing your patches on Linus' tree when arch/x86/mm/srat has
>    changed in linux-next (15 insertions(+), 14 deletions(-)), please 
>    rebase this on the linux-next tree at git.kernel.org.
> 
> Otherwise, looks good.

OK, I'll rebase on linux-next.
Thanks!