x86/NUMA: fix setup_node()

The function referenced an __initdata object (nodes_found). Since this
being a node mask was more complicated than needed, the variable gets
replaced by a simple counter. Check at once that the count of nodes
doesn't go beyond MAX_NUMNODES.

Also consolidate four printk()s related to the function's use into just
one.

Finally (quite the opposite of the above issue) __init-annotate
nodes_cover_memory().

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c
index 92c89a5c29b95717463fdbbe867804555b63ca9f..d6ce420d4dab7f63fa85ae1fdc203124560872e4 100644 (file)
--- a/xen/arch/x86/srat.c
+++ b/xen/arch/x86/srat.c
@@ -25,7 +25,6 @@ static struct acpi_table_slit *__read_mostly acpi_slit;
 
 static nodemask_t memory_nodes_parsed __initdata;
 static nodemask_t processor_nodes_parsed __initdata;
-static nodemask_t nodes_found __initdata;
 static struct node nodes[MAX_NUMNODES] __initdata;
 
 struct pxm2node {
@@ -61,11 +60,12 @@ nodeid_t pxm_to_node(unsigned pxm)
        return NUMA_NO_NODE;
 }
 
-__devinit nodeid_t setup_node(unsigned pxm)
+nodeid_t setup_node(unsigned pxm)
 {
        nodeid_t node;
        unsigned idx;
        static bool_t warned;
+       static unsigned nodes_found;
 
        BUILD_BUG_ON(MAX_NUMNODES >= NUMA_NO_NODE);
 
@@ -85,15 +85,17 @@ __devinit nodeid_t setup_node(unsigned pxm)
                        goto finish;
 
        if (!warned) {
-               printk(XENLOG_WARNING "More PXMs than available nodes\n");
+               printk(KERN_WARNING "SRAT: Too many proximity domains (%#x)\n",
+                      pxm);
                warned = 1;
        }
 
        return NUMA_NO_NODE;
 
  finish:
-       node = first_unset_node(nodes_found);
-       node_set(node, nodes_found);
+       node = nodes_found++;
+       if (node >= MAX_NUMNODES)
+               return NUMA_NO_NODE;
        pxm2node[idx].pxm = pxm;
        pxm2node[idx].node = node;
 
@@ -219,7 +221,6 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
        pxm = pa->proximity_domain;
        node = setup_node(pxm);
        if (node == NUMA_NO_NODE) {
-               printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
                bad_srat();
                return;
        }
@@ -254,7 +255,6 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
        }
        node = setup_node(pxm);
        if (node == NUMA_NO_NODE) {
-               printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
                bad_srat();
                return;
        }
@@ -299,7 +299,6 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
                pxm &= 0xff;
        node = setup_node(pxm);
        if (node == NUMA_NO_NODE) {
-               printk(KERN_ERR "SRAT: Too many proximity domains.\n");
                bad_srat();
                return;
        }
@@ -341,7 +340,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
 
 /* Sanity check to catch more bad SRATs (they are amazingly common).
    Make sure the PXMs cover all memory. */
-static int nodes_cover_memory(void)
+static int __init nodes_cover_memory(void)
 {
        int i;