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

target/xtensa: hold BQL for interrupt processing

Browse Source 
Make sure we have the BQL held when processing interrupts.

Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
This commit is contained in:
Alex Bennée 2017-03-01 20:29:10 +00:00
parent 278f5e98c6
commit 47e2088797
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/xtensa/helper.c
View File

@ -217,6 +217,7 @@ static void handle_interrupt(CPUXtensaState *env)
} }
} }
/* Called from cpu_handle_interrupt with BQL held */
void xtensa_cpu_do_interrupt(CPUState *cs) void xtensa_cpu_do_interrupt(CPUState *cs)
{ {
XtensaCPU *cpu = XTENSA_CPU(cs); XtensaCPU *cpu = XTENSA_CPU(cs);

7
target/xtensa/op_helper.c
View File

@ -26,6 +26,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/main-loop.h"
#include "cpu.h" #include "cpu.h"
#include "exec/helper-proto.h" #include "exec/helper-proto.h"
#include "qemu/host-utils.h" #include "qemu/host-utils.h"
@ -381,7 +382,11 @@ void HELPER(waiti)(CPUXtensaState *env, uint32_t pc, uint32_t intlevel)
env->pc = pc; env->pc = pc;
env->sregs[PS] = (env->sregs[PS] & ~PS_INTLEVEL) | env->sregs[PS] = (env->sregs[PS] & ~PS_INTLEVEL) |
(intlevel << PS_INTLEVEL_SHIFT); (intlevel << PS_INTLEVEL_SHIFT);
qemu_mutex_lock_iothread();
check_interrupts(env); check_interrupts(env);
qemu_mutex_unlock_iothread();
if (env->pending_irq_level) { if (env->pending_irq_level) {
cpu_loop_exit(CPU(xtensa_env_get_cpu(env))); cpu_loop_exit(CPU(xtensa_env_get_cpu(env)));
return; return;
@ -426,7 +431,9 @@ void HELPER(update_ccompare)(CPUXtensaState *env, uint32_t i)
void HELPER(check_interrupts)(CPUXtensaState *env) void HELPER(check_interrupts)(CPUXtensaState *env)
{ {
qemu_mutex_lock_iothread();
check_interrupts(env); check_interrupts(env);
qemu_mutex_unlock_iothread();
} }
void HELPER(itlb_hit_test)(CPUXtensaState *env, uint32_t vaddr) void HELPER(itlb_hit_test)(CPUXtensaState *env, uint32_t vaddr)