Commit 7cca3e46 authored by Sam Bobroff's avatar Sam Bobroff Committed by David Gibson
Browse files

ppc: spapr: Move VCPU ID calculation into sPAPR 



Move the calculation of a CPU's VCPU ID out of the generic PPC code
(ppc_cpu_realizefn()) and into sPAPR specific code
(spapr_cpu_core_realize()) where it belongs.

Unfortunately, due to the way things are ordered, we still need to
default the VCPU ID in ppc_cpu_realizfn() but at least doing that
doesn't require any interaction with sPAPR.

Signed-off-by: default avatarSam Bobroff <sam.bobroff@au1.ibm.com>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent aef77960

hw/ppc/spapr_cpu_core.c

+11 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ error: 


static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)

{

    sPAPRMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());

    sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));

    sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev));

    CPUCore *cc = CPU_CORE(OBJECT(dev));
@@ -239,6 +240,16 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp) 
        cs = CPU(obj);

        cpu = POWERPC_CPU(cs);

        cs->cpu_index = cc->core_id + i;

        cpu->vcpu_id = (cc->core_id * spapr->vsmt / smp_threads) + i;

        if (kvm_enabled() && !kvm_vcpu_id_is_valid(cpu->vcpu_id)) {

            error_setg(&local_err, "Can't create CPU with id %d in KVM",

                       cpu->vcpu_id);

            error_append_hint(&local_err, "Adjust the number of cpus to %d "

                              "or try to raise the number of threads per core\n",

                              cpu->vcpu_id * smp_threads / spapr->vsmt);

            goto err;

        }





        /* Set NUMA node for the threads belonged to core  */

        cpu->node_id = sc->node_id;

target/ppc/translate_init.c

+3 −15
Original line number Diff line number Diff line
@@ -9904,28 +9904,15 @@ static void ppc_cpu_realizefn(DeviceState *dev, Error **errp) 
    PowerPCCPU *cpu = POWERPC_CPU(dev);

    PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);

    Error *local_err = NULL;

#if !defined(CONFIG_USER_ONLY)

    int max_smt = kvmppc_smt_threads();

#endif



    cpu_exec_realizefn(cs, &local_err);

    if (local_err != NULL) {

        error_propagate(errp, local_err);

        return;

    }



#if !defined(CONFIG_USER_ONLY)

    cpu->vcpu_id = (cs->cpu_index / smp_threads) * max_smt

        + (cs->cpu_index % smp_threads);



    if (kvm_enabled() && !kvm_vcpu_id_is_valid(cpu->vcpu_id)) {

        error_setg(errp, "Can't create CPU with id %d in KVM", cpu->vcpu_id);

        error_append_hint(errp, "Adjust the number of cpus to %d "

                          "or try to raise the number of threads per core\n",

                          cpu->vcpu_id * smp_threads / max_smt);

        goto unrealize;

    if (cpu->vcpu_id == UNASSIGNED_CPU_INDEX) {

        cpu->vcpu_id = cs->cpu_index;

    }

#endif



    if (tcg_enabled()) {

        if (ppc_fixup_cpu(cpu) != 0) {
@@ -10576,6 +10563,7 @@ static void ppc_cpu_initfn(Object *obj) 
    CPUPPCState *env = &cpu->env;



    cs->env_ptr = env;

    cpu->vcpu_id = UNASSIGNED_CPU_INDEX;



    env->msr_mask = pcc->msr_mask;

    env->mmu_model = pcc->mmu_model;