Commit abafabd8 authored by Bharata B Rao's avatar Bharata B Rao Committed by Eduardo Habkost
Browse files

numa: Store boot memory address range in node_info 



Store memory address range information of boot memory  in address
range list of numa_info.

This helps to have a common NUMA node lookup by address function that
works for both boot-time memory and hotplugged memory.

Signed-off-by: default avatarBharata B Rao <bharata@linux.vnet.ibm.com>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Tested-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent fa9ea81d

numa.c

+27 −0
Original line number Diff line number Diff line
@@ -56,6 +56,14 @@ void numa_set_mem_node_id(ram_addr_t addr, uint64_t size, uint32_t node) 
{

    struct numa_addr_range *range = g_malloc0(sizeof(*range));



    /*

     * Memory-less nodes can come here with 0 size in which case,

     * there is nothing to do.

     */

    if (!size) {

        return;

    }



    range->mem_start = addr;

    range->mem_end = addr + size - 1;

    QLIST_INSERT_HEAD(&numa_info[node].addr, range, entry);
@@ -74,6 +82,21 @@ void numa_unset_mem_node_id(ram_addr_t addr, uint64_t size, uint32_t node) 
    }

}



static void numa_set_mem_ranges(void)

{

    int i;

    ram_addr_t mem_start = 0;



    /*

     * Deduce start address of each node and use it to store

     * the address range info in numa_info address range list

     */

    for (i = 0; i < nb_numa_nodes; i++) {

        numa_set_mem_node_id(mem_start, numa_info[i].node_mem, i);

        mem_start += numa_info[i].node_mem;

    }

}



static void numa_node_parse(NumaNodeOptions *node, QemuOpts *opts, Error **errp)

{

    uint16_t nodenr;
@@ -299,6 +322,8 @@ void parse_numa_opts(MachineClass *mc) 
            QLIST_INIT(&numa_info[i].addr);

        }



        numa_set_mem_ranges();



        for (i = 0; i < nb_numa_nodes; i++) {

            if (!bitmap_empty(numa_info[i].node_cpu, MAX_CPUMASK_BITS)) {

                break;
@@ -323,6 +348,8 @@ void parse_numa_opts(MachineClass *mc) 
        }



        validate_numa_cpus();

    } else {

        numa_set_mem_node_id(0, ram_size, 0);

    }

}