Commit 176d2cda authored by Like Xu's avatar Like Xu Committed by Eduardo Habkost
Browse files

i386/cpu: Consolidate die-id validity in smp context 



The field die_id (default as 0) and has_die_id are introduced to X86CPU.
Following the legacy smp check rules, the die_id validity is added to
the same contexts as leagcy smp variables such as hmp_hotpluggable_cpus(),
machine_set_cpu_numa_node(), cpu_slot_to_string() and pc_cpu_pre_plug().

Acked-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: default avatarLike Xu <like.xu@linux.intel.com>
Message-Id: <20190612084104.34984-4-like.xu@linux.intel.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent cabea7dc

hw/core/machine-hmp-cmds.c

+3 −0
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict) 
        if (c->has_socket_id) {

            monitor_printf(mon, "    socket-id: \"%" PRIu64 "\"\n", c->socket_id);

        }

        if (c->has_die_id) {

            monitor_printf(mon, "    die-id: \"%" PRIu64 "\"\n", c->die_id);

        }

        if (c->has_core_id) {

            monitor_printf(mon, "    core-id: \"%" PRIu64 "\"\n", c->core_id);

        }

hw/core/machine.c

+12 −0
Original line number Diff line number Diff line
@@ -683,6 +683,11 @@ void machine_set_cpu_numa_node(MachineState *machine, 
            return;

        }



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

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

            return;

        }



        /* skip slots with explicit mismatch */

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

                continue;
@@ -692,6 +697,10 @@ void machine_set_cpu_numa_node(MachineState *machine, 
                continue;

        }



        if (props->has_die_id && props->die_id != slot->props.die_id) {

                continue;

        }



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

                continue;

        }
@@ -949,6 +958,9 @@ static char *cpu_slot_to_string(const CPUArchId *cpu) 
    if (cpu->props.has_socket_id) {

        g_string_append_printf(s, "socket-id: %"PRId64, cpu->props.socket_id);

    }

    if (cpu->props.has_die_id) {

        g_string_append_printf(s, "die-id: %"PRId64, cpu->props.die_id);

    }

    if (cpu->props.has_core_id) {

        if (s->len) {

            g_string_append_printf(s, ", ");

hw/i386/pc.c

+14 −0
Original line number Diff line number Diff line
@@ -2324,6 +2324,10 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, 
            error_setg(errp, "Invalid CPU socket-id: %u must be in range 0:%u",

                       cpu->socket_id, max_socket);

            return;

        } else if (cpu->die_id > pcms->smp_dies - 1) {

            error_setg(errp, "Invalid CPU die-id: %u must be in range 0:%u",

                       cpu->die_id, max_socket);

            return;

        }

        if (cpu->core_id < 0) {

            error_setg(errp, "CPU core-id is not set");
@@ -2343,6 +2347,7 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, 
        }



        topo.pkg_id = cpu->socket_id;

        topo.die_id = cpu->die_id;

        topo.core_id = cpu->core_id;

        topo.smt_id = cpu->thread_id;

        cpu->apic_id = apicid_from_topo_ids(smp_cores, smp_threads, &topo);
@@ -2380,6 +2385,13 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev, 
    }

    cpu->socket_id = topo.pkg_id;



    if (cpu->die_id != -1 && cpu->die_id != topo.die_id) {

        error_setg(errp, "property die-id: %u doesn't match set apic-id:"

            " 0x%x (die-id: %u)", cpu->die_id, cpu->apic_id, topo.die_id);

        return;

    }

    cpu->die_id = topo.die_id;



    if (cpu->core_id != -1 && cpu->core_id != topo.core_id) {

        error_setg(errp, "property core-id: %u doesn't match set apic-id:"

            " 0x%x (core-id: %u)", cpu->core_id, cpu->apic_id, topo.core_id);
@@ -2766,6 +2778,8 @@ static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms) 
                                 ms->smp.cores, ms->smp.threads, &topo);

        ms->possible_cpus->cpus[i].props.has_socket_id = true;

        ms->possible_cpus->cpus[i].props.socket_id = topo.pkg_id;

        ms->possible_cpus->cpus[i].props.has_die_id = true;

        ms->possible_cpus->cpus[i].props.die_id = topo.die_id;

        ms->possible_cpus->cpus[i].props.has_core_id = true;

        ms->possible_cpus->cpus[i].props.core_id = topo.core_id;

        ms->possible_cpus->cpus[i].props.has_thread_id = true;

include/hw/i386/topology.h

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ typedef uint32_t apic_id_t; 


typedef struct X86CPUTopoInfo {

    unsigned pkg_id;

    unsigned die_id;

    unsigned core_id;

    unsigned smt_id;

} X86CPUTopoInfo;
@@ -130,6 +131,7 @@ static inline void x86_topo_ids_from_apicid(apic_id_t apicid, 
    topo->core_id = (apicid >> apicid_core_offset(nr_cores, nr_threads)) &

                   ~(0xFFFFFFFFUL << apicid_core_width(nr_cores, nr_threads));

    topo->pkg_id = apicid >> apicid_pkg_offset(nr_cores, nr_threads);

    topo->die_id = 0;

}



/* Make APIC ID for the CPU 'cpu_index'

qapi/machine.json

+4 −3
Original line number Diff line number Diff line
@@ -588,10 +588,10 @@ 
#

# @node-id: NUMA node ID the CPU belongs to

# @socket-id: socket number within node/board the CPU belongs to

# @core-id: core number within socket the CPU belongs to

# @thread-id: thread number within core the CPU belongs to

# @die-id: die number within node/board the CPU belongs to (Since 4.1)

# @core-id: core number within die the CPU belongs to# @thread-id: thread number within core the CPU belongs to

#

# Note: currently there are 4 properties that could be present

# Note: currently there are 5 properties that could be present

# but management should be prepared to pass through other

# properties with device_add command to allow for future

# interface extension. This also requires the filed names to be kept in
@@ -602,6 +602,7 @@ 
{ 'struct': 'CpuInstanceProperties',

  'data': { '*node-id': 'int',

            '*socket-id': 'int',

            '*die-id': 'int',

            '*core-id': 'int',

            '*thread-id': 'int'

  }