ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Sam Bobroff <sam.bobroff@au1.ibm.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Sam Bobroff 2017-08-31 16:38:46 +10:00 committed by David Gibson
parent aef7796057
commit 7cca3e466e
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/ppc/spapr_cpu_core.c
View File

@ -213,6 +213,7 @@ error:
static void spapr_cpu_core_realize(DeviceState *dev, Error **errp) static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
{ {
sPAPRMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());
sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev)); sPAPRCPUCore *sc = SPAPR_CPU_CORE(OBJECT(dev));
sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev)); sPAPRCPUCoreClass *scc = SPAPR_CPU_CORE_GET_CLASS(OBJECT(dev));
CPUCore *cc = CPU_CORE(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); cs = CPU(obj);
cpu = POWERPC_CPU(cs); cpu = POWERPC_CPU(cs);
cs->cpu_index = cc->core_id + i; 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 */ /* Set NUMA node for the threads belonged to core */
cpu->node_id = sc->node_id; cpu->node_id = sc->node_id;

18
target/ppc/translate_init.c
View File

@ -9904,28 +9904,15 @@ static void ppc_cpu_realizefn(DeviceState *dev, Error **errp)
PowerPCCPU *cpu = POWERPC_CPU(dev); PowerPCCPU *cpu = POWERPC_CPU(dev);
PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu); PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
Error *local_err = NULL; Error *local_err = NULL;
#if !defined(CONFIG_USER_ONLY)
int max_smt = kvmppc_smt_threads();
#endif
cpu_exec_realizefn(cs, &local_err); cpu_exec_realizefn(cs, &local_err);
if (local_err != NULL) { if (local_err != NULL) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
return; return;
} }
if (cpu->vcpu_id == UNASSIGNED_CPU_INDEX) {
#if !defined(CONFIG_USER_ONLY) cpu->vcpu_id = cs->cpu_index;
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;
} }
#endif
if (tcg_enabled()) { if (tcg_enabled()) {
if (ppc_fixup_cpu(cpu) != 0) { if (ppc_fixup_cpu(cpu) != 0) {
@ -10576,6 +10563,7 @@ static void ppc_cpu_initfn(Object *obj)
CPUPPCState *env = &cpu->env; CPUPPCState *env = &cpu->env;
cs->env_ptr = env; cs->env_ptr = env;
cpu->vcpu_id = UNASSIGNED_CPU_INDEX;
env->msr_mask = pcc->msr_mask; env->msr_mask = pcc->msr_mask;
env->mmu_model = pcc->mmu_model; env->mmu_model = pcc->mmu_model;