[v7,21/27] target-arm: helpers which may affect global state need the BQL

Message ID 20170119170507.16185-22-alex.bennee@linaro.org
State New
Headers show
Series
  • Remaining MTTCG Base patches and ARM enablement
Related show

Commit Message

Alex Bennée Jan. 19, 2017, 5:05 p.m.
As the arm_call_el_change_hook may affect global state (for example with
updating the global GIC state) we need to assert/take the BQL.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Richard Henderson <rth@twiddle.net>

---
 target/arm/helper.c    | 6 ++++++
 target/arm/op_helper.c | 4 ++++
 2 files changed, 10 insertions(+)

-- 
2.11.0

Patch hide | download patch | download mbox

diff --git a/target/arm/helper.c b/target/arm/helper.c
index b3875c7c6e..87809562b9 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -6672,6 +6672,12 @@  void arm_cpu_do_interrupt(CPUState *cs)
         arm_cpu_do_interrupt_aarch32(cs);
     }
 
+    /* Hooks may change global state so BQL should be held, also the
+     * BQL needs to be held for any modification of
+     * cs->interrupt_request.
+     */
+    g_assert(qemu_mutex_iothread_locked());
+
     arm_call_el_change_hook(cpu);
 
     if (!kvm_enabled()) {
diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c
index 1348789760..e1a883c595 100644
--- a/target/arm/op_helper.c
+++ b/target/arm/op_helper.c
@@ -488,7 +488,9 @@  void HELPER(cpsr_write_eret)(CPUARMState *env, uint32_t val)
      */
     env->regs[15] &= (env->thumb ? ~1 : ~3);
 
+    qemu_mutex_lock_iothread();
     arm_call_el_change_hook(arm_env_get_cpu(env));
+    qemu_mutex_unlock_iothread();
 }
 
 /* Access to user mode registers from privileged modes.  */
@@ -1020,7 +1022,9 @@  void HELPER(exception_return)(CPUARMState *env)
                       cur_el, new_el, env->pc);
     }
 
+    qemu_mutex_lock_iothread();
     arm_call_el_change_hook(arm_env_get_cpu(env));
+    qemu_mutex_unlock_iothread();
 
     return;