| Message ID | 1469611494-163855-1-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Jul 27, 2016 at 11:24:54AM +0200, Igor Mammedov wrote: > Make sure that cpu_index auto allocation isn't used in > combination with manual cpu_index assignment. And > dissallow out of order cpu removal if auto allocation > is in use. > > Target that wishes to support out of order unplug should > switch to manual cpu_index assignment. Following patch > could be used as an example: > (pc: init CPUState->cpu_index with index in possible_cpus[])) > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > exec.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/exec.c b/exec.c > index 8e8416b..e0d8f18 100644 > --- a/exec.c > +++ b/exec.c > @@ -598,11 +598,14 @@ AddressSpace *cpu_get_address_space(CPUState *cpu, int asidx) > } > #endif > > +static bool cpu_index_auto_assigned; > + > static int cpu_get_free_index(void) > { > CPUState *some_cpu; > int cpu_index = 0; > > + cpu_index_auto_assigned = true; > CPU_FOREACH(some_cpu) { > cpu_index++; > } > @@ -620,6 +623,8 @@ void cpu_exec_exit(CPUState *cpu) > return; > } > > + assert(!(cpu_index_auto_assigned && cpu != QTAILQ_LAST(&cpus, CPUTailQ))); > + > QTAILQ_REMOVE(&cpus, cpu, node); > cpu->cpu_index = UNASSIGNED_CPU_INDEX; > cpu_list_unlock(); > @@ -662,6 +667,8 @@ void cpu_exec_init(CPUState *cpu, Error **errp) > if (cpu->cpu_index == UNASSIGNED_CPU_INDEX) { > cpu->cpu_index = cpu_get_free_index(); > assert(cpu->cpu_index != UNASSIGNED_CPU_INDEX); > + } else { > + assert(!cpu_index_auto_assigned); > } > QTAILQ_INSERT_TAIL(&cpus, cpu, node); > cpu_list_unlock();
On Wed, Jul 27, 2016 at 11:24:54AM +0200, Igor Mammedov wrote: > Make sure that cpu_index auto allocation isn't used in > combination with manual cpu_index assignment. And > dissallow out of order cpu removal if auto allocation > is in use. > > Target that wishes to support out of order unplug should > switch to manual cpu_index assignment. Following patch > could be used as an example: > (pc: init CPUState->cpu_index with index in possible_cpus[])) > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Sorry for the delay, applied to x86-next. Thanks!
diff --git a/exec.c b/exec.c index 8e8416b..e0d8f18 100644 --- a/exec.c +++ b/exec.c @@ -598,11 +598,14 @@ AddressSpace *cpu_get_address_space(CPUState *cpu, int asidx) } #endif +static bool cpu_index_auto_assigned; + static int cpu_get_free_index(void) { CPUState *some_cpu; int cpu_index = 0; + cpu_index_auto_assigned = true; CPU_FOREACH(some_cpu) { cpu_index++; } @@ -620,6 +623,8 @@ void cpu_exec_exit(CPUState *cpu) return; } + assert(!(cpu_index_auto_assigned && cpu != QTAILQ_LAST(&cpus, CPUTailQ))); + QTAILQ_REMOVE(&cpus, cpu, node); cpu->cpu_index = UNASSIGNED_CPU_INDEX; cpu_list_unlock(); @@ -662,6 +667,8 @@ void cpu_exec_init(CPUState *cpu, Error **errp) if (cpu->cpu_index == UNASSIGNED_CPU_INDEX) { cpu->cpu_index = cpu_get_free_index(); assert(cpu->cpu_index != UNASSIGNED_CPU_INDEX); + } else { + assert(!cpu_index_auto_assigned); } QTAILQ_INSERT_TAIL(&cpus, cpu, node); cpu_list_unlock();
Make sure that cpu_index auto allocation isn't used in combination with manual cpu_index assignment. And dissallow out of order cpu removal if auto allocation is in use. Target that wishes to support out of order unplug should switch to manual cpu_index assignment. Following patch could be used as an example: (pc: init CPUState->cpu_index with index in possible_cpus[])) Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- exec.c | 7 +++++++ 1 file changed, 7 insertions(+)