Commit 7c88e65d authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

numa: mirror cpu to node mapping in MachineState::possible_cpus 



Introduce machine_set_cpu_numa_node() helper that stores
node mapping for CPU in MachineState::possible_cpus.
CPU and node it belongs to is specified by 'props' argument.

Patch doesn't remove old way of storing mapping in
numa_info[X].node_cpu as removing it at the same time
makes patch rather big. Instead it just mirrors mapping
in possible_cpus and follow up per target patches will
switch to possible_cpus and numa_info[X].node_cpu will
be removed once there isn't any users left.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Message-Id: <1494415802-227633-7-git-send-email-imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 64c2a8f6

hw/core/machine.c

+96 −0
Original line number Diff line number Diff line
@@ -389,6 +389,102 @@ HotpluggableCPUList *machine_query_hotpluggable_cpus(MachineState *machine) 
    return head;

}



/**

 * machine_set_cpu_numa_node:

 * @machine: machine object to modify

 * @props: specifies which cpu objects to assign to

 *         numa node specified by @props.node_id

 * @errp: if an error occurs, a pointer to an area to store the error

 *

 * Associate NUMA node specified by @props.node_id with cpu slots that

 * match socket/core/thread-ids specified by @props. It's recommended to use

 * query-hotpluggable-cpus.props values to specify affected cpu slots,

 * which would lead to exact 1:1 mapping of cpu slots to NUMA node.

 *

 * However for CLI convenience it's possible to pass in subset of properties,

 * which would affect all cpu slots that match it.

 * Ex for pc machine:

 *    -smp 4,cores=2,sockets=2 -numa node,nodeid=0 -numa node,nodeid=1 \

 *    -numa cpu,node-id=0,socket_id=0 \

 *    -numa cpu,node-id=1,socket_id=1

 * will assign all child cores of socket 0 to node 0 and

 * of socket 1 to node 1.

 *

 * On attempt of reassigning (already assigned) cpu slot to another NUMA node,

 * return error.

 * Empty subset is disallowed and function will return with error in this case.

 */

void machine_set_cpu_numa_node(MachineState *machine,

                               const CpuInstanceProperties *props, Error **errp)

{

    MachineClass *mc = MACHINE_GET_CLASS(machine);

    bool match = false;

    int i;



    if (!mc->possible_cpu_arch_ids) {

        error_setg(errp, "mapping of CPUs to NUMA node is not supported");

        return;

    }



    /* disabling node mapping is not supported, forbid it */

    assert(props->has_node_id);



    /* force board to initialize possible_cpus if it hasn't been done yet */

    mc->possible_cpu_arch_ids(machine);



    for (i = 0; i < machine->possible_cpus->len; i++) {

        CPUArchId *slot = &machine->possible_cpus->cpus[i];



        /* reject unsupported by board properties */

        if (props->has_thread_id && !slot->props.has_thread_id) {

            error_setg(errp, "thread-id is not supported");

            return;

        }



        if (props->has_core_id && !slot->props.has_core_id) {

            error_setg(errp, "core-id is not supported");

            return;

        }



        if (props->has_socket_id && !slot->props.has_socket_id) {

            error_setg(errp, "socket-id is not supported");

            return;

        }



        /* skip slots with explicit mismatch */

        if (props->has_thread_id && props->thread_id != slot->props.thread_id) {

                continue;

        }



        if (props->has_core_id && props->core_id != slot->props.core_id) {

                continue;

        }



        if (props->has_socket_id && props->socket_id != slot->props.socket_id) {

                continue;

        }



        /* reject assignment if slot is already assigned, for compatibility

         * of legacy cpu_index mapping with SPAPR core based mapping do not

         * error out if cpu thread and matched core have the same node-id */

        if (slot->props.has_node_id &&

            slot->props.node_id != props->node_id) {

            error_setg(errp, "CPU is already assigned to node-id: %" PRId64,

                       slot->props.node_id);

            return;

        }



        /* assign slot to node as it's matched '-numa cpu' key */

        match = true;

        slot->props.node_id = props->node_id;

        slot->props.has_node_id = props->has_node_id;

    }



    if (!match) {

        error_setg(errp, "no match found");

    }

}



static void machine_class_init(ObjectClass *oc, void *data)

{

    MachineClass *mc = MACHINE_CLASS(oc);

include/hw/boards.h

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ bool machine_dump_guest_core(MachineState *machine); 
bool machine_mem_merge(MachineState *machine);

void machine_register_compat_props(MachineState *machine);

HotpluggableCPUList *machine_query_hotpluggable_cpus(MachineState *machine);

void machine_set_cpu_numa_node(MachineState *machine,

                               const CpuInstanceProperties *props,

                               Error **errp);



/**

 * CPUArchId:

numa.c

+8 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, 
        exit(1);

    }

    for (cpus = node->cpus; cpus; cpus = cpus->next) {

        CpuInstanceProperties props;

        if (cpus->value >= max_cpus) {

            error_setg(errp,

                       "CPU index (%" PRIu16 ")"
@@ -178,6 +179,10 @@ static void parse_numa_node(MachineState *ms, NumaNodeOptions *node, 
            return;

        }

        bitmap_set(numa_info[nodenr].node_cpu, cpus->value, 1);

        props = mc->cpu_index_to_instance_props(ms, cpus->value);

        props.node_id = nodenr;

        props.has_node_id = true;

        machine_set_cpu_numa_node(ms, &props, &error_fatal);

    }



    if (node->has_mem && node->has_memdev) {
@@ -528,9 +533,12 @@ void parse_numa_opts(MachineState *ms) 
        if (i == nb_numa_nodes) {

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

                CpuInstanceProperties props;

                /* fetch default mapping from board and enable it */

                props = mc->cpu_index_to_instance_props(ms, i);

                props.has_node_id = true;



                set_bit(i, numa_info[props.node_id].node_cpu);

                machine_set_cpu_numa_node(ms, &props, &error_fatal);

            }

        }