diff options
| author | Aníbal Limón <anibal.limon@linux.intel.com> | 2015-09-03 15:03:30 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-04 16:20:59 +0100 |
| commit | e4bbd98bf9648bbf3ffa7c4338f2302a92a413ef (patch) | |
| tree | 374cd6eed5d8a9b6c3198bb9102c605f1b6dce9d /meta/recipes-devtools | |
| parent | 6f84dcb6bca34551f384aa9c5d1c5a5677f5404c (diff) | |
| download | openembedded-core-e4bbd98bf9648bbf3ffa7c4338f2302a92a413ef.tar.gz openembedded-core-e4bbd98bf9648bbf3ffa7c4338f2302a92a413ef.tar.bz2 openembedded-core-e4bbd98bf9648bbf3ffa7c4338f2302a92a413ef.zip | |
qemu: Fix qemu_cpu_kick_thread on init
When QEMU starts the RCU thread executes qemu_mutex_lock_thread
causing error "qemu:qemu_cpu_kick_thread: No such process" and exits.
For detail explanation see upstream patch.
[YOCTO #8143]
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu/cpus.c-qemu_mutex_lock_iothread-fix-race-condition-a.patch | 45 |
2 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index dc7b628d6d..738bf2b22e 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -21,6 +21,7 @@ SRC_URI = "\ file://wacom.patch \ file://add-ptest-in-makefile.patch \ file://run-ptest \ + file://cpus.c-qemu_mutex_lock_iothread-fix-race-condition-a.patch \ " SRC_URI_append_class-native = "\ diff --git a/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_mutex_lock_iothread-fix-race-condition-a.patch b/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_mutex_lock_iothread-fix-race-condition-a.patch new file mode 100644 index 0000000000..45dffabc34 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/cpus.c-qemu_mutex_lock_iothread-fix-race-condition-a.patch @@ -0,0 +1,45 @@ +Upstream-Status: Submitted + +From f354b9333408d411854af058cc44cceda60b4473 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> +Date: Thu, 3 Sep 2015 14:07:34 -0500 +Subject: [PATCH] cpus.c: qemu_mutex_lock_iothread fix race condition at cpu + thread init +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When QEMU starts the RCU thread executes qemu_mutex_lock_thread +causing error "qemu:qemu_cpu_kick_thread: No such process" and exits. + +This isn't occur frequently but in glibc the thread id can exist and +this not guarantee that the thread is on active/running state. If is +inserted a sleep(1) after newthread assignment [1] the issue appears. + +So not make assumption that thread exist if first_cpu->thread is set +then change the validation of cpu to created that is set into cpu +threads (kvm, tcg, dummy). + +[1] https://sourceware.org/git/?p=glibc.git;a=blob;f=nptl/pthread_create.c;h=d10f4ea8004e1d8f3a268b95cc0f8d93b8d89867;hb=HEAD#l621 + +Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> +--- + cpus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cpus.c b/cpus.c +index 7e4786e..05e5400 100644 +--- a/cpus.c ++++ b/cpus.c +@@ -1171,7 +1171,7 @@ void qemu_mutex_lock_iothread(void) + * TCG code execution. + */ + if (!tcg_enabled() || qemu_in_vcpu_thread() || +- !first_cpu || !first_cpu->thread) { ++ !first_cpu || !first_cpu->created) { + qemu_mutex_lock(&qemu_global_mutex); + atomic_dec(&iothread_requesting_mutex); + } else { +-- +1.9.1 + |