mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390x: allow CPU hotplug in random core-id order

Browse Source 
SCLP correctly indicates the core-id aka. CPU address for each available
CPU.

As the core-id corresponds to cpu_index, also a newly created kvm vcpu
gets assigned this core-id as vcpu id. So SIGP in the kernel works
correctly (it uses the vcpu id to lookup the correct CPU).

So there should be nothing hindering us from hotplugging CPUs in random
core-id order.

This now makes sure that the output from "query-hotpluggable-cpus"
is completely true. Until now, a specific order is implicit. Performance
vice, hotplugging CPUs in non-sequential order might not be the best thing
to do, as VCPU lookup inside KVM might be a little slower. But that
doesn't hinder us from supporting it.

next_core_id is now used by linux user only.

Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170913132417.24384-23-david@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
David Hildenbrand 2017-09-13 15:24:17 +02:00 committed by Cornelia Huck
parent bb535bb67e
commit a1422723f7
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/s390x/cpu.c
View File

@ -199,6 +199,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
#else #else
/* implicitly set for linux-user only */ /* implicitly set for linux-user only */
cpu->env.core_id = scc->next_core_id; cpu->env.core_id = scc->next_core_id;
scc->next_core_id++;
#endif #endif
if (cpu_exists(cpu->env.core_id)) { if (cpu_exists(cpu->env.core_id)) {
@ -206,12 +207,6 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
", it already exists", cpu->env.core_id); ", it already exists", cpu->env.core_id);
goto out; goto out;
} }
if (cpu->env.core_id != scc->next_core_id) {
error_setg(&err, "Unable to add CPU with core-id: %" PRIu32
", the next available core-id is %" PRIu32, cpu->env.core_id,
scc->next_core_id);
goto out;
}
/* sync cs->cpu_index and env->core_id. The latter is needed for TCG. */ /* sync cs->cpu_index and env->core_id. The latter is needed for TCG. */
cs->cpu_index = env->core_id; cs->cpu_index = env->core_id;
@ -219,7 +214,6 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
if (err != NULL) { if (err != NULL) {
goto out; goto out;
} }
scc->next_core_id++;
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
qemu_register_reset(s390_cpu_machine_reset_cb, cpu); qemu_register_reset(s390_cpu_machine_reset_cb, cpu);