[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH v2 2/6] exec: don't use cpu_index to detect if cpu_exe
From: |
Igor Mammedov |
Subject: |
[Qemu-ppc] [PATCH v2 2/6] exec: don't use cpu_index to detect if cpu_exec_init()'s been called for cpu |
Date: |
Mon, 25 Jul 2016 11:59:20 +0200 |
Instead use QTAIL's tqe_prev field to detect if cpu's been
placed in list by cpu_exec_init() which is always set if
QTAIL element is in list.
Fixes SIGSEGV on failure path in case cpu_index is assigned
by board and cpu.relalize() fails before cpu_exec_init() is called.
In follow up patches, cpu_index will be assigned by boards that
support cpu hot(un)plug and need stable cpu_index that doesn't
depend on order cpus are created/removed.
Signed-off-by: Igor Mammedov <address@hidden>
Reported-by: David Gibson <address@hidden>
---
v2:
replace setting tqe_prev to NULL in generic QTAIL_REMOVE
with a check and cleanup in cpu_exec_exit() to be on safe side.
And delay QTAIL_REMOVE() change to 2.8.
---
exec.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/exec.c b/exec.c
index 2f57c62..ae45a70 100644
--- a/exec.c
+++ b/exec.c
@@ -643,13 +643,14 @@ void cpu_exec_exit(CPUState *cpu)
CPUClass *cc = CPU_GET_CLASS(cpu);
cpu_list_lock();
- if (cpu->cpu_index == -1) {
- /* cpu_index was never allocated by this @cpu or was already freed. */
+ if (cpu->node.tqe_prev == NULL) {
+ /* there is nothing to undo since cpu_exec_init() hasn't been called */
cpu_list_unlock();
return;
}
QTAILQ_REMOVE(&cpus, cpu, node);
+ cpu->node.tqe_prev = NULL;
cpu_release_index(cpu);
cpu->cpu_index = -1;
cpu_list_unlock();
--
2.7.4
- [Qemu-ppc] [PATCH v2 0/6] Fix migration issues with arbitrary cpu-hot(un)plug, Igor Mammedov, 2016/07/25
- [Qemu-ppc] [PATCH v2 2/6] exec: don't use cpu_index to detect if cpu_exec_init()'s been called for cpu,
Igor Mammedov <=
- [Qemu-ppc] [PATCH v2 1/6] exec: reduce CONFIG_USER_ONLY ifdeffenery, Igor Mammedov, 2016/07/25
- [Qemu-ppc] [PATCH v2 3/6] exec: set cpu_index only if it's not been explictly set, Igor Mammedov, 2016/07/25
- [Qemu-ppc] [PATCH v2 4/6] qdev: fix object reference leak in case device.realize() fails, Igor Mammedov, 2016/07/25
- [Qemu-ppc] [PATCH v2 6/6] Revert "pc: Enforce adding CPUs contiguously and removing them in opposite order", Igor Mammedov, 2016/07/25
- [Qemu-ppc] [PATCH v2 5/6] pc: init CPUState->cpu_index with index in possible_cpus[], Igor Mammedov, 2016/07/25
- Re: [Qemu-ppc] [PATCH v2 0/6] Fix migration issues with arbitrary cpu-hot(un)plug, David Gibson, 2016/07/25
- Re: [Qemu-ppc] [PATCH v2 0/6] Fix migration issues with arbitrary cpu-hot(un)plug, David Gibson, 2016/07/26