* [PATCH 0/6] Make Big QEMU Lock naming consistent
@ 2023-11-29 21:26 Stefan Hajnoczi
2023-11-29 21:26 ` [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() Stefan Hajnoczi
` (5 more replies)
0 siblings, 6 replies; 34+ messages in thread
From: Stefan Hajnoczi @ 2023-11-29 21:26 UTC (permalink / raw)
To: qemu-devel
Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao,
Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti,
David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf,
Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland,
Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman,
Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang,
Gerd Hoffmann, Hanna Reitz, Marc-André Lureau,
BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva,
Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen,
Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei,
Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand,
Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt,
Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv,
Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth,
David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng,
Stefano Stabellini, kvm, Stefan Hajnoczi, qemu-block, Halil Pasic,
Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée,
Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy,
Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé,
Christian Borntraeger, Akihiko Odaki, Leonardo Bras,
Nicholas Piggin, Jiaxun Yang
The Big QEMU Lock ("BQL") has two other names: "iothread lock" and "QEMU global
mutex". The term "iothread lock" is easily confused with the unrelated --object
iothread (iothread.c).
This series updates the code and documentation to consistently use "BQL". This
makes the code easier to understand.
Stefan Hajnoczi (6):
system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock()
qemu/main-loop: rename QEMU_IOTHREAD_LOCK_GUARD to QEMU_BQL_LOCK_GUARD
qemu/main-loop: rename qemu_cond_wait_iothread() to
qemu_cond_wait_bql()
system/cpus: rename qemu_global_mutex to qemu_bql
Replace "iothread lock" with "BQL" in comments
Rename "QEMU global mutex" to "BQL" in comments and docs
docs/devel/multi-thread-tcg.rst | 7 +-
docs/devel/qapi-code-gen.rst | 2 +-
docs/devel/replay.rst | 2 +-
docs/devel/reset.rst | 2 +-
docs/devel/multiple-iothreads.txt | 16 ++--
hw/display/qxl.h | 2 +-
include/block/aio-wait.h | 2 +-
include/block/blockjob.h | 6 +-
include/exec/cpu-common.h | 2 +-
include/exec/memory.h | 4 +-
include/exec/ramblock.h | 2 +-
include/io/task.h | 2 +-
include/migration/register.h | 8 +-
include/qemu/coroutine-core.h | 2 +-
include/qemu/coroutine.h | 2 +-
include/qemu/main-loop.h | 54 ++++++------
target/arm/internals.h | 4 +-
accel/accel-blocker.c | 10 +--
accel/dummy-cpus.c | 8 +-
accel/hvf/hvf-accel-ops.c | 4 +-
accel/kvm/kvm-accel-ops.c | 4 +-
accel/kvm/kvm-all.c | 22 ++---
accel/tcg/cpu-exec.c | 26 +++---
accel/tcg/cputlb.c | 20 ++---
accel/tcg/tcg-accel-ops-icount.c | 6 +-
accel/tcg/tcg-accel-ops-mttcg.c | 12 +--
accel/tcg/tcg-accel-ops-rr.c | 18 ++--
accel/tcg/tcg-accel-ops.c | 2 +-
accel/tcg/translate-all.c | 2 +-
cpu-common.c | 4 +-
dump/dump.c | 4 +-
hw/block/dataplane/virtio-blk.c | 8 +-
hw/block/virtio-blk.c | 2 +-
hw/core/cpu-common.c | 6 +-
hw/display/virtio-gpu.c | 2 +-
hw/i386/intel_iommu.c | 6 +-
hw/i386/kvm/xen_evtchn.c | 30 +++----
hw/i386/kvm/xen_gnttab.c | 2 +-
hw/i386/kvm/xen_overlay.c | 2 +-
hw/i386/kvm/xen_xenstore.c | 2 +-
hw/intc/arm_gicv3_cpuif.c | 2 +-
hw/intc/s390_flic.c | 18 ++--
hw/mips/mips_int.c | 2 +-
hw/misc/edu.c | 4 +-
hw/misc/imx6_src.c | 2 +-
hw/misc/imx7_src.c | 2 +-
hw/net/xen_nic.c | 8 +-
hw/ppc/pegasos2.c | 2 +-
hw/ppc/ppc.c | 6 +-
hw/ppc/spapr.c | 2 +-
hw/ppc/spapr_events.c | 2 +-
hw/ppc/spapr_rng.c | 4 +-
hw/ppc/spapr_softmmu.c | 4 +-
hw/remote/mpqemu-link.c | 14 ++--
hw/remote/vfio-user-obj.c | 2 +-
hw/s390x/s390-skeys.c | 2 +-
hw/scsi/virtio-scsi-dataplane.c | 6 +-
migration/block-dirty-bitmap.c | 14 ++--
migration/block.c | 40 ++++-----
migration/colo.c | 62 +++++++-------
migration/dirtyrate.c | 12 +--
migration/migration.c | 54 ++++++------
migration/ram.c | 16 ++--
net/tap.c | 2 +-
replay/replay-internal.c | 2 +-
semihosting/console.c | 8 +-
stubs/iothread-lock.c | 6 +-
system/cpu-throttle.c | 6 +-
system/cpus.c | 52 ++++++------
system/dirtylimit.c | 4 +-
system/memory.c | 2 +-
system/physmem.c | 14 ++--
system/runstate.c | 2 +-
system/watchpoint.c | 4 +-
target/arm/arm-powerctl.c | 14 ++--
target/arm/helper.c | 6 +-
target/arm/hvf/hvf.c | 8 +-
target/arm/kvm.c | 4 +-
target/arm/kvm64.c | 4 +-
target/arm/ptw.c | 6 +-
target/arm/tcg/helper-a64.c | 8 +-
target/arm/tcg/m_helper.c | 6 +-
target/arm/tcg/op_helper.c | 24 +++---
target/arm/tcg/psci.c | 2 +-
target/hppa/int_helper.c | 8 +-
target/i386/hvf/hvf.c | 6 +-
target/i386/kvm/hyperv.c | 4 +-
target/i386/kvm/kvm.c | 28 +++----
target/i386/kvm/xen-emu.c | 16 ++--
target/i386/nvmm/nvmm-accel-ops.c | 6 +-
target/i386/nvmm/nvmm-all.c | 20 ++---
target/i386/tcg/sysemu/fpu_helper.c | 6 +-
target/i386/tcg/sysemu/misc_helper.c | 4 +-
target/i386/whpx/whpx-accel-ops.c | 6 +-
target/i386/whpx/whpx-all.c | 24 +++---
target/loongarch/csr_helper.c | 4 +-
target/mips/kvm.c | 4 +-
target/mips/tcg/sysemu/cp0_helper.c | 4 +-
target/openrisc/sys_helper.c | 16 ++--
target/ppc/excp_helper.c | 14 ++--
target/ppc/helper_regs.c | 2 +-
target/ppc/kvm.c | 4 +-
target/ppc/misc_helper.c | 8 +-
target/ppc/timebase_helper.c | 8 +-
target/riscv/cpu_helper.c | 4 +-
target/s390x/kvm/kvm.c | 4 +-
target/s390x/tcg/misc_helper.c | 118 +++++++++++++--------------
target/sparc/int32_helper.c | 2 +-
target/sparc/int64_helper.c | 6 +-
target/sparc/win_helper.c | 20 ++---
target/xtensa/exc_helper.c | 8 +-
ui/spice-core.c | 6 +-
util/async.c | 2 +-
util/main-loop.c | 8 +-
util/rcu.c | 16 ++--
audio/coreaudio.m | 8 +-
memory_ldst.c.inc | 18 ++--
target/i386/hvf/README.md | 2 +-
ui/cocoa.m | 56 ++++++-------
119 files changed, 627 insertions(+), 628 deletions(-)
--
2.42.0
^ permalink raw reply [flat|nested] 34+ messages in thread* [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() 2023-11-29 21:26 [PATCH 0/6] Make Big QEMU Lock naming consistent Stefan Hajnoczi @ 2023-11-29 21:26 ` Stefan Hajnoczi 2023-11-30 9:02 ` Paul Durrant ` (6 more replies) 2023-11-29 21:26 ` [PATCH 2/6] qemu/main-loop: rename QEMU_IOTHREAD_LOCK_GUARD to QEMU_BQL_LOCK_GUARD Stefan Hajnoczi ` (4 subsequent siblings) 5 siblings, 7 replies; 34+ messages in thread From: Stefan Hajnoczi @ 2023-11-29 21:26 UTC (permalink / raw) To: qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, Stefan Hajnoczi, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang The Big QEMU Lock (BQL) has many names and they are confusing. The actual QemuMutex variable is called qemu_global_mutex but it's commonly referred to as the BQL in discussions and some code comments. The locking APIs, however, are called qemu_mutex_lock_iothread() and qemu_mutex_unlock_iothread(). The "iothread" name is historic and comes from when the main thread was split into into KVM vcpu threads and the "iothread" (now called the main loop thread). I have contributed to the confusion myself by introducing a separate --object iothread, a separate concept unrelated to the BQL. The "iothread" name is no longer appropriate for the BQL. Rename the locking APIs to: - void qemu_bql_lock(void) - void qemu_bql_unlock(void) - bool qemu_bql_locked(void) There are more APIs with "iothread" in their names. Subsequent patches will rename them. There are also comments and documentation that will be updated in later patches. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- include/block/aio-wait.h | 2 +- include/qemu/main-loop.h | 26 +++--- accel/accel-blocker.c | 10 +-- accel/dummy-cpus.c | 8 +- accel/hvf/hvf-accel-ops.c | 4 +- accel/kvm/kvm-accel-ops.c | 4 +- accel/kvm/kvm-all.c | 22 ++--- accel/tcg/cpu-exec.c | 26 +++--- accel/tcg/cputlb.c | 16 ++-- accel/tcg/tcg-accel-ops-icount.c | 4 +- accel/tcg/tcg-accel-ops-mttcg.c | 12 +-- accel/tcg/tcg-accel-ops-rr.c | 14 ++-- accel/tcg/tcg-accel-ops.c | 2 +- accel/tcg/translate-all.c | 2 +- cpu-common.c | 4 +- dump/dump.c | 4 +- hw/core/cpu-common.c | 6 +- hw/i386/intel_iommu.c | 6 +- hw/i386/kvm/xen_evtchn.c | 16 ++-- hw/i386/kvm/xen_overlay.c | 2 +- hw/i386/kvm/xen_xenstore.c | 2 +- hw/intc/arm_gicv3_cpuif.c | 2 +- hw/intc/s390_flic.c | 18 ++-- hw/misc/edu.c | 4 +- hw/misc/imx6_src.c | 2 +- hw/misc/imx7_src.c | 2 +- hw/net/xen_nic.c | 8 +- hw/ppc/pegasos2.c | 2 +- hw/ppc/ppc.c | 4 +- hw/ppc/spapr.c | 2 +- hw/ppc/spapr_rng.c | 4 +- hw/ppc/spapr_softmmu.c | 4 +- hw/remote/mpqemu-link.c | 12 +-- hw/remote/vfio-user-obj.c | 2 +- hw/s390x/s390-skeys.c | 2 +- migration/block-dirty-bitmap.c | 4 +- migration/block.c | 16 ++-- migration/colo.c | 60 +++++++------- migration/dirtyrate.c | 12 +-- migration/migration.c | 52 ++++++------ migration/ram.c | 12 +-- replay/replay-internal.c | 2 +- semihosting/console.c | 8 +- stubs/iothread-lock.c | 6 +- system/cpu-throttle.c | 4 +- system/cpus.c | 28 +++---- system/dirtylimit.c | 4 +- system/memory.c | 2 +- system/physmem.c | 8 +- system/runstate.c | 2 +- system/watchpoint.c | 4 +- target/arm/arm-powerctl.c | 14 ++-- target/arm/helper.c | 4 +- target/arm/hvf/hvf.c | 8 +- target/arm/kvm.c | 4 +- target/arm/kvm64.c | 4 +- target/arm/ptw.c | 6 +- target/arm/tcg/helper-a64.c | 8 +- target/arm/tcg/m_helper.c | 4 +- target/arm/tcg/op_helper.c | 24 +++--- target/arm/tcg/psci.c | 2 +- target/hppa/int_helper.c | 8 +- target/i386/hvf/hvf.c | 6 +- target/i386/kvm/hyperv.c | 4 +- target/i386/kvm/kvm.c | 28 +++---- target/i386/kvm/xen-emu.c | 14 ++-- target/i386/nvmm/nvmm-accel-ops.c | 4 +- target/i386/nvmm/nvmm-all.c | 20 ++--- target/i386/tcg/sysemu/fpu_helper.c | 6 +- target/i386/tcg/sysemu/misc_helper.c | 4 +- target/i386/whpx/whpx-accel-ops.c | 4 +- target/i386/whpx/whpx-all.c | 24 +++--- target/loongarch/csr_helper.c | 4 +- target/mips/kvm.c | 4 +- target/mips/tcg/sysemu/cp0_helper.c | 4 +- target/openrisc/sys_helper.c | 16 ++-- target/ppc/excp_helper.c | 12 +-- target/ppc/kvm.c | 4 +- target/ppc/misc_helper.c | 8 +- target/ppc/timebase_helper.c | 8 +- target/s390x/kvm/kvm.c | 4 +- target/s390x/tcg/misc_helper.c | 118 +++++++++++++-------------- target/sparc/int32_helper.c | 2 +- target/sparc/int64_helper.c | 6 +- target/sparc/win_helper.c | 20 ++--- target/xtensa/exc_helper.c | 8 +- ui/spice-core.c | 4 +- util/async.c | 2 +- util/main-loop.c | 8 +- util/rcu.c | 14 ++-- audio/coreaudio.m | 4 +- memory_ldst.c.inc | 18 ++-- target/i386/hvf/README.md | 2 +- ui/cocoa.m | 50 ++++++------ 94 files changed, 502 insertions(+), 502 deletions(-) diff --git a/include/block/aio-wait.h b/include/block/aio-wait.h index 5449b6d742..f6ae91742c 100644 --- a/include/block/aio-wait.h +++ b/include/block/aio-wait.h @@ -151,7 +151,7 @@ static inline bool in_aio_context_home_thread(AioContext *ctx) } if (ctx == qemu_get_aio_context()) { - return qemu_mutex_iothread_locked(); + return qemu_bql_locked(); } else { return false; } diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h index 68e70e61aa..d6f75e57bd 100644 --- a/include/qemu/main-loop.h +++ b/include/qemu/main-loop.h @@ -248,7 +248,7 @@ GSource *iohandler_get_g_source(void); AioContext *iohandler_get_aio_context(void); /** - * qemu_mutex_iothread_locked: Return lock status of the main loop mutex. + * qemu_bql_locked: Return lock status of the main loop mutex. * * The main loop mutex is the coarsest lock in QEMU, and as such it * must always be taken outside other locks. This function helps @@ -260,7 +260,7 @@ AioContext *iohandler_get_aio_context(void); * have a BQL. * Please instead refer to qemu_in_main_thread(). */ -bool qemu_mutex_iothread_locked(void); +bool qemu_bql_locked(void); /** * qemu_in_main_thread: return whether it's possible to safely access @@ -312,7 +312,7 @@ bool qemu_in_main_thread(void); } while (0) /** - * qemu_mutex_lock_iothread: Lock the main loop mutex. + * qemu_bql_lock: Lock the main loop mutex. * * This function locks the main loop mutex. The mutex is taken by * main() in vl.c and always taken except while waiting on @@ -321,15 +321,15 @@ bool qemu_in_main_thread(void); * qemu_bh_new(), qemu_set_fd_handler() and basically all other * functions documented in this file. * - * NOTE: tools currently are single-threaded and qemu_mutex_lock_iothread + * NOTE: tools currently are single-threaded and qemu_bql_lock * is a no-op there. */ -#define qemu_mutex_lock_iothread() \ - qemu_mutex_lock_iothread_impl(__FILE__, __LINE__) -void qemu_mutex_lock_iothread_impl(const char *file, int line); +#define qemu_bql_lock() \ + qemu_bql_lock_impl(__FILE__, __LINE__) +void qemu_bql_lock_impl(const char *file, int line); /** - * qemu_mutex_unlock_iothread: Unlock the main loop mutex. + * qemu_bql_unlock: Unlock the main loop mutex. * * This function unlocks the main loop mutex. The mutex is taken by * main() in vl.c and always taken except while waiting on @@ -338,10 +338,10 @@ void qemu_mutex_lock_iothread_impl(const char *file, int line); * because it prevents the main loop from processing callbacks, * including timers and bottom halves. * - * NOTE: tools currently are single-threaded and qemu_mutex_unlock_iothread + * NOTE: tools currently are single-threaded and qemu_bql_unlock * is a no-op there. */ -void qemu_mutex_unlock_iothread(void); +void qemu_bql_unlock(void); /** * QEMU_IOTHREAD_LOCK_GUARD @@ -353,17 +353,17 @@ typedef struct IOThreadLockAuto IOThreadLockAuto; static inline IOThreadLockAuto *qemu_iothread_auto_lock(const char *file, int line) { - if (qemu_mutex_iothread_locked()) { + if (qemu_bql_locked()) { return NULL; } - qemu_mutex_lock_iothread_impl(file, line); + qemu_bql_lock_impl(file, line); /* Anything non-NULL causes the cleanup function to be called */ return (IOThreadLockAuto *)(uintptr_t)1; } static inline void qemu_iothread_auto_unlock(IOThreadLockAuto *l) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } G_DEFINE_AUTOPTR_CLEANUP_FUNC(IOThreadLockAuto, qemu_iothread_auto_unlock) diff --git a/accel/accel-blocker.c b/accel/accel-blocker.c index 1e7f423462..0e9e4a2142 100644 --- a/accel/accel-blocker.c +++ b/accel/accel-blocker.c @@ -41,7 +41,7 @@ void accel_blocker_init(void) void accel_ioctl_begin(void) { - if (likely(qemu_mutex_iothread_locked())) { + if (likely(qemu_bql_locked())) { return; } @@ -51,7 +51,7 @@ void accel_ioctl_begin(void) void accel_ioctl_end(void) { - if (likely(qemu_mutex_iothread_locked())) { + if (likely(qemu_bql_locked())) { return; } @@ -62,7 +62,7 @@ void accel_ioctl_end(void) void accel_cpu_ioctl_begin(CPUState *cpu) { - if (unlikely(qemu_mutex_iothread_locked())) { + if (unlikely(qemu_bql_locked())) { return; } @@ -72,7 +72,7 @@ void accel_cpu_ioctl_begin(CPUState *cpu) void accel_cpu_ioctl_end(CPUState *cpu) { - if (unlikely(qemu_mutex_iothread_locked())) { + if (unlikely(qemu_bql_locked())) { return; } @@ -105,7 +105,7 @@ void accel_ioctl_inhibit_begin(void) * We allow to inhibit only when holding the BQL, so we can identify * when an inhibitor wants to issue an ioctl easily. */ - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); /* Block further invocations of the ioctls outside the BQL. */ CPU_FOREACH(cpu) { diff --git a/accel/dummy-cpus.c b/accel/dummy-cpus.c index b75c919ac3..7b4b26a152 100644 --- a/accel/dummy-cpus.c +++ b/accel/dummy-cpus.c @@ -24,7 +24,7 @@ static void *dummy_cpu_thread_fn(void *arg) rcu_register_thread(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qemu_thread_get_self(cpu->thread); cpu->thread_id = qemu_get_thread_id(); cpu->neg.can_do_io = true; @@ -43,7 +43,7 @@ static void *dummy_cpu_thread_fn(void *arg) qemu_guest_random_seed_thread_part2(cpu->random_seed); do { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); #ifndef _WIN32 do { int sig; @@ -56,11 +56,11 @@ static void *dummy_cpu_thread_fn(void *arg) #else qemu_sem_wait(&cpu->sem); #endif - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qemu_wait_io_event(cpu); } while (!cpu->unplug); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); rcu_unregister_thread(); return NULL; } diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index abe7adf7ee..caa4a00741 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -424,7 +424,7 @@ static void *hvf_cpu_thread_fn(void *arg) rcu_register_thread(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qemu_thread_get_self(cpu->thread); cpu->thread_id = qemu_get_thread_id(); @@ -449,7 +449,7 @@ static void *hvf_cpu_thread_fn(void *arg) hvf_vcpu_destroy(cpu); cpu_thread_signal_destroyed(cpu); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); rcu_unregister_thread(); return NULL; } diff --git a/accel/kvm/kvm-accel-ops.c b/accel/kvm/kvm-accel-ops.c index 6195150a0b..92fdd3ddbd 100644 --- a/accel/kvm/kvm-accel-ops.c +++ b/accel/kvm/kvm-accel-ops.c @@ -33,7 +33,7 @@ static void *kvm_vcpu_thread_fn(void *arg) rcu_register_thread(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qemu_thread_get_self(cpu->thread); cpu->thread_id = qemu_get_thread_id(); cpu->neg.can_do_io = true; @@ -58,7 +58,7 @@ static void *kvm_vcpu_thread_fn(void *arg) kvm_destroy_vcpu(cpu); cpu_thread_signal_destroyed(cpu); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); rcu_unregister_thread(); return NULL; } diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index e39a810a4e..760a160052 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -817,7 +817,7 @@ static void kvm_dirty_ring_flush(void) * should always be with BQL held, serialization is guaranteed. * However, let's be sure of it. */ - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); /* * First make sure to flush the hardware buffers by kicking all * vcpus out in a synchronous way. @@ -1402,9 +1402,9 @@ static void *kvm_dirty_ring_reaper_thread(void *data) trace_kvm_dirty_ring_reaper("wakeup"); r->reaper_state = KVM_DIRTY_RING_REAPER_REAPING; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); kvm_dirty_ring_reap(s, NULL); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); r->reaper_iteration++; } @@ -2828,7 +2828,7 @@ int kvm_cpu_exec(CPUState *cpu) return EXCP_HLT; } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); cpu_exec_start(cpu); do { @@ -2868,11 +2868,11 @@ int kvm_cpu_exec(CPUState *cpu) #ifdef KVM_HAVE_MCE_INJECTION if (unlikely(have_sigbus_pending)) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); kvm_arch_on_sigbus_vcpu(cpu, pending_sigbus_code, pending_sigbus_addr); have_sigbus_pending = false; - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } #endif @@ -2942,7 +2942,7 @@ int kvm_cpu_exec(CPUState *cpu) * still full. Got kicked by KVM_RESET_DIRTY_RINGS. */ trace_kvm_dirty_ring_full(cpu->cpu_index); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); /* * We throttle vCPU by making it sleep once it exit from kernel * due to dirty ring full. In the dirtylimit scenario, reaping @@ -2954,7 +2954,7 @@ int kvm_cpu_exec(CPUState *cpu) } else { kvm_dirty_ring_reap(kvm_state, NULL); } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); dirtylimit_vcpu_execute(cpu); ret = 0; break; @@ -2970,9 +2970,9 @@ int kvm_cpu_exec(CPUState *cpu) break; case KVM_SYSTEM_EVENT_CRASH: kvm_cpu_synchronize_state(cpu); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qemu_system_guest_panicked(cpu_get_crash_info(cpu)); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); ret = 0; break; default: @@ -2989,7 +2989,7 @@ int kvm_cpu_exec(CPUState *cpu) } while (ret == 0); cpu_exec_end(cpu); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); if (ret < 0) { cpu_dump_state(cpu, stderr, CPU_DUMP_CODE); diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index c938eb96f8..9777182478 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -558,8 +558,8 @@ static void cpu_exec_longjmp_cleanup(CPUState *cpu) tcg_ctx->gen_tb = NULL; } #endif - if (qemu_mutex_iothread_locked()) { - qemu_mutex_unlock_iothread(); + if (qemu_bql_locked()) { + qemu_bql_unlock(); } assert_no_pages_locked(); } @@ -680,10 +680,10 @@ static inline bool cpu_handle_halt(CPUState *cpu) #if defined(TARGET_I386) if (cpu->interrupt_request & CPU_INTERRUPT_POLL) { X86CPU *x86_cpu = X86_CPU(cpu); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); apic_poll_irq(x86_cpu->apic_state); cpu_reset_interrupt(cpu, CPU_INTERRUPT_POLL); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } #endif /* TARGET_I386 */ if (!cpu_has_work(cpu)) { @@ -749,9 +749,9 @@ static inline bool cpu_handle_exception(CPUState *cpu, int *ret) #else if (replay_exception()) { CPUClass *cc = CPU_GET_CLASS(cpu); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cc->tcg_ops->do_interrupt(cpu); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); cpu->exception_index = -1; if (unlikely(cpu->singlestep_enabled)) { @@ -812,7 +812,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, if (unlikely(qatomic_read(&cpu->interrupt_request))) { int interrupt_request; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); interrupt_request = cpu->interrupt_request; if (unlikely(cpu->singlestep_enabled & SSTEP_NOIRQ)) { /* Mask out external interrupts for this step. */ @@ -821,7 +821,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, if (interrupt_request & CPU_INTERRUPT_DEBUG) { cpu->interrupt_request &= ~CPU_INTERRUPT_DEBUG; cpu->exception_index = EXCP_DEBUG; - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return true; } #if !defined(CONFIG_USER_ONLY) @@ -832,7 +832,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, cpu->interrupt_request &= ~CPU_INTERRUPT_HALT; cpu->halted = 1; cpu->exception_index = EXCP_HLT; - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return true; } #if defined(TARGET_I386) @@ -843,14 +843,14 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, cpu_svm_check_intercept_param(env, SVM_EXIT_INIT, 0, 0); do_cpu_init(x86_cpu); cpu->exception_index = EXCP_HALTED; - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return true; } #else else if (interrupt_request & CPU_INTERRUPT_RESET) { replay_interrupt(); cpu_reset(cpu); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return true; } #endif /* !TARGET_I386 */ @@ -873,7 +873,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, */ if (unlikely(cpu->singlestep_enabled)) { cpu->exception_index = EXCP_DEBUG; - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return true; } cpu->exception_index = -1; @@ -892,7 +892,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, } /* If we exit via cpu_loop_exit/longjmp it is reset in cpu_exec */ - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } /* Finally, check if we need to exit to the main loop. */ diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index db3f93fda9..3c0b1658ee 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -2030,10 +2030,10 @@ static uint64_t do_ld_mmio_beN(CPUState *cpu, CPUTLBEntryFull *full, section = io_prepare(&mr_offset, cpu, full->xlat_section, attrs, addr, ra); mr = section->mr; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ret = int_ld_mmio_beN(cpu, full, ret_be, addr, size, mmu_idx, type, ra, mr, mr_offset); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return ret; } @@ -2054,12 +2054,12 @@ static Int128 do_ld16_mmio_beN(CPUState *cpu, CPUTLBEntryFull *full, section = io_prepare(&mr_offset, cpu, full->xlat_section, attrs, addr, ra); mr = section->mr; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); a = int_ld_mmio_beN(cpu, full, ret_be, addr, size - 8, mmu_idx, MMU_DATA_LOAD, ra, mr, mr_offset); b = int_ld_mmio_beN(cpu, full, ret_be, addr + size - 8, 8, mmu_idx, MMU_DATA_LOAD, ra, mr, mr_offset + size - 8); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return int128_make128(b, a); } @@ -2577,10 +2577,10 @@ static uint64_t do_st_mmio_leN(CPUState *cpu, CPUTLBEntryFull *full, section = io_prepare(&mr_offset, cpu, full->xlat_section, attrs, addr, ra); mr = section->mr; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ret = int_st_mmio_leN(cpu, full, val_le, addr, size, mmu_idx, ra, mr, mr_offset); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return ret; } @@ -2601,12 +2601,12 @@ static uint64_t do_st16_mmio_leN(CPUState *cpu, CPUTLBEntryFull *full, section = io_prepare(&mr_offset, cpu, full->xlat_section, attrs, addr, ra); mr = section->mr; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); int_st_mmio_leN(cpu, full, int128_getlo(val_le), addr, 8, mmu_idx, ra, mr, mr_offset); ret = int_st_mmio_leN(cpu, full, int128_gethi(val_le), addr + 8, size - 8, mmu_idx, ra, mr, mr_offset + 8); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return ret; } diff --git a/accel/tcg/tcg-accel-ops-icount.c b/accel/tcg/tcg-accel-ops-icount.c index b25685fb71..76b9bedc08 100644 --- a/accel/tcg/tcg-accel-ops-icount.c +++ b/accel/tcg/tcg-accel-ops-icount.c @@ -126,9 +126,9 @@ void icount_prepare_for_run(CPUState *cpu, int64_t cpu_budget) * We're called without the iothread lock, so must take it while * we're calling timer handlers. */ - qemu_mutex_lock_iothread(); + qemu_bql_lock(); icount_notify_aio_contexts(); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } } diff --git a/accel/tcg/tcg-accel-ops-mttcg.c b/accel/tcg/tcg-accel-ops-mttcg.c index fac80095bb..d3575bdc8b 100644 --- a/accel/tcg/tcg-accel-ops-mttcg.c +++ b/accel/tcg/tcg-accel-ops-mttcg.c @@ -76,7 +76,7 @@ static void *mttcg_cpu_thread_fn(void *arg) rcu_add_force_rcu_notifier(&force_rcu.notifier); tcg_register_thread(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qemu_thread_get_self(cpu->thread); cpu->thread_id = qemu_get_thread_id(); @@ -91,9 +91,9 @@ static void *mttcg_cpu_thread_fn(void *arg) do { if (cpu_can_run(cpu)) { int r; - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); r = tcg_cpus_exec(cpu); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); switch (r) { case EXCP_DEBUG: cpu_handle_guest_debug(cpu); @@ -105,9 +105,9 @@ static void *mttcg_cpu_thread_fn(void *arg) */ break; case EXCP_ATOMIC: - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); cpu_exec_step_atomic(cpu); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); default: /* Ignore everything else? */ break; @@ -119,7 +119,7 @@ static void *mttcg_cpu_thread_fn(void *arg) } while (!cpu->unplug || cpu_can_run(cpu)); tcg_cpus_destroy(cpu); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); rcu_remove_force_rcu_notifier(&force_rcu.notifier); rcu_unregister_thread(); return NULL; diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c index 611932f3c3..c21215a094 100644 --- a/accel/tcg/tcg-accel-ops-rr.c +++ b/accel/tcg/tcg-accel-ops-rr.c @@ -188,7 +188,7 @@ static void *rr_cpu_thread_fn(void *arg) rcu_add_force_rcu_notifier(&force_rcu); tcg_register_thread(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qemu_thread_get_self(cpu->thread); cpu->thread_id = qemu_get_thread_id(); @@ -218,9 +218,9 @@ static void *rr_cpu_thread_fn(void *arg) /* Only used for icount_enabled() */ int64_t cpu_budget = 0; - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); replay_mutex_lock(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); if (icount_enabled()) { int cpu_count = rr_cpu_count(); @@ -254,7 +254,7 @@ static void *rr_cpu_thread_fn(void *arg) if (cpu_can_run(cpu)) { int r; - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); if (icount_enabled()) { icount_prepare_for_run(cpu, cpu_budget); } @@ -262,15 +262,15 @@ static void *rr_cpu_thread_fn(void *arg) if (icount_enabled()) { icount_process_data(cpu); } - qemu_mutex_lock_iothread(); + qemu_bql_lock(); if (r == EXCP_DEBUG) { cpu_handle_guest_debug(cpu); break; } else if (r == EXCP_ATOMIC) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); cpu_exec_step_atomic(cpu); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); break; } } else if (cpu->stop) { diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index 1b57290682..2cc17faba3 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -88,7 +88,7 @@ static void tcg_cpu_reset_hold(CPUState *cpu) /* mask must never be zero, except for A20 change call */ void tcg_handle_interrupt(CPUState *cpu, int mask) { - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); cpu->interrupt_request |= mask; diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 79a88f5fb7..62e71b1617 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -649,7 +649,7 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) void cpu_interrupt(CPUState *cpu, int mask) { - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); cpu->interrupt_request |= mask; qatomic_set(&cpu->neg.icount_decr.u16.high, -1); } diff --git a/cpu-common.c b/cpu-common.c index c81fd72d16..acafb27377 100644 --- a/cpu-common.c +++ b/cpu-common.c @@ -351,11 +351,11 @@ void process_queued_cpu_work(CPUState *cpu) * BQL, so it goes to sleep; start_exclusive() is sleeping too, so * neither CPU can proceed. */ - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); start_exclusive(); wi->func(cpu, wi->data); end_exclusive(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } else { wi->func(cpu, wi->data); } diff --git a/dump/dump.c b/dump/dump.c index 4819050764..7fab6c07e7 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -108,11 +108,11 @@ static int dump_cleanup(DumpState *s) s->guest_note = NULL; if (s->resume) { if (s->detached) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } vm_start(); if (s->detached) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } } migrate_del_blocker(&dump_migration_blocker); diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index 82dae51a55..5c9efe90ad 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -70,14 +70,14 @@ CPUState *cpu_create(const char *typename) * BQL here if we need to. cpu_interrupt assumes it is held.*/ void cpu_reset_interrupt(CPUState *cpu, int mask) { - bool need_lock = !qemu_mutex_iothread_locked(); + bool need_lock = !qemu_bql_locked(); if (need_lock) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } cpu->interrupt_request &= ~mask; if (need_lock) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } } diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 5085a6fee3..bb3768a243 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -1665,7 +1665,7 @@ static bool vtd_switch_address_space(VTDAddressSpace *as) { bool use_iommu, pt; /* Whether we need to take the BQL on our own */ - bool take_bql = !qemu_mutex_iothread_locked(); + bool take_bql = !qemu_bql_locked(); assert(as); @@ -1683,7 +1683,7 @@ static bool vtd_switch_address_space(VTDAddressSpace *as) * it. We'd better make sure we have had it already, or, take it. */ if (take_bql) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } /* Turn off first then on the other */ @@ -1738,7 +1738,7 @@ static bool vtd_switch_address_space(VTDAddressSpace *as) } if (take_bql) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } return use_iommu; diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c index 02b8cbf8df..07d0ff0253 100644 --- a/hw/i386/kvm/xen_evtchn.c +++ b/hw/i386/kvm/xen_evtchn.c @@ -425,7 +425,7 @@ void xen_evtchn_set_callback_level(int level) * effect immediately. That just leaves interdomain loopback as the case * which uses the BH. */ - if (!qemu_mutex_iothread_locked()) { + if (!qemu_bql_locked()) { qemu_bh_schedule(s->gsi_bh); return; } @@ -459,7 +459,7 @@ int xen_evtchn_set_callback_param(uint64_t param) * We need the BQL because set_callback_pci_intx() may call into PCI code, * and because we may need to manipulate the old and new GSI levels. */ - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); qemu_mutex_lock(&s->port_lock); switch (type) { @@ -1037,7 +1037,7 @@ static int close_port(XenEvtchnState *s, evtchn_port_t port, XenEvtchnPort *p = &s->port_table[port]; /* Because it *might* be a PIRQ port */ - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); switch (p->type) { case EVTCHNSTAT_closed: @@ -1104,7 +1104,7 @@ int xen_evtchn_soft_reset(void) return -ENOTSUP; } - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); qemu_mutex_lock(&s->port_lock); @@ -1601,7 +1601,7 @@ bool xen_evtchn_set_gsi(int gsi, int level) XenEvtchnState *s = xen_evtchn_singleton; int pirq; - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); if (!s || gsi < 0 || gsi >= IOAPIC_NUM_PINS) { return false; @@ -1712,7 +1712,7 @@ void xen_evtchn_snoop_msi(PCIDevice *dev, bool is_msix, unsigned int vector, return; } - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); pirq = msi_pirq_target(addr, data); @@ -1749,7 +1749,7 @@ int xen_evtchn_translate_pirq_msi(struct kvm_irq_routing_entry *route, return 1; /* Not a PIRQ */ } - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); pirq = msi_pirq_target(address, data); if (!pirq || pirq >= s->nr_pirqs) { @@ -1796,7 +1796,7 @@ bool xen_evtchn_deliver_pirq_msi(uint64_t address, uint32_t data) return false; } - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); pirq = msi_pirq_target(address, data); if (!pirq || pirq >= s->nr_pirqs) { diff --git a/hw/i386/kvm/xen_overlay.c b/hw/i386/kvm/xen_overlay.c index 39fda1b72c..7f05da1804 100644 --- a/hw/i386/kvm/xen_overlay.c +++ b/hw/i386/kvm/xen_overlay.c @@ -194,7 +194,7 @@ int xen_overlay_map_shinfo_page(uint64_t gpa) return -ENOENT; } - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); if (s->shinfo_gpa) { /* If removing shinfo page, turn the kernel magic off first */ diff --git a/hw/i386/kvm/xen_xenstore.c b/hw/i386/kvm/xen_xenstore.c index 6e651960b3..cd56b4c32c 100644 --- a/hw/i386/kvm/xen_xenstore.c +++ b/hw/i386/kvm/xen_xenstore.c @@ -1341,7 +1341,7 @@ static void fire_watch_cb(void *opaque, const char *path, const char *token) { XenXenstoreState *s = opaque; - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); /* * If there's a response pending, we obviously can't scribble over diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c index ab1a00508e..a6d24cecfd 100644 --- a/hw/intc/arm_gicv3_cpuif.c +++ b/hw/intc/arm_gicv3_cpuif.c @@ -934,7 +934,7 @@ void gicv3_cpuif_update(GICv3CPUState *cs) ARMCPU *cpu = ARM_CPU(cs->cpu); CPUARMState *env = &cpu->env; - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); trace_gicv3_cpuif_update(gicv3_redist_affid(cs), cs->hppi.irq, cs->hppi.grp, cs->hppi.prio); diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c index 74e02858d4..8550c6828d 100644 --- a/hw/intc/s390_flic.c +++ b/hw/intc/s390_flic.c @@ -106,7 +106,7 @@ static int qemu_s390_clear_io_flic(S390FLICState *fs, uint16_t subchannel_id, QEMUS390FlicIO *cur, *next; uint8_t isc; - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); if (!(flic->pending & FLIC_PENDING_IO)) { return 0; } @@ -223,7 +223,7 @@ uint32_t qemu_s390_flic_dequeue_service(QEMUS390FLICState *flic) { uint32_t tmp; - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); g_assert(flic->pending & FLIC_PENDING_SERVICE); tmp = flic->service_param; flic->service_param = 0; @@ -238,7 +238,7 @@ QEMUS390FlicIO *qemu_s390_flic_dequeue_io(QEMUS390FLICState *flic, uint64_t cr6) QEMUS390FlicIO *io; uint8_t isc; - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); if (!(flic->pending & CR6_TO_PENDING_IO(cr6))) { return NULL; } @@ -262,7 +262,7 @@ QEMUS390FlicIO *qemu_s390_flic_dequeue_io(QEMUS390FLICState *flic, uint64_t cr6) void qemu_s390_flic_dequeue_crw_mchk(QEMUS390FLICState *flic) { - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); g_assert(flic->pending & FLIC_PENDING_MCHK_CR); flic->pending &= ~FLIC_PENDING_MCHK_CR; } @@ -271,7 +271,7 @@ static void qemu_s390_inject_service(S390FLICState *fs, uint32_t parm) { QEMUS390FLICState *flic = s390_get_qemu_flic(fs); - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); /* multiplexing is good enough for sclp - kvm does it internally as well */ flic->service_param |= parm; flic->pending |= FLIC_PENDING_SERVICE; @@ -287,7 +287,7 @@ static void qemu_s390_inject_io(S390FLICState *fs, uint16_t subchannel_id, QEMUS390FLICState *flic = s390_get_qemu_flic(fs); QEMUS390FlicIO *io; - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); io = g_new0(QEMUS390FlicIO, 1); io->id = subchannel_id; io->nr = subchannel_nr; @@ -304,7 +304,7 @@ static void qemu_s390_inject_crw_mchk(S390FLICState *fs) { QEMUS390FLICState *flic = s390_get_qemu_flic(fs); - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); flic->pending |= FLIC_PENDING_MCHK_CR; qemu_s390_flic_notify(FLIC_PENDING_MCHK_CR); @@ -330,7 +330,7 @@ bool qemu_s390_flic_has_crw_mchk(QEMUS390FLICState *flic) bool qemu_s390_flic_has_any(QEMUS390FLICState *flic) { - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); return !!flic->pending; } @@ -340,7 +340,7 @@ static void qemu_s390_flic_reset(DeviceState *dev) QEMUS390FlicIO *cur, *next; int isc; - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); flic->simm = 0; flic->nimm = 0; flic->pending = 0; diff --git a/hw/misc/edu.c b/hw/misc/edu.c index a1f8bc77e7..1c18383378 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -355,9 +355,9 @@ static void *edu_fact_thread(void *opaque) smp_mb__after_rmw(); if (qatomic_read(&edu->status) & EDU_STATUS_IRQFACT) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); edu_raise_irq(edu, FACT_IRQ); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } } diff --git a/hw/misc/imx6_src.c b/hw/misc/imx6_src.c index a9c64d06eb..6070acc244 100644 --- a/hw/misc/imx6_src.c +++ b/hw/misc/imx6_src.c @@ -131,7 +131,7 @@ static void imx6_clear_reset_bit(CPUState *cpu, run_on_cpu_data data) struct SRCSCRResetInfo *ri = data.host_ptr; IMX6SRCState *s = ri->s; - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); s->regs[SRC_SCR] = deposit32(s->regs[SRC_SCR], ri->reset_bit, 1, 0); DPRINTF("reg[%s] <= 0x%" PRIx32 "\n", diff --git a/hw/misc/imx7_src.c b/hw/misc/imx7_src.c index 983251e86f..cf3d14c9b3 100644 --- a/hw/misc/imx7_src.c +++ b/hw/misc/imx7_src.c @@ -136,7 +136,7 @@ static void imx7_clear_reset_bit(CPUState *cpu, run_on_cpu_data data) struct SRCSCRResetInfo *ri = data.host_ptr; IMX7SRCState *s = ri->s; - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); s->regs[SRC_A7RCR0] = deposit32(s->regs[SRC_A7RCR0], ri->reset_bit, 1, 0); diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c index 1e2b3baeb1..b2bac8b2ab 100644 --- a/hw/net/xen_nic.c +++ b/hw/net/xen_nic.c @@ -133,7 +133,7 @@ static bool net_tx_packets(struct XenNetDev *netdev) void *page; void *tmpbuf = NULL; - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); for (;;) { rc = netdev->tx_ring.req_cons; @@ -260,7 +260,7 @@ static ssize_t net_rx_packet(NetClientState *nc, const uint8_t *buf, size_t size RING_IDX rc, rp; void *page; - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); if (xen_device_backend_get_state(&netdev->xendev) != XenbusStateConnected) { return -1; @@ -354,7 +354,7 @@ static bool xen_netdev_connect(XenDevice *xendev, Error **errp) XenNetDev *netdev = XEN_NET_DEVICE(xendev); unsigned int port, rx_copy; - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); if (xen_device_frontend_scanf(xendev, "tx-ring-ref", "%u", &netdev->tx_ring_ref) != 1) { @@ -425,7 +425,7 @@ static void xen_netdev_disconnect(XenDevice *xendev, Error **errp) trace_xen_netdev_disconnect(netdev->dev); - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); netdev->tx_ring.sring = NULL; netdev->rx_ring.sring = NULL; diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c index 3203a4a728..aad2787a3f 100644 --- a/hw/ppc/pegasos2.c +++ b/hw/ppc/pegasos2.c @@ -515,7 +515,7 @@ static void pegasos2_hypercall(PPCVirtualHypervisor *vhyp, PowerPCCPU *cpu) CPUPPCState *env = &cpu->env; /* The TCG path should also be holding the BQL at this point */ - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); if (FIELD_EX64(env->msr, MSR, PR)) { qemu_log_mask(LOG_GUEST_ERROR, "Hypercall made with MSR[PR]=1\n"); diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index be167710a3..c8c3b43602 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -314,7 +314,7 @@ void store_40x_dbcr0(CPUPPCState *env, uint32_t val) { PowerPCCPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); switch ((val >> 28) & 0x3) { case 0x0: @@ -334,7 +334,7 @@ void store_40x_dbcr0(CPUPPCState *env, uint32_t val) break; } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } /* PowerPC 40x internal IRQ controller */ diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index df09aa9d6a..6322c34283 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1304,7 +1304,7 @@ static void emulate_spapr_hypercall(PPCVirtualHypervisor *vhyp, CPUPPCState *env = &cpu->env; /* The TCG path should also be holding the BQL at this point */ - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); g_assert(!vhyp_cpu_in_nested(cpu)); diff --git a/hw/ppc/spapr_rng.c b/hw/ppc/spapr_rng.c index df5c4b9687..e8c428b8bb 100644 --- a/hw/ppc/spapr_rng.c +++ b/hw/ppc/spapr_rng.c @@ -82,9 +82,9 @@ static target_ulong h_random(PowerPCCPU *cpu, SpaprMachineState *spapr, while (hrdata.received < 8) { rng_backend_request_entropy(rngstate->backend, 8 - hrdata.received, random_recv, &hrdata); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); qemu_sem_wait(&hrdata.sem); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } qemu_sem_destroy(&hrdata.sem); diff --git a/hw/ppc/spapr_softmmu.c b/hw/ppc/spapr_softmmu.c index 278666317e..96ffcb8fbc 100644 --- a/hw/ppc/spapr_softmmu.c +++ b/hw/ppc/spapr_softmmu.c @@ -334,7 +334,7 @@ static void *hpt_prepare_thread(void *opaque) pending->ret = H_NO_MEM; } - qemu_mutex_lock_iothread(); + qemu_bql_lock(); if (SPAPR_MACHINE(qdev_get_machine())->pending_hpt == pending) { /* Ready to go */ @@ -344,7 +344,7 @@ static void *hpt_prepare_thread(void *opaque) free_pending_hpt(pending); } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return NULL; } diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c index 9bd98e8219..ffb2c25145 100644 --- a/hw/remote/mpqemu-link.c +++ b/hw/remote/mpqemu-link.c @@ -33,7 +33,7 @@ */ bool mpqemu_msg_send(MPQemuMsg *msg, QIOChannel *ioc, Error **errp) { - bool iolock = qemu_mutex_iothread_locked(); + bool iolock = qemu_bql_locked(); bool iothread = qemu_in_iothread(); struct iovec send[2] = {}; int *fds = NULL; @@ -64,7 +64,7 @@ bool mpqemu_msg_send(MPQemuMsg *msg, QIOChannel *ioc, Error **errp) * Also skip lock handling while in a co-routine in the main context. */ if (iolock && !iothread && !qemu_in_coroutine()) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } if (!qio_channel_writev_full_all(ioc, send, G_N_ELEMENTS(send), @@ -76,7 +76,7 @@ bool mpqemu_msg_send(MPQemuMsg *msg, QIOChannel *ioc, Error **errp) if (iolock && !iothread && !qemu_in_coroutine()) { /* See above comment why skip locking here. */ - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } return ret; @@ -96,7 +96,7 @@ static ssize_t mpqemu_read(QIOChannel *ioc, void *buf, size_t len, int **fds, size_t *nfds, Error **errp) { struct iovec iov = { .iov_base = buf, .iov_len = len }; - bool iolock = qemu_mutex_iothread_locked(); + bool iolock = qemu_bql_locked(); bool iothread = qemu_in_iothread(); int ret = -1; @@ -107,13 +107,13 @@ static ssize_t mpqemu_read(QIOChannel *ioc, void *buf, size_t len, int **fds, assert(qemu_in_coroutine() || !iothread); if (iolock && !iothread && !qemu_in_coroutine()) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } ret = qio_channel_readv_full_all_eof(ioc, &iov, 1, fds, nfds, errp); if (iolock && !iothread && !qemu_in_coroutine()) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } return (ret <= 0) ? ret : iov.iov_len; diff --git a/hw/remote/vfio-user-obj.c b/hw/remote/vfio-user-obj.c index 8b10c32a3c..d0d0386d52 100644 --- a/hw/remote/vfio-user-obj.c +++ b/hw/remote/vfio-user-obj.c @@ -400,7 +400,7 @@ static int vfu_object_mr_rw(MemoryRegion *mr, uint8_t *buf, hwaddr offset, } if (release_lock) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); release_lock = false; } diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index 8f5159d85d..307344aa80 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -153,7 +153,7 @@ void qmp_dump_skeys(const char *filename, Error **errp) goto out; } - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); guest_phys_blocks_init(&guest_phys_blocks); guest_phys_blocks_append(&guest_phys_blocks); diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index 24347ab0f7..b5a2d377db 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -774,7 +774,7 @@ static void dirty_bitmap_state_pending(void *opaque, SaveBitmapState *dbms; uint64_t pending = 0; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); QSIMPLEQ_FOREACH(dbms, &s->dbms_list, entry) { uint64_t gran = bdrv_dirty_bitmap_granularity(dbms->bitmap); @@ -784,7 +784,7 @@ static void dirty_bitmap_state_pending(void *opaque, pending += DIV_ROUND_UP(sectors * BDRV_SECTOR_SIZE, gran); } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); trace_dirty_bitmap_state_pending(pending); diff --git a/migration/block.c b/migration/block.c index a15f9bddcb..87f36e6e35 100644 --- a/migration/block.c +++ b/migration/block.c @@ -269,7 +269,7 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds) int64_t count; if (bmds->shared_base) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); aio_context_acquire(blk_get_aio_context(bb)); /* Skip unallocated sectors; intentionally treats failure or * partial sector as an allocated sector */ @@ -282,7 +282,7 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds) cur_sector += count >> BDRV_SECTOR_BITS; } aio_context_release(blk_get_aio_context(bb)); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } if (cur_sector >= total_sectors) { @@ -321,14 +321,14 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds) * This is ugly and will disappear when we make bdrv_* thread-safe, * without the need to acquire the AioContext. */ - qemu_mutex_lock_iothread(); + qemu_bql_lock(); aio_context_acquire(blk_get_aio_context(bmds->blk)); bdrv_reset_dirty_bitmap(bmds->dirty_bitmap, cur_sector * BDRV_SECTOR_SIZE, nr_sectors * BDRV_SECTOR_SIZE); blk->aiocb = blk_aio_preadv(bb, cur_sector * BDRV_SECTOR_SIZE, &blk->qiov, 0, blk_mig_read_cb, blk); aio_context_release(blk_get_aio_context(bmds->blk)); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); bmds->cur_sector = cur_sector + nr_sectors; return (bmds->cur_sector >= total_sectors); @@ -786,9 +786,9 @@ static int block_save_iterate(QEMUFile *f, void *opaque) /* Always called with iothread lock taken for * simplicity, block_save_complete also calls it. */ - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ret = blk_mig_save_dirty_block(f, 1); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } if (ret < 0) { return ret; @@ -860,9 +860,9 @@ static void block_state_pending(void *opaque, uint64_t *must_precopy, /* Estimate pending number of bytes to send */ uint64_t pending; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); pending = get_remaining_dirty(); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); blk_mig_lock(); pending += block_mig_state.submitted * BLK_MIG_BLOCK_SIZE + diff --git a/migration/colo.c b/migration/colo.c index 4447e34914..2e68107cfa 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -420,13 +420,13 @@ static int colo_do_checkpoint_transaction(MigrationState *s, qio_channel_io_seek(QIO_CHANNEL(bioc), 0, 0, NULL); bioc->usage = 0; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); if (failover_get_state() != FAILOVER_STATUS_NONE) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); goto out; } vm_stop_force_state(RUN_STATE_COLO); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); trace_colo_vm_state_change("run", "stop"); /* * Failover request bh could be called after vm_stop_force_state(), @@ -435,23 +435,23 @@ static int colo_do_checkpoint_transaction(MigrationState *s, if (failover_get_state() != FAILOVER_STATUS_NONE) { goto out; } - qemu_mutex_lock_iothread(); + qemu_bql_lock(); replication_do_checkpoint_all(&local_err); if (local_err) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); goto out; } colo_send_message(s->to_dst_file, COLO_MESSAGE_VMSTATE_SEND, &local_err); if (local_err) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); goto out; } /* Note: device state is saved into buffer */ ret = qemu_save_device_state(fb); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); if (ret < 0) { goto out; } @@ -504,9 +504,9 @@ static int colo_do_checkpoint_transaction(MigrationState *s, ret = 0; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); vm_start(); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); trace_colo_vm_state_change("stop", "run"); out: @@ -557,15 +557,15 @@ static void colo_process_checkpoint(MigrationState *s) fb = qemu_file_new_output(QIO_CHANNEL(bioc)); object_unref(OBJECT(bioc)); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); replication_start_all(REPLICATION_MODE_PRIMARY, &local_err); if (local_err) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); goto out; } vm_start(); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); trace_colo_vm_state_change("stop", "run"); timer_mod(s->colo_delay_timer, qemu_clock_get_ms(QEMU_CLOCK_HOST) + @@ -639,14 +639,14 @@ out: void migrate_start_colo_process(MigrationState *s) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); qemu_event_init(&s->colo_checkpoint_event, false); s->colo_delay_timer = timer_new_ms(QEMU_CLOCK_HOST, colo_checkpoint_notify, s); qemu_sem_init(&s->colo_exit_sem, 0); colo_process_checkpoint(s); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, @@ -657,9 +657,9 @@ static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, Error *local_err = NULL; int ret; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); vm_stop_force_state(RUN_STATE_COLO); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); trace_colo_vm_state_change("run", "stop"); /* FIXME: This is unnecessary for periodic checkpoint mode */ @@ -677,10 +677,10 @@ static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, return; } - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cpu_synchronize_all_states(); ret = qemu_loadvm_state_main(mis->from_src_file, mis); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); if (ret < 0) { error_setg(errp, "Load VM's live state (ram) error"); @@ -719,14 +719,14 @@ static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, return; } - qemu_mutex_lock_iothread(); + qemu_bql_lock(); vmstate_loading = true; colo_flush_ram_cache(); ret = qemu_load_device_state(fb); if (ret < 0) { error_setg(errp, "COLO: load device state failed"); vmstate_loading = false; - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return; } @@ -734,7 +734,7 @@ static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, if (local_err) { error_propagate(errp, local_err); vmstate_loading = false; - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return; } @@ -743,7 +743,7 @@ static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, if (local_err) { error_propagate(errp, local_err); vmstate_loading = false; - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return; } /* Notify all filters of all NIC to do checkpoint */ @@ -752,13 +752,13 @@ static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, if (local_err) { error_propagate(errp, local_err); vmstate_loading = false; - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return; } vmstate_loading = false; vm_start(); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); trace_colo_vm_state_change("stop", "run"); if (failover_get_state() == FAILOVER_STATUS_RELAUNCH) { @@ -851,14 +851,14 @@ static void *colo_process_incoming_thread(void *opaque) fb = qemu_file_new_input(QIO_CHANNEL(bioc)); object_unref(OBJECT(bioc)); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); replication_start_all(REPLICATION_MODE_SECONDARY, &local_err); if (local_err) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); goto out; } vm_start(); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); trace_colo_vm_state_change("stop", "run"); colo_send_message(mis->to_src_file, COLO_MESSAGE_CHECKPOINT_READY, @@ -920,7 +920,7 @@ int coroutine_fn colo_incoming_co(void) Error *local_err = NULL; QemuThread th; - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); if (!migration_incoming_colo_enabled()) { return 0; @@ -940,10 +940,10 @@ int coroutine_fn colo_incoming_co(void) qemu_coroutine_yield(); mis->colo_incoming_co = NULL; - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); /* Wait checkpoint incoming thread exit before free resource */ qemu_thread_join(&th); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); /* We hold the global iothread lock, so it is safe here */ colo_release_ram_cache(); diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 036ac017fc..1d705092cd 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -90,13 +90,13 @@ static int64_t do_calculate_dirtyrate(DirtyPageRecord dirty_pages, void global_dirty_log_change(unsigned int flag, bool start) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); if (start) { memory_global_dirty_log_start(flag); } else { memory_global_dirty_log_stop(flag); } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } /* @@ -106,12 +106,12 @@ void global_dirty_log_change(unsigned int flag, bool start) */ static void global_dirty_log_sync(unsigned int flag, bool one_shot) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); memory_global_dirty_log_sync(false); if (one_shot) { memory_global_dirty_log_stop(flag); } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } static DirtyPageRecord *vcpu_dirty_stat_alloc(VcpuStat *stat) @@ -610,7 +610,7 @@ static void calculate_dirtyrate_dirty_bitmap(struct DirtyRateConfig config) int64_t start_time; DirtyPageRecord dirty_pages; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); memory_global_dirty_log_start(GLOBAL_DIRTY_DIRTY_RATE); /* @@ -627,7 +627,7 @@ static void calculate_dirtyrate_dirty_bitmap(struct DirtyRateConfig config) * KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE cap is enabled. */ dirtyrate_manual_reset_protect(); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); record_dirtypages_bitmap(&dirty_pages, true); diff --git a/migration/migration.c b/migration/migration.c index 28a34c9068..b153133fba 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1293,12 +1293,12 @@ static void migrate_fd_cleanup(MigrationState *s) QEMUFile *tmp; trace_migrate_fd_cleanup(); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); if (s->migration_thread_running) { qemu_thread_join(&s->thread); s->migration_thread_running = false; } - qemu_mutex_lock_iothread(); + qemu_bql_lock(); multifd_save_cleanup(); qemu_mutex_lock(&s->qemu_file_lock); @@ -2410,7 +2410,7 @@ static int postcopy_start(MigrationState *ms, Error **errp) } trace_postcopy_start(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); trace_postcopy_start_set_run(); migration_downtime_start(ms); @@ -2519,7 +2519,7 @@ static int postcopy_start(MigrationState *ms, Error **errp) migration_downtime_end(ms); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); if (migrate_postcopy_ram()) { /* @@ -2560,7 +2560,7 @@ fail: error_report_err(local_err); } } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return -1; } @@ -2594,14 +2594,14 @@ static int migration_maybe_pause(MigrationState *s, * wait for the 'pause_sem' semaphore. */ if (s->state != MIGRATION_STATUS_CANCELLING) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); migrate_set_state(&s->state, *current_active_state, MIGRATION_STATUS_PRE_SWITCHOVER); qemu_sem_wait(&s->pause_sem); migrate_set_state(&s->state, MIGRATION_STATUS_PRE_SWITCHOVER, new_state); *current_active_state = new_state; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } return s->state == new_state ? 0 : -EINVAL; @@ -2612,7 +2612,7 @@ static int migration_completion_precopy(MigrationState *s, { int ret; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); migration_downtime_start(s); qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL); @@ -2640,7 +2640,7 @@ static int migration_completion_precopy(MigrationState *s, ret = qemu_savevm_state_complete_precopy(s->to_dst_file, false, s->block_inactive); out_unlock: - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return ret; } @@ -2648,9 +2648,9 @@ static void migration_completion_postcopy(MigrationState *s) { trace_migration_completion_postcopy_end(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qemu_savevm_state_complete_postcopy(s->to_dst_file); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); /* * Shutdown the postcopy fast path thread. This is only needed when dest @@ -2674,14 +2674,14 @@ static void migration_completion_failed(MigrationState *s, */ Error *local_err = NULL; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); bdrv_activate_all(&local_err); if (local_err) { error_report_err(local_err); } else { s->block_inactive = false; } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } migrate_set_state(&s->state, current_active_state, @@ -3121,7 +3121,7 @@ static void migration_iteration_finish(MigrationState *s) /* If we enabled cpu throttling for auto-converge, turn it off. */ cpu_throttle_stop(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); switch (s->state) { case MIGRATION_STATUS_COMPLETED: migration_calculate_complete(s); @@ -3152,7 +3152,7 @@ static void migration_iteration_finish(MigrationState *s) break; } migrate_fd_cleanup_schedule(s); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } static void bg_migration_iteration_finish(MigrationState *s) @@ -3164,7 +3164,7 @@ static void bg_migration_iteration_finish(MigrationState *s) */ ram_write_tracking_stop(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); switch (s->state) { case MIGRATION_STATUS_COMPLETED: migration_calculate_complete(s); @@ -3183,7 +3183,7 @@ static void bg_migration_iteration_finish(MigrationState *s) } migrate_fd_cleanup_schedule(s); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } /* @@ -3305,9 +3305,9 @@ static void *migration_thread(void *opaque) object_ref(OBJECT(s)); update_iteration_initial_status(s); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qemu_savevm_state_header(s->to_dst_file); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); /* * If we opened the return path, we need to make sure dst has it @@ -3335,9 +3335,9 @@ static void *migration_thread(void *opaque) qemu_savevm_send_colo_enable(s->to_dst_file); } - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qemu_savevm_state_setup(s->to_dst_file); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); qemu_savevm_wait_unplug(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_ACTIVE); @@ -3448,10 +3448,10 @@ static void *bg_migration_thread(void *opaque) ram_write_tracking_prepare(); #endif - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qemu_savevm_state_header(s->to_dst_file); qemu_savevm_state_setup(s->to_dst_file); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); qemu_savevm_wait_unplug(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_ACTIVE); @@ -3461,7 +3461,7 @@ static void *bg_migration_thread(void *opaque) trace_migration_thread_setup_complete(); migration_downtime_start(s); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); /* * If VM is currently in suspended state, then, to make a valid runstate @@ -3504,7 +3504,7 @@ static void *bg_migration_thread(void *opaque) s->vm_start_bh = qemu_bh_new(bg_migration_vm_start_bh, s); qemu_bh_schedule(s->vm_start_bh); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); while (migration_is_active(s)) { MigIterateState iter_state = bg_migration_iteration_run(s); @@ -3533,7 +3533,7 @@ fail: if (early_fail) { migrate_set_state(&s->state, MIGRATION_STATUS_ACTIVE, MIGRATION_STATUS_FAILED); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } bg_migration_iteration_finish(s); diff --git a/migration/ram.c b/migration/ram.c index 8c7886ab79..f274bcf655 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2984,9 +2984,9 @@ static int ram_save_setup(QEMUFile *f, void *opaque) migration_ops = g_malloc0(sizeof(MigrationOps)); migration_ops->ram_save_target_page = ram_save_target_page_legacy; - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); ret = multifd_send_sync_main(f); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); if (ret < 0) { return ret; } @@ -3221,11 +3221,11 @@ static void ram_state_pending_exact(void *opaque, uint64_t *must_precopy, uint64_t remaining_size = rs->migration_dirty_pages * TARGET_PAGE_SIZE; if (!migration_in_postcopy() && remaining_size < s->threshold_size) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); WITH_RCU_READ_LOCK_GUARD() { migration_bitmap_sync_precopy(rs, false); } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); remaining_size = rs->migration_dirty_pages * TARGET_PAGE_SIZE; } @@ -3453,7 +3453,7 @@ void colo_incoming_start_dirty_log(void) { RAMBlock *block = NULL; /* For memory_global_dirty_log_start below. */ - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qemu_mutex_lock_ramlist(); memory_global_dirty_log_sync(false); @@ -3467,7 +3467,7 @@ void colo_incoming_start_dirty_log(void) } ram_state->migration_dirty_pages = 0; qemu_mutex_unlock_ramlist(); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } /* It is need to hold the global lock to call this helper */ diff --git a/replay/replay-internal.c b/replay/replay-internal.c index 77d0c82327..04c9c6374b 100644 --- a/replay/replay-internal.c +++ b/replay/replay-internal.c @@ -216,7 +216,7 @@ void replay_mutex_lock(void) { if (replay_mode != REPLAY_MODE_NONE) { unsigned long id; - g_assert(!qemu_mutex_iothread_locked()); + g_assert(!qemu_bql_locked()); g_assert(!replay_mutex_locked()); qemu_mutex_lock(&lock); id = mutex_tail++; diff --git a/semihosting/console.c b/semihosting/console.c index 5d61e8207e..666285541d 100644 --- a/semihosting/console.c +++ b/semihosting/console.c @@ -43,7 +43,7 @@ static SemihostingConsole console; static int console_can_read(void *opaque) { SemihostingConsole *c = opaque; - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); return (int)fifo8_num_free(&c->fifo); } @@ -58,7 +58,7 @@ static void console_wake_up(gpointer data, gpointer user_data) static void console_read(void *opaque, const uint8_t *buf, int size) { SemihostingConsole *c = opaque; - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); while (size-- && !fifo8_is_full(&c->fifo)) { fifo8_push(&c->fifo, *buf++); } @@ -70,7 +70,7 @@ bool qemu_semihosting_console_ready(void) { SemihostingConsole *c = &console; - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); return !fifo8_is_empty(&c->fifo); } @@ -78,7 +78,7 @@ void qemu_semihosting_console_block_until_ready(CPUState *cs) { SemihostingConsole *c = &console; - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); /* Block if the fifo is completely empty. */ if (fifo8_is_empty(&c->fifo)) { diff --git a/stubs/iothread-lock.c b/stubs/iothread-lock.c index 5b45b7fc8b..1f24c3203a 100644 --- a/stubs/iothread-lock.c +++ b/stubs/iothread-lock.c @@ -1,15 +1,15 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" -bool qemu_mutex_iothread_locked(void) +bool qemu_bql_locked(void) { return false; } -void qemu_mutex_lock_iothread_impl(const char *file, int line) +void qemu_bql_lock_impl(const char *file, int line) { } -void qemu_mutex_unlock_iothread(void) +void qemu_bql_unlock(void) { } diff --git a/system/cpu-throttle.c b/system/cpu-throttle.c index d9bb30a223..e98836311b 100644 --- a/system/cpu-throttle.c +++ b/system/cpu-throttle.c @@ -57,9 +57,9 @@ static void cpu_throttle_thread(CPUState *cpu, run_on_cpu_data opaque) qemu_cond_timedwait_iothread(cpu->halt_cond, sleeptime_ns / SCALE_MS); } else { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); g_usleep(sleeptime_ns / SCALE_US); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } sleeptime_ns = endtime_ns - qemu_clock_get_ns(QEMU_CLOCK_REALTIME); } diff --git a/system/cpus.c b/system/cpus.c index a444a747f0..d5b98c11f5 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -481,35 +481,35 @@ bool qemu_in_vcpu_thread(void) return current_cpu && qemu_cpu_is_self(current_cpu); } -QEMU_DEFINE_STATIC_CO_TLS(bool, iothread_locked) +QEMU_DEFINE_STATIC_CO_TLS(bool, bql_locked) -bool qemu_mutex_iothread_locked(void) +bool qemu_bql_locked(void) { - return get_iothread_locked(); + return get_bql_locked(); } bool qemu_in_main_thread(void) { - return qemu_mutex_iothread_locked(); + return qemu_bql_locked(); } /* * The BQL is taken from so many places that it is worth profiling the * callers directly, instead of funneling them all through a single function. */ -void qemu_mutex_lock_iothread_impl(const char *file, int line) +void qemu_bql_lock_impl(const char *file, int line) { QemuMutexLockFunc bql_lock = qatomic_read(&qemu_bql_mutex_lock_func); - g_assert(!qemu_mutex_iothread_locked()); + g_assert(!qemu_bql_locked()); bql_lock(&qemu_global_mutex, file, line); - set_iothread_locked(true); + set_bql_locked(true); } -void qemu_mutex_unlock_iothread(void) +void qemu_bql_unlock(void) { - g_assert(qemu_mutex_iothread_locked()); - set_iothread_locked(false); + g_assert(qemu_bql_locked()); + set_bql_locked(false); qemu_mutex_unlock(&qemu_global_mutex); } @@ -577,9 +577,9 @@ void pause_all_vcpus(void) } } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); replay_mutex_lock(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } void cpu_resume(CPUState *cpu) @@ -608,9 +608,9 @@ void cpu_remove_sync(CPUState *cpu) cpu->stop = true; cpu->unplug = true; qemu_cpu_kick(cpu); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); qemu_thread_join(cpu->thread); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } void cpus_register_accel(const AccelOpsClass *ops) diff --git a/system/dirtylimit.c b/system/dirtylimit.c index 495c7a7082..f89bf6b61f 100644 --- a/system/dirtylimit.c +++ b/system/dirtylimit.c @@ -148,9 +148,9 @@ void vcpu_dirty_rate_stat_stop(void) { qatomic_set(&vcpu_dirty_rate_stat->running, 0); dirtylimit_state_unlock(); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); qemu_thread_join(&vcpu_dirty_rate_stat->thread); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); dirtylimit_state_lock(); } diff --git a/system/memory.c b/system/memory.c index 4d9cb0a7ff..8d78334cb2 100644 --- a/system/memory.c +++ b/system/memory.c @@ -1119,7 +1119,7 @@ void memory_region_transaction_commit(void) AddressSpace *as; assert(memory_region_transaction_depth); - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); --memory_region_transaction_depth; if (!memory_region_transaction_depth) { diff --git a/system/physmem.c b/system/physmem.c index a63853a7bc..c136675876 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -2639,8 +2639,8 @@ bool prepare_mmio_access(MemoryRegion *mr) { bool release_lock = false; - if (!qemu_mutex_iothread_locked()) { - qemu_mutex_lock_iothread(); + if (!qemu_bql_locked()) { + qemu_bql_lock(); release_lock = true; } if (mr->flush_coalesced_mmio) { @@ -2721,7 +2721,7 @@ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr, } if (release_lock) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); release_lock = false; } @@ -2799,7 +2799,7 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, } if (release_lock) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); release_lock = false; } diff --git a/system/runstate.c b/system/runstate.c index ea9d6c2a32..5718e6827c 100644 --- a/system/runstate.c +++ b/system/runstate.c @@ -810,7 +810,7 @@ void qemu_init_subsystems(void) qemu_init_cpu_list(); qemu_init_cpu_loop(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); atexit(qemu_run_exit_notifiers); diff --git a/system/watchpoint.c b/system/watchpoint.c index ba5ad13352..d9cc71dd33 100644 --- a/system/watchpoint.c +++ b/system/watchpoint.c @@ -155,9 +155,9 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len, * Now raise the debug interrupt so that it will * trigger after the current instruction. */ - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cpu_interrupt(cpu, CPU_INTERRUPT_DEBUG); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return; } diff --git a/target/arm/arm-powerctl.c b/target/arm/arm-powerctl.c index c078849403..aec104834d 100644 --- a/target/arm/arm-powerctl.c +++ b/target/arm/arm-powerctl.c @@ -88,7 +88,7 @@ static void arm_set_cpu_on_async_work(CPUState *target_cpu_state, g_free(info); /* Finally set the power status */ - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); target_cpu->power_state = PSCI_ON; } @@ -99,7 +99,7 @@ int arm_set_cpu_on(uint64_t cpuid, uint64_t entry, uint64_t context_id, ARMCPU *target_cpu; struct CpuOnInfo *info; - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); DPRINTF("cpu %" PRId64 " (EL %d, %s) @ 0x%" PRIx64 " with R0 = 0x%" PRIx64 "\n", cpuid, target_el, target_aa64 ? "aarch64" : "aarch32", entry, @@ -196,7 +196,7 @@ static void arm_set_cpu_on_and_reset_async_work(CPUState *target_cpu_state, target_cpu_state->halted = 0; /* Finally set the power status */ - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); target_cpu->power_state = PSCI_ON; } @@ -205,7 +205,7 @@ int arm_set_cpu_on_and_reset(uint64_t cpuid) CPUState *target_cpu_state; ARMCPU *target_cpu; - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); /* Retrieve the cpu we are powering up */ target_cpu_state = arm_get_cpu_by_id(cpuid); @@ -247,7 +247,7 @@ static void arm_set_cpu_off_async_work(CPUState *target_cpu_state, { ARMCPU *target_cpu = ARM_CPU(target_cpu_state); - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); target_cpu->power_state = PSCI_OFF; target_cpu_state->halted = 1; target_cpu_state->exception_index = EXCP_HLT; @@ -258,7 +258,7 @@ int arm_set_cpu_off(uint64_t cpuid) CPUState *target_cpu_state; ARMCPU *target_cpu; - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); DPRINTF("cpu %" PRId64 "\n", cpuid); @@ -294,7 +294,7 @@ int arm_reset_cpu(uint64_t cpuid) CPUState *target_cpu_state; ARMCPU *target_cpu; - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); DPRINTF("cpu %" PRId64 "\n", cpuid); diff --git a/target/arm/helper.c b/target/arm/helper.c index 2746d3fdac..f472043986 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5831,7 +5831,7 @@ static void do_hcr_write(CPUARMState *env, uint64_t value, uint64_t valid_mask) * VFIQ are masked unless running at EL0 or EL1, and HCR * can only be written at EL2. */ - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); arm_cpu_update_virq(cpu); arm_cpu_update_vfiq(cpu); arm_cpu_update_vserr(cpu); @@ -11344,7 +11344,7 @@ void arm_cpu_do_interrupt(CPUState *cs) * BQL needs to be held for any modification of * cs->interrupt_request. */ - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); arm_call_pre_el_change_hook(cpu); diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 757e13b0f9..017fd13c5d 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -1718,9 +1718,9 @@ static void hvf_wait_for_ipi(CPUState *cpu, struct timespec *ts) * sleeping. */ qatomic_set_mb(&cpu->thread_kicked, false); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); pselect(0, 0, 0, 0, ts, &cpu->accel->unblock_ipi_mask); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } static void hvf_wfi(CPUState *cpu) @@ -1821,7 +1821,7 @@ int hvf_vcpu_exec(CPUState *cpu) flush_cpu_state(cpu); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); assert_hvf_ok(hv_vcpu_run(cpu->accel->fd)); /* handle VMEXIT */ @@ -1830,7 +1830,7 @@ int hvf_vcpu_exec(CPUState *cpu) uint32_t ec = syn_get_ec(syndrome); ret = 0; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); switch (exit_reason) { case HV_EXIT_REASON_EXCEPTION: /* This is the main one, handle below. */ diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 7903e2ddde..431b82e509 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -833,7 +833,7 @@ MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run) if (run->s.regs.device_irq_level != cpu->device_irq_level) { switched_level = cpu->device_irq_level ^ run->s.regs.device_irq_level; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); if (switched_level & KVM_ARM_DEV_EL1_VTIMER) { qemu_set_irq(cpu->gt_timer_outputs[GTIMER_VIRT], @@ -862,7 +862,7 @@ MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run) /* We also mark unknown levels as processed to not waste cycles */ cpu->device_irq_level = run->s.regs.device_irq_level; - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } return MEMTXATTRS_UNSPECIFIED; diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index 3c175c93a7..282dc5920e 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -1233,9 +1233,9 @@ bool kvm_arm_handle_debug(CPUState *cs, struct kvm_debug_exit_arch *debug_exit) env->exception.syndrome = debug_exit->hsr; env->exception.vaddress = debug_exit->far; env->exception.target_el = 1; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); arm_cpu_do_interrupt(cs); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return false; } diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 1762b058ae..e3cc0a7ab8 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -772,9 +772,9 @@ static uint64_t arm_casq_ptw(CPUARMState *env, uint64_t old_val, #if !TCG_OVERSIZED_GUEST # error "Unexpected configuration" #endif - bool locked = qemu_mutex_iothread_locked(); + bool locked = qemu_bql_locked(); if (!locked) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } if (ptw->out_be) { cur_val = ldq_be_p(host); @@ -788,7 +788,7 @@ static uint64_t arm_casq_ptw(CPUARMState *env, uint64_t old_val, } } if (!locked) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } #endif diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c index 8ad84623d3..22d453e6e0 100644 --- a/target/arm/tcg/helper-a64.c +++ b/target/arm/tcg/helper-a64.c @@ -809,9 +809,9 @@ void HELPER(exception_return)(CPUARMState *env, uint64_t new_pc) goto illegal_return; } - qemu_mutex_lock_iothread(); + qemu_bql_lock(); arm_call_pre_el_change_hook(env_archcpu(env)); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); if (!return_to_aa64) { env->aarch64 = false; @@ -876,9 +876,9 @@ void HELPER(exception_return)(CPUARMState *env, uint64_t new_pc) */ aarch64_sve_change_el(env, cur_el, new_el, return_to_aa64); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); arm_call_el_change_hook(env_archcpu(env)); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return; diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c index a26adb75aa..5f38b9a4a1 100644 --- a/target/arm/tcg/m_helper.c +++ b/target/arm/tcg/m_helper.c @@ -374,7 +374,7 @@ void HELPER(v7m_preserve_fp_state)(CPUARMState *env) bool take_exception; /* Take the iothread lock as we are going to touch the NVIC */ - qemu_mutex_lock_iothread(); + qemu_bql_lock(); /* Check the background context had access to the FPU */ if (!v7m_cpacr_pass(env, is_secure, is_priv)) { @@ -428,7 +428,7 @@ void HELPER(v7m_preserve_fp_state)(CPUARMState *env) take_exception = !stacked_ok && armv7m_nvic_can_take_pending_exception(env->nvic); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); if (take_exception) { raise_exception_ra(env, EXCP_LAZYFP, 0, 1, GETPC()); diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c index ea08936a85..46a14aac52 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -427,9 +427,9 @@ void HELPER(cpsr_write_eret)(CPUARMState *env, uint32_t val) { uint32_t mask; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); arm_call_pre_el_change_hook(env_archcpu(env)); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); mask = aarch32_cpsr_valid_mask(env->features, &env_archcpu(env)->isar); cpsr_write(env, val, mask, CPSRWriteExceptionReturn); @@ -442,9 +442,9 @@ void HELPER(cpsr_write_eret)(CPUARMState *env, uint32_t val) env->regs[15] &= (env->thumb ? ~1 : ~3); arm_rebuild_hflags(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); arm_call_el_change_hook(env_archcpu(env)); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } /* Access to user mode registers from privileged modes. */ @@ -803,9 +803,9 @@ void HELPER(set_cp_reg)(CPUARMState *env, const void *rip, uint32_t value) const ARMCPRegInfo *ri = rip; if (ri->type & ARM_CP_IO) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ri->writefn(env, ri, value); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } else { ri->writefn(env, ri, value); } @@ -817,9 +817,9 @@ uint32_t HELPER(get_cp_reg)(CPUARMState *env, const void *rip) uint32_t res; if (ri->type & ARM_CP_IO) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); res = ri->readfn(env, ri); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } else { res = ri->readfn(env, ri); } @@ -832,9 +832,9 @@ void HELPER(set_cp_reg64)(CPUARMState *env, const void *rip, uint64_t value) const ARMCPRegInfo *ri = rip; if (ri->type & ARM_CP_IO) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ri->writefn(env, ri, value); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } else { ri->writefn(env, ri, value); } @@ -846,9 +846,9 @@ uint64_t HELPER(get_cp_reg64)(CPUARMState *env, const void *rip) uint64_t res; if (ri->type & ARM_CP_IO) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); res = ri->readfn(env, ri); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } else { res = ri->readfn(env, ri); } diff --git a/target/arm/tcg/psci.c b/target/arm/tcg/psci.c index 6c1239bb96..51af10db99 100644 --- a/target/arm/tcg/psci.c +++ b/target/arm/tcg/psci.c @@ -107,7 +107,7 @@ void arm_handle_psci_call(ARMCPU *cpu) } target_cpu = ARM_CPU(target_cpu_state); - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); ret = target_cpu->power_state; break; default: diff --git a/target/hppa/int_helper.c b/target/hppa/int_helper.c index 98e9d688f6..9ef8cf7ff4 100644 --- a/target/hppa/int_helper.c +++ b/target/hppa/int_helper.c @@ -84,17 +84,17 @@ void hppa_cpu_alarm_timer(void *opaque) void HELPER(write_eirr)(CPUHPPAState *env, target_ulong val) { env->cr[CR_EIRR] &= ~val; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); eval_interrupt(env_archcpu(env)); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(write_eiem)(CPUHPPAState *env, target_ulong val) { env->cr[CR_EIEM] = val; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); eval_interrupt(env_archcpu(env)); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void hppa_cpu_do_interrupt(CPUState *cs) diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index 20b9ca3ef5..2cc8b115f7 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -429,9 +429,9 @@ int hvf_vcpu_exec(CPUState *cpu) } vmx_update_tpr(cpu); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); if (!cpu_is_bsp(X86_CPU(cpu)) && cpu->halted) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); return EXCP_HLT; } @@ -450,7 +450,7 @@ int hvf_vcpu_exec(CPUState *cpu) rip = rreg(cpu->accel->fd, HV_X86_RIP); env->eflags = rreg(cpu->accel->fd, HV_X86_RFLAGS); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); update_apic_tpr(cpu); current_cpu = cpu; diff --git a/target/i386/kvm/hyperv.c b/target/i386/kvm/hyperv.c index e3ac978648..dcad09f6c9 100644 --- a/target/i386/kvm/hyperv.c +++ b/target/i386/kvm/hyperv.c @@ -45,9 +45,9 @@ void hyperv_x86_synic_update(X86CPU *cpu) static void async_synic_update(CPUState *cs, run_on_cpu_data data) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); hyperv_x86_synic_update(X86_CPU(cs)); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } int kvm_hv_handle_exit(X86CPU *cpu, struct kvm_hyperv_exit *exit) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 11b8177eff..084f5e6b8b 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -4705,9 +4705,9 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run) /* Inject NMI */ if (cpu->interrupt_request & (CPU_INTERRUPT_NMI | CPU_INTERRUPT_SMI)) { if (cpu->interrupt_request & CPU_INTERRUPT_NMI) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cpu->interrupt_request &= ~CPU_INTERRUPT_NMI; - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); DPRINTF("injected NMI\n"); ret = kvm_vcpu_ioctl(cpu, KVM_NMI); if (ret < 0) { @@ -4716,9 +4716,9 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run) } } if (cpu->interrupt_request & CPU_INTERRUPT_SMI) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cpu->interrupt_request &= ~CPU_INTERRUPT_SMI; - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); DPRINTF("injected SMI\n"); ret = kvm_vcpu_ioctl(cpu, KVM_SMI); if (ret < 0) { @@ -4729,7 +4729,7 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run) } if (!kvm_pic_in_kernel()) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } /* Force the VCPU out of its inner loop to process any INIT requests @@ -4782,7 +4782,7 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run) DPRINTF("setting tpr\n"); run->cr8 = cpu_get_apic_tpr(x86_cpu->apic_state); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } } @@ -4830,12 +4830,12 @@ MemTxAttrs kvm_arch_post_run(CPUState *cpu, struct kvm_run *run) /* We need to protect the apic state against concurrent accesses from * different threads in case the userspace irqchip is used. */ if (!kvm_irqchip_in_kernel()) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } cpu_set_apic_tpr(x86_cpu->apic_state, run->cr8); cpu_set_apic_base(x86_cpu->apic_state, run->apic_base); if (!kvm_irqchip_in_kernel()) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } return cpu_get_mem_attrs(env); } @@ -5269,17 +5269,17 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) switch (run->exit_reason) { case KVM_EXIT_HLT: DPRINTF("handle_hlt\n"); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ret = kvm_handle_halt(cpu); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); break; case KVM_EXIT_SET_TPR: ret = 0; break; case KVM_EXIT_TPR_ACCESS: - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ret = kvm_handle_tpr_access(cpu); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); break; case KVM_EXIT_FAIL_ENTRY: code = run->fail_entry.hardware_entry_failure_reason; @@ -5305,9 +5305,9 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) break; case KVM_EXIT_DEBUG: DPRINTF("kvm_exit_debug\n"); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ret = kvm_handle_debug(cpu, &run->debug.arch); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); break; case KVM_EXIT_HYPERV: ret = kvm_hv_handle_exit(cpu, &run->hyperv); diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c index c0631f9cf4..f79f5d270f 100644 --- a/target/i386/kvm/xen-emu.c +++ b/target/i386/kvm/xen-emu.c @@ -403,7 +403,7 @@ void kvm_xen_maybe_deassert_callback(CPUState *cs) /* If the evtchn_upcall_pending flag is cleared, turn the GSI off. */ if (!vi->evtchn_upcall_pending) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); /* * Check again now we have the lock, because it may have been * asserted in the interim. And we don't want to take the lock @@ -413,7 +413,7 @@ void kvm_xen_maybe_deassert_callback(CPUState *cs) X86_CPU(cs)->env.xen_callback_asserted = false; xen_evtchn_set_callback_level(0); } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } } @@ -773,9 +773,9 @@ static bool handle_set_param(struct kvm_xen_exit *exit, X86CPU *cpu, switch (hp.index) { case HVM_PARAM_CALLBACK_IRQ: - qemu_mutex_lock_iothread(); + qemu_bql_lock(); err = xen_evtchn_set_callback_param(hp.value); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); xen_set_long_mode(exit->u.hcall.longmode); break; default: @@ -1408,7 +1408,7 @@ int kvm_xen_soft_reset(void) CPUState *cpu; int err; - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); trace_kvm_xen_soft_reset(); @@ -1481,9 +1481,9 @@ static int schedop_shutdown(CPUState *cs, uint64_t arg) break; case SHUTDOWN_soft_reset: - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ret = kvm_xen_soft_reset(); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); break; default: diff --git a/target/i386/nvmm/nvmm-accel-ops.c b/target/i386/nvmm/nvmm-accel-ops.c index 6c46101ac1..387ccfcce5 100644 --- a/target/i386/nvmm/nvmm-accel-ops.c +++ b/target/i386/nvmm/nvmm-accel-ops.c @@ -25,7 +25,7 @@ static void *qemu_nvmm_cpu_thread_fn(void *arg) rcu_register_thread(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qemu_thread_get_self(cpu->thread); cpu->thread_id = qemu_get_thread_id(); current_cpu = cpu; @@ -55,7 +55,7 @@ static void *qemu_nvmm_cpu_thread_fn(void *arg) nvmm_destroy_vcpu(cpu); cpu_thread_signal_destroyed(cpu); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); rcu_unregister_thread(); return NULL; } diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c index 7d752bc5e0..9fa5b2e34a 100644 --- a/target/i386/nvmm/nvmm-all.c +++ b/target/i386/nvmm/nvmm-all.c @@ -399,7 +399,7 @@ nvmm_vcpu_pre_run(CPUState *cpu) uint8_t tpr; int ret; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); tpr = cpu_get_apic_tpr(x86_cpu->apic_state); if (tpr != qcpu->tpr) { @@ -462,7 +462,7 @@ nvmm_vcpu_pre_run(CPUState *cpu) } } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } /* @@ -485,9 +485,9 @@ nvmm_vcpu_post_run(CPUState *cpu, struct nvmm_vcpu_exit *exit) tpr = exit->exitstate.cr8; if (qcpu->tpr != tpr) { qcpu->tpr = tpr; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cpu_set_apic_tpr(x86_cpu->apic_state, qcpu->tpr); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } } @@ -648,7 +648,7 @@ nvmm_handle_halted(struct nvmm_machine *mach, CPUState *cpu, CPUX86State *env = cpu_env(cpu); int ret = 0; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); if (!((cpu->interrupt_request & CPU_INTERRUPT_HARD) && (env->eflags & IF_MASK)) && @@ -658,7 +658,7 @@ nvmm_handle_halted(struct nvmm_machine *mach, CPUState *cpu, ret = 1; } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return ret; } @@ -721,7 +721,7 @@ nvmm_vcpu_loop(CPUState *cpu) return 0; } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); cpu_exec_start(cpu); /* @@ -806,16 +806,16 @@ nvmm_vcpu_loop(CPUState *cpu) error_report("NVMM: Unexpected VM exit code 0x%lx [hw=0x%lx]", exit->reason, exit->u.inv.hwcode); nvmm_get_registers(cpu); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qemu_system_guest_panicked(cpu_get_crash_info(cpu)); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); ret = -1; break; } } while (ret == 0); cpu_exec_end(cpu); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qatomic_set(&cpu->exit_request, false); diff --git a/target/i386/tcg/sysemu/fpu_helper.c b/target/i386/tcg/sysemu/fpu_helper.c index 93506cdd94..4960e97ebc 100644 --- a/target/i386/tcg/sysemu/fpu_helper.c +++ b/target/i386/tcg/sysemu/fpu_helper.c @@ -32,9 +32,9 @@ void x86_register_ferr_irq(qemu_irq irq) void fpu_check_raise_ferr_irq(CPUX86State *env) { if (ferr_irq && !(env->hflags2 & HF2_IGNNE_MASK)) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qemu_irq_raise(ferr_irq); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return; } } @@ -49,7 +49,7 @@ void cpu_set_ignne(void) { CPUX86State *env = &X86_CPU(first_cpu)->env; - assert(qemu_mutex_iothread_locked()); + assert(qemu_bql_locked()); env->hflags2 |= HF2_IGNNE_MASK; /* diff --git a/target/i386/tcg/sysemu/misc_helper.c b/target/i386/tcg/sysemu/misc_helper.c index e1528b7f80..e859879f4f 100644 --- a/target/i386/tcg/sysemu/misc_helper.c +++ b/target/i386/tcg/sysemu/misc_helper.c @@ -118,9 +118,9 @@ void helper_write_crN(CPUX86State *env, int reg, target_ulong t0) break; case 8: if (!(env->hflags2 & HF2_VINTR_MASK)) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cpu_set_apic_tpr(env_archcpu(env)->apic_state, t0); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } env->int_ctl = (env->int_ctl & ~V_TPR_MASK) | (t0 & V_TPR_MASK); diff --git a/target/i386/whpx/whpx-accel-ops.c b/target/i386/whpx/whpx-accel-ops.c index 67cad86720..1f29346a88 100644 --- a/target/i386/whpx/whpx-accel-ops.c +++ b/target/i386/whpx/whpx-accel-ops.c @@ -25,7 +25,7 @@ static void *whpx_cpu_thread_fn(void *arg) rcu_register_thread(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qemu_thread_get_self(cpu->thread); cpu->thread_id = qemu_get_thread_id(); current_cpu = cpu; @@ -55,7 +55,7 @@ static void *whpx_cpu_thread_fn(void *arg) whpx_destroy_vcpu(cpu); cpu_thread_signal_destroyed(cpu); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); rcu_unregister_thread(); return NULL; } diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index d29ba916a0..50057b22ee 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -1324,7 +1324,7 @@ static int whpx_first_vcpu_starting(CPUState *cpu) struct whpx_state *whpx = &whpx_global; HRESULT hr; - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); if (!QTAILQ_EMPTY(&cpu->breakpoints) || (whpx->breakpoints.breakpoints && @@ -1442,7 +1442,7 @@ static int whpx_handle_halt(CPUState *cpu) CPUX86State *env = cpu_env(cpu); int ret = 0; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); if (!((cpu->interrupt_request & CPU_INTERRUPT_HARD) && (env->eflags & IF_MASK)) && !(cpu->interrupt_request & CPU_INTERRUPT_NMI)) { @@ -1450,7 +1450,7 @@ static int whpx_handle_halt(CPUState *cpu) cpu->halted = true; ret = 1; } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return ret; } @@ -1472,7 +1472,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) memset(&new_int, 0, sizeof(new_int)); memset(reg_values, 0, sizeof(reg_values)); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); /* Inject NMI */ if (!vcpu->interruption_pending && @@ -1563,7 +1563,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) reg_count += 1; } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); vcpu->ready_for_pic_interrupt = false; if (reg_count) { @@ -1590,9 +1590,9 @@ static void whpx_vcpu_post_run(CPUState *cpu) uint64_t tpr = vcpu->exit_ctx.VpContext.Cr8; if (vcpu->tpr != tpr) { vcpu->tpr = tpr; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cpu_set_apic_tpr(x86_cpu->apic_state, whpx_cr8_to_apic_tpr(vcpu->tpr)); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } vcpu->interruption_pending = @@ -1652,7 +1652,7 @@ static int whpx_vcpu_run(CPUState *cpu) WhpxStepMode exclusive_step_mode = WHPX_STEP_NONE; int ret; - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); if (whpx->running_cpus++ == 0) { /* Insert breakpoints into memory, update exception exit bitmap. */ @@ -1690,7 +1690,7 @@ static int whpx_vcpu_run(CPUState *cpu) } } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); if (exclusive_step_mode != WHPX_STEP_NONE) { start_exclusive(); @@ -2028,9 +2028,9 @@ static int whpx_vcpu_run(CPUState *cpu) error_report("WHPX: Unexpected VP exit code %d", vcpu->exit_ctx.ExitReason); whpx_get_registers(cpu); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); qemu_system_guest_panicked(cpu_get_crash_info(cpu)); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); break; } @@ -2055,7 +2055,7 @@ static int whpx_vcpu_run(CPUState *cpu) cpu_exec_end(cpu); } - qemu_mutex_lock_iothread(); + qemu_bql_lock(); current_cpu = cpu; if (--whpx->running_cpus == 0) { diff --git a/target/loongarch/csr_helper.c b/target/loongarch/csr_helper.c index 55341551a5..fa3f08335e 100644 --- a/target/loongarch/csr_helper.c +++ b/target/loongarch/csr_helper.c @@ -89,9 +89,9 @@ target_ulong helper_csrwr_ticlr(CPULoongArchState *env, target_ulong val) int64_t old_v = 0; if (val & 0x1) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); loongarch_cpu_set_irq(cpu, IRQ_TIMER, 0); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } return old_v; } diff --git a/target/mips/kvm.c b/target/mips/kvm.c index e22e24ed97..7e2bac9a84 100644 --- a/target/mips/kvm.c +++ b/target/mips/kvm.c @@ -138,7 +138,7 @@ void kvm_arch_pre_run(CPUState *cs, struct kvm_run *run) int r; struct kvm_mips_interrupt intr; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); if ((cs->interrupt_request & CPU_INTERRUPT_HARD) && cpu_mips_io_interrupts_pending(cpu)) { @@ -151,7 +151,7 @@ void kvm_arch_pre_run(CPUState *cs, struct kvm_run *run) } } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run) diff --git a/target/mips/tcg/sysemu/cp0_helper.c b/target/mips/tcg/sysemu/cp0_helper.c index d349548743..fe87b72a2c 100644 --- a/target/mips/tcg/sysemu/cp0_helper.c +++ b/target/mips/tcg/sysemu/cp0_helper.c @@ -59,9 +59,9 @@ static inline void mips_vpe_wake(MIPSCPU *c) * because there might be other conditions that state that c should * be sleeping. */ - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cpu_interrupt(CPU(c), CPU_INTERRUPT_WAKE); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } static inline void mips_vpe_sleep(MIPSCPU *cpu) diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c index 782a5751b7..1e9a55cec1 100644 --- a/target/openrisc/sys_helper.c +++ b/target/openrisc/sys_helper.c @@ -160,20 +160,20 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb) break; case TO_SPR(9, 0): /* PICMR */ env->picmr = rb; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); if (env->picsr & env->picmr) { cpu_interrupt(cs, CPU_INTERRUPT_HARD); } else { cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD); } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); break; case TO_SPR(9, 2): /* PICSR */ env->picsr &= ~rb; break; case TO_SPR(10, 0): /* TTMR */ { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); if ((env->ttmr & TTMR_M) ^ (rb & TTMR_M)) { switch (rb & TTMR_M) { case TIMER_NONE: @@ -198,15 +198,15 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb) cs->interrupt_request &= ~CPU_INTERRUPT_TIMER; } cpu_openrisc_timer_update(cpu); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } break; case TO_SPR(10, 1): /* TTCR */ - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cpu_openrisc_count_set(cpu, rb); cpu_openrisc_timer_update(cpu); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); break; } #endif @@ -347,9 +347,9 @@ target_ulong HELPER(mfspr)(CPUOpenRISCState *env, target_ulong rd, return env->ttmr; case TO_SPR(10, 1): /* TTCR */ - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cpu_openrisc_count_update(cpu); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return cpu_openrisc_count_get(cpu); } #endif diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index a42743a3e0..0a1c942831 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -3056,7 +3056,7 @@ void helper_msgsnd(target_ulong rb) return; } - qemu_mutex_lock_iothread(); + qemu_bql_lock(); CPU_FOREACH(cs) { PowerPCCPU *cpu = POWERPC_CPU(cs); CPUPPCState *cenv = &cpu->env; @@ -3065,7 +3065,7 @@ void helper_msgsnd(target_ulong rb) ppc_set_irq(cpu, irq, 1); } } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } /* Server Processor Control */ @@ -3093,7 +3093,7 @@ static void book3s_msgsnd_common(int pir, int irq) { CPUState *cs; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); CPU_FOREACH(cs) { PowerPCCPU *cpu = POWERPC_CPU(cs); CPUPPCState *cenv = &cpu->env; @@ -3103,7 +3103,7 @@ static void book3s_msgsnd_common(int pir, int irq) ppc_set_irq(cpu, irq, 1); } } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void helper_book3s_msgsnd(target_ulong rb) @@ -3157,14 +3157,14 @@ void helper_book3s_msgsndp(CPUPPCState *env, target_ulong rb) } /* Does iothread need to be locked for walking CPU list? */ - qemu_mutex_lock_iothread(); + qemu_bql_lock(); THREAD_SIBLING_FOREACH(cs, ccs) { PowerPCCPU *ccpu = POWERPC_CPU(ccs); uint32_t thread_id = ppc_cpu_tir(ccpu); if (ttir == thread_id) { ppc_set_irq(ccpu, PPC_INTERRUPT_DOORBELL, 1); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return; } } diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 9b1abe2fc4..132834505c 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -1656,7 +1656,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) CPUPPCState *env = &cpu->env; int ret; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); switch (run->exit_reason) { case KVM_EXIT_DCR: @@ -1715,7 +1715,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) break; } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return ret; } diff --git a/target/ppc/misc_helper.c b/target/ppc/misc_helper.c index a05bdf78c9..41ef14bf24 100644 --- a/target/ppc/misc_helper.c +++ b/target/ppc/misc_helper.c @@ -238,7 +238,7 @@ target_ulong helper_load_dpdes(CPUPPCState *env) return dpdes; } - qemu_mutex_lock_iothread(); + qemu_bql_lock(); THREAD_SIBLING_FOREACH(cs, ccs) { PowerPCCPU *ccpu = POWERPC_CPU(ccs); CPUPPCState *cenv = &ccpu->env; @@ -248,7 +248,7 @@ target_ulong helper_load_dpdes(CPUPPCState *env) dpdes |= (0x1 << thread_id); } } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return dpdes; } @@ -278,14 +278,14 @@ void helper_store_dpdes(CPUPPCState *env, target_ulong val) } /* Does iothread need to be locked for walking CPU list? */ - qemu_mutex_lock_iothread(); + qemu_bql_lock(); THREAD_SIBLING_FOREACH(cs, ccs) { PowerPCCPU *ccpu = POWERPC_CPU(ccs); uint32_t thread_id = ppc_cpu_tir(ccpu); ppc_set_irq(cpu, PPC_INTERRUPT_DOORBELL, val & (0x1 << thread_id)); } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } #endif /* defined(TARGET_PPC64) */ diff --git a/target/ppc/timebase_helper.c b/target/ppc/timebase_helper.c index 08a6b47ee0..4cc0572fad 100644 --- a/target/ppc/timebase_helper.c +++ b/target/ppc/timebase_helper.c @@ -173,9 +173,9 @@ target_ulong helper_load_dcr(CPUPPCState *env, target_ulong dcrn) } else { int ret; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ret = ppc_dcr_read(env->dcr_env, (uint32_t)dcrn, &val); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); if (unlikely(ret != 0)) { qemu_log_mask(LOG_GUEST_ERROR, "DCR read error %d %03x\n", (uint32_t)dcrn, (uint32_t)dcrn); @@ -196,9 +196,9 @@ void helper_store_dcr(CPUPPCState *env, target_ulong dcrn, target_ulong val) POWERPC_EXCP_INVAL_INVAL, GETPC()); } else { int ret; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ret = ppc_dcr_write(env->dcr_env, (uint32_t)dcrn, (uint32_t)val); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); if (unlikely(ret != 0)) { qemu_log_mask(LOG_GUEST_ERROR, "DCR write error %d %03x\n", (uint32_t)dcrn, (uint32_t)dcrn); diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c index 33ab3551f4..27533d0401 100644 --- a/target/s390x/kvm/kvm.c +++ b/target/s390x/kvm/kvm.c @@ -1923,7 +1923,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) S390CPU *cpu = S390_CPU(cs); int ret = 0; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); kvm_cpu_synchronize_state(cs); @@ -1947,7 +1947,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) fprintf(stderr, "Unknown KVM exit: %d\n", run->exit_reason); break; } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); if (ret == 0) { ret = EXCP_INTERRUPT; diff --git a/target/s390x/tcg/misc_helper.c b/target/s390x/tcg/misc_helper.c index 6aa7907438..4be69c5ae8 100644 --- a/target/s390x/tcg/misc_helper.c +++ b/target/s390x/tcg/misc_helper.c @@ -101,9 +101,9 @@ uint64_t HELPER(stck)(CPUS390XState *env) /* SCLP service call */ uint32_t HELPER(servc)(CPUS390XState *env, uint64_t r1, uint64_t r2) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); int r = sclp_service_call(env_archcpu(env), r1, r2); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); if (r < 0) { tcg_s390_program_interrupt(env, -r, GETPC()); } @@ -117,9 +117,9 @@ void HELPER(diag)(CPUS390XState *env, uint32_t r1, uint32_t r3, uint32_t num) switch (num) { case 0x500: /* KVM hypercall */ - qemu_mutex_lock_iothread(); + qemu_bql_lock(); r = s390_virtio_hypercall(env); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); break; case 0x44: /* yield */ @@ -127,9 +127,9 @@ void HELPER(diag)(CPUS390XState *env, uint32_t r1, uint32_t r3, uint32_t num) break; case 0x308: /* ipl */ - qemu_mutex_lock_iothread(); + qemu_bql_lock(); handle_diag_308(env, r1, r3, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); r = 0; break; case 0x288: @@ -185,7 +185,7 @@ static void update_ckc_timer(CPUS390XState *env) /* stop the timer and remove pending CKC IRQs */ timer_del(env->tod_timer); - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); env->pending_int &= ~INTERRUPT_EXT_CLOCK_COMPARATOR; /* the tod has to exceed the ckc, this can never happen if ckc is all 1's */ @@ -207,9 +207,9 @@ void HELPER(sckc)(CPUS390XState *env, uint64_t ckc) { env->ckc = ckc; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); update_ckc_timer(env); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque) @@ -229,9 +229,9 @@ uint32_t HELPER(sck)(CPUS390XState *env, uint64_t tod_low) .low = tod_low, }; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); tdc->set(td, &tod, &error_abort); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return 0; } @@ -421,9 +421,9 @@ uint32_t HELPER(sigp)(CPUS390XState *env, uint64_t order_code, uint32_t r1, int cc; /* TODO: needed to inject interrupts - push further down */ - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cc = handle_sigp(env, order_code & SIGP_ORDER_MASK, r1, r3); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return cc; } @@ -433,92 +433,92 @@ uint32_t HELPER(sigp)(CPUS390XState *env, uint64_t order_code, uint32_t r1, void HELPER(xsch)(CPUS390XState *env, uint64_t r1) { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ioinst_handle_xsch(cpu, r1, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(csch)(CPUS390XState *env, uint64_t r1) { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ioinst_handle_csch(cpu, r1, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(hsch)(CPUS390XState *env, uint64_t r1) { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ioinst_handle_hsch(cpu, r1, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(msch)(CPUS390XState *env, uint64_t r1, uint64_t inst) { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ioinst_handle_msch(cpu, r1, inst >> 16, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(rchp)(CPUS390XState *env, uint64_t r1) { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ioinst_handle_rchp(cpu, r1, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(rsch)(CPUS390XState *env, uint64_t r1) { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ioinst_handle_rsch(cpu, r1, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(sal)(CPUS390XState *env, uint64_t r1) { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ioinst_handle_sal(cpu, r1, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(schm)(CPUS390XState *env, uint64_t r1, uint64_t r2, uint64_t inst) { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ioinst_handle_schm(cpu, r1, r2, inst >> 16, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(ssch)(CPUS390XState *env, uint64_t r1, uint64_t inst) { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ioinst_handle_ssch(cpu, r1, inst >> 16, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(stcrw)(CPUS390XState *env, uint64_t inst) { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ioinst_handle_stcrw(cpu, inst >> 16, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(stsch)(CPUS390XState *env, uint64_t r1, uint64_t inst) { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ioinst_handle_stsch(cpu, r1, inst >> 16, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } uint32_t HELPER(tpi)(CPUS390XState *env, uint64_t addr) @@ -533,10 +533,10 @@ uint32_t HELPER(tpi)(CPUS390XState *env, uint64_t addr) tcg_s390_program_interrupt(env, PGM_SPECIFICATION, ra); } - qemu_mutex_lock_iothread(); + qemu_bql_lock(); io = qemu_s390_flic_dequeue_io(flic, env->cregs[6]); if (!io) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return 0; } @@ -554,7 +554,7 @@ uint32_t HELPER(tpi)(CPUS390XState *env, uint64_t addr) if (s390_cpu_virt_mem_write(cpu, addr, 0, &intc, sizeof(intc))) { /* writing failed, reinject and properly clean up */ s390_io_interrupt(io->id, io->nr, io->parm, io->word); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); g_free(io); s390_cpu_virt_mem_handle_exc(cpu, ra); return 0; @@ -570,24 +570,24 @@ uint32_t HELPER(tpi)(CPUS390XState *env, uint64_t addr) } g_free(io); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return 1; } void HELPER(tsch)(CPUS390XState *env, uint64_t r1, uint64_t inst) { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ioinst_handle_tsch(cpu, r1, inst >> 16, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(chsc)(CPUS390XState *env, uint64_t inst) { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); ioinst_handle_chsc(cpu, inst >> 16, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } #endif @@ -726,27 +726,27 @@ void HELPER(clp)(CPUS390XState *env, uint32_t r2) { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); clp_service_call(cpu, r2, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(pcilg)(CPUS390XState *env, uint32_t r1, uint32_t r2) { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); pcilg_service_call(cpu, r1, r2, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(pcistg)(CPUS390XState *env, uint32_t r1, uint32_t r2) { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); pcistg_service_call(cpu, r1, r2, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(stpcifc)(CPUS390XState *env, uint32_t r1, uint64_t fiba, @@ -754,9 +754,9 @@ void HELPER(stpcifc)(CPUS390XState *env, uint32_t r1, uint64_t fiba, { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); stpcifc_service_call(cpu, r1, fiba, ar, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(sic)(CPUS390XState *env, uint64_t r1, uint64_t r3) @@ -764,9 +764,9 @@ void HELPER(sic)(CPUS390XState *env, uint64_t r1, uint64_t r3) S390CPU *cpu = env_archcpu(env); int r; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); r = css_do_sic(cpu, (r3 >> 27) & 0x7, r1 & 0xffff); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); /* css_do_sic() may actually return a PGM_xxx value to inject */ if (r) { tcg_s390_program_interrupt(env, -r, GETPC()); @@ -777,9 +777,9 @@ void HELPER(rpcit)(CPUS390XState *env, uint32_t r1, uint32_t r2) { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); rpcit_service_call(cpu, r1, r2, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(pcistb)(CPUS390XState *env, uint32_t r1, uint32_t r3, @@ -787,9 +787,9 @@ void HELPER(pcistb)(CPUS390XState *env, uint32_t r1, uint32_t r3, { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); pcistb_service_call(cpu, r1, r3, gaddr, ar, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(mpcifc)(CPUS390XState *env, uint32_t r1, uint64_t fiba, @@ -797,8 +797,8 @@ void HELPER(mpcifc)(CPUS390XState *env, uint32_t r1, uint64_t fiba, { S390CPU *cpu = env_archcpu(env); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); mpcifc_service_call(cpu, r1, fiba, ar, GETPC()); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } #endif diff --git a/target/sparc/int32_helper.c b/target/sparc/int32_helper.c index 1563613582..3fd28a04e7 100644 --- a/target/sparc/int32_helper.c +++ b/target/sparc/int32_helper.c @@ -70,7 +70,7 @@ void cpu_check_irqs(CPUSPARCState *env) CPUState *cs; /* We should be holding the BQL before we mess with IRQs */ - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); if (env->pil_in && (env->interrupt_index == 0 || (env->interrupt_index & ~15) == TT_EXTINT)) { diff --git a/target/sparc/int64_helper.c b/target/sparc/int64_helper.c index 1b4155f5f3..dacbbf6b5b 100644 --- a/target/sparc/int64_helper.c +++ b/target/sparc/int64_helper.c @@ -69,7 +69,7 @@ void cpu_check_irqs(CPUSPARCState *env) (env->softint & ~(SOFTINT_TIMER | SOFTINT_STIMER)); /* We should be holding the BQL before we mess with IRQs */ - g_assert(qemu_mutex_iothread_locked()); + g_assert(qemu_bql_locked()); /* TT_IVEC has a higher priority (16) than TT_EXTINT (31..17) */ if (env->ivec_status & 0x20) { @@ -267,9 +267,9 @@ static bool do_modify_softint(CPUSPARCState *env, uint32_t value) env->softint = value; #if !defined(CONFIG_USER_ONLY) if (cpu_interrupts_enabled(env)) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cpu_check_irqs(env); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } #endif return true; diff --git a/target/sparc/win_helper.c b/target/sparc/win_helper.c index 16d1c70fe7..ba666ec50e 100644 --- a/target/sparc/win_helper.c +++ b/target/sparc/win_helper.c @@ -179,9 +179,9 @@ void helper_wrpsr(CPUSPARCState *env, target_ulong new_psr) cpu_raise_exception_ra(env, TT_ILL_INSN, GETPC()); } else { /* cpu_put_psr may trigger interrupts, hence BQL */ - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cpu_put_psr(env, new_psr); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } } @@ -407,9 +407,9 @@ void helper_wrpstate(CPUSPARCState *env, target_ulong new_state) #if !defined(CONFIG_USER_ONLY) if (cpu_interrupts_enabled(env)) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cpu_check_irqs(env); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } #endif } @@ -422,9 +422,9 @@ void helper_wrpil(CPUSPARCState *env, target_ulong new_pil) env->psrpil = new_pil; if (cpu_interrupts_enabled(env)) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cpu_check_irqs(env); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } #endif } @@ -451,9 +451,9 @@ void helper_done(CPUSPARCState *env) #if !defined(CONFIG_USER_ONLY) if (cpu_interrupts_enabled(env)) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cpu_check_irqs(env); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } #endif } @@ -480,9 +480,9 @@ void helper_retry(CPUSPARCState *env) #if !defined(CONFIG_USER_ONLY) if (cpu_interrupts_enabled(env)) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); cpu_check_irqs(env); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } #endif } diff --git a/target/xtensa/exc_helper.c b/target/xtensa/exc_helper.c index 91354884f7..405387decb 100644 --- a/target/xtensa/exc_helper.c +++ b/target/xtensa/exc_helper.c @@ -105,9 +105,9 @@ void HELPER(waiti)(CPUXtensaState *env, uint32_t pc, uint32_t intlevel) env->sregs[PS] = (env->sregs[PS] & ~PS_INTLEVEL) | (intlevel << PS_INTLEVEL_SHIFT); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); check_interrupts(env); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); if (env->pending_irq_level) { cpu_loop_exit(cpu); @@ -120,9 +120,9 @@ void HELPER(waiti)(CPUXtensaState *env, uint32_t pc, uint32_t intlevel) void HELPER(check_interrupts)(CPUXtensaState *env) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); check_interrupts(env); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } void HELPER(intset)(CPUXtensaState *env, uint32_t v) diff --git a/ui/spice-core.c b/ui/spice-core.c index db21db2c94..1d895d2fe8 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -222,7 +222,7 @@ static void channel_event(int event, SpiceChannelEventInfo *info) */ bool need_lock = !qemu_thread_is_self(&me); if (need_lock) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } if (info->flags & SPICE_CHANNEL_EVENT_FLAG_ADDR_EXT) { @@ -260,7 +260,7 @@ static void channel_event(int event, SpiceChannelEventInfo *info) } if (need_lock) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } qapi_free_SpiceServerInfo(server); diff --git a/util/async.c b/util/async.c index 8f90ddc304..49d07b3c73 100644 --- a/util/async.c +++ b/util/async.c @@ -741,7 +741,7 @@ AioContext *qemu_get_current_aio_context(void) if (ctx) { return ctx; } - if (qemu_mutex_iothread_locked()) { + if (qemu_bql_locked()) { /* Possibly in a vCPU thread. */ return qemu_get_aio_context(); } diff --git a/util/main-loop.c b/util/main-loop.c index 797b640c41..921fab3f32 100644 --- a/util/main-loop.c +++ b/util/main-loop.c @@ -302,13 +302,13 @@ static int os_host_main_loop_wait(int64_t timeout) glib_pollfds_fill(&timeout); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); replay_mutex_unlock(); ret = qemu_poll_ns((GPollFD *)gpollfds->data, gpollfds->len, timeout); replay_mutex_lock(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); glib_pollfds_poll(); @@ -517,7 +517,7 @@ static int os_host_main_loop_wait(int64_t timeout) poll_timeout_ns = qemu_soonest_timeout(poll_timeout_ns, timeout); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); replay_mutex_unlock(); @@ -525,7 +525,7 @@ static int os_host_main_loop_wait(int64_t timeout) replay_mutex_lock(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); if (g_poll_ret > 0) { for (i = 0; i < w->num; i++) { w->revents[i] = poll_fds[n_poll_fds + i].revents; diff --git a/util/rcu.c b/util/rcu.c index e587bcc483..8331f24288 100644 --- a/util/rcu.c +++ b/util/rcu.c @@ -283,24 +283,24 @@ static void *call_rcu_thread(void *opaque) qatomic_sub(&rcu_call_count, n); synchronize_rcu(); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); while (n > 0) { node = try_dequeue(); while (!node) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); qemu_event_reset(&rcu_call_ready_event); node = try_dequeue(); if (!node) { qemu_event_wait(&rcu_call_ready_event); node = try_dequeue(); } - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } n--; node->func(node); } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } abort(); } @@ -337,13 +337,13 @@ static void drain_rcu_callback(struct rcu_head *node) void drain_call_rcu(void) { struct rcu_drain rcu_drain; - bool locked = qemu_mutex_iothread_locked(); + bool locked = qemu_bql_locked(); memset(&rcu_drain, 0, sizeof(struct rcu_drain)); qemu_event_init(&rcu_drain.drain_complete_event, false); if (locked) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } @@ -365,7 +365,7 @@ void drain_call_rcu(void) qatomic_dec(&in_drain_call_rcu); if (locked) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } } diff --git a/audio/coreaudio.m b/audio/coreaudio.m index 8cd129a27d..866d7a9436 100644 --- a/audio/coreaudio.m +++ b/audio/coreaudio.m @@ -547,7 +547,7 @@ static OSStatus handle_voice_change( { coreaudioVoiceOut *core = in_client_data; - qemu_mutex_lock_iothread(); + qemu_bql_lock(); if (core->outputDeviceID) { fini_out_device(core); @@ -557,7 +557,7 @@ static OSStatus handle_voice_change( update_device_playback_state(core); } - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); return 0; } diff --git a/memory_ldst.c.inc b/memory_ldst.c.inc index 84b868f294..cd8a629816 100644 --- a/memory_ldst.c.inc +++ b/memory_ldst.c.inc @@ -61,7 +61,7 @@ static inline uint32_t glue(address_space_ldl_internal, SUFFIX)(ARG1_DECL, *result = r; } if (release_lock) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } RCU_READ_UNLOCK(); return val; @@ -130,7 +130,7 @@ static inline uint64_t glue(address_space_ldq_internal, SUFFIX)(ARG1_DECL, *result = r; } if (release_lock) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } RCU_READ_UNLOCK(); return val; @@ -186,7 +186,7 @@ uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, *result = r; } if (release_lock) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } RCU_READ_UNLOCK(); return val; @@ -234,7 +234,7 @@ static inline uint16_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL, *result = r; } if (release_lock) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } RCU_READ_UNLOCK(); return val; @@ -295,7 +295,7 @@ void glue(address_space_stl_notdirty, SUFFIX)(ARG1_DECL, *result = r; } if (release_lock) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } RCU_READ_UNLOCK(); } @@ -339,7 +339,7 @@ static inline void glue(address_space_stl_internal, SUFFIX)(ARG1_DECL, *result = r; } if (release_lock) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } RCU_READ_UNLOCK(); } @@ -391,7 +391,7 @@ void glue(address_space_stb, SUFFIX)(ARG1_DECL, *result = r; } if (release_lock) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } RCU_READ_UNLOCK(); } @@ -435,7 +435,7 @@ static inline void glue(address_space_stw_internal, SUFFIX)(ARG1_DECL, *result = r; } if (release_lock) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } RCU_READ_UNLOCK(); } @@ -499,7 +499,7 @@ static void glue(address_space_stq_internal, SUFFIX)(ARG1_DECL, *result = r; } if (release_lock) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } RCU_READ_UNLOCK(); } diff --git a/target/i386/hvf/README.md b/target/i386/hvf/README.md index 2d33477aca..679b93b630 100644 --- a/target/i386/hvf/README.md +++ b/target/i386/hvf/README.md @@ -4,4 +4,4 @@ These sources (and ../hvf-all.c) are adapted from Veertu Inc's vdhh (Veertu Desk 1. Adapt to our current QEMU's `CPUState` structure and `address_space_rw` API; many struct members have been moved around (emulated x86 state, xsave_buf) due to historical differences + QEMU needing to handle more emulation targets. 2. Removal of `apic_page` and hyperv-related functionality. -3. More relaxed use of `qemu_mutex_lock_iothread`. +3. More relaxed use of `qemu_bql_lock`. diff --git a/ui/cocoa.m b/ui/cocoa.m index cd069da696..8a7d0a6f0c 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -117,29 +117,29 @@ static void cocoa_switch(DisplayChangeListener *dcl, typedef void (^CodeBlock)(void); typedef bool (^BoolCodeBlock)(void); -static void with_iothread_lock(CodeBlock block) +static void with_bql(CodeBlock block) { - bool locked = qemu_mutex_iothread_locked(); + bool locked = qemu_bql_locked(); if (!locked) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } block(); if (!locked) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } } -static bool bool_with_iothread_lock(BoolCodeBlock block) +static bool bool_with_bql(BoolCodeBlock block) { - bool locked = qemu_mutex_iothread_locked(); + bool locked = qemu_bql_locked(); bool val; if (!locked) { - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } val = block(); if (!locked) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); } return val; } @@ -605,7 +605,7 @@ - (void) updateUIInfo return; } - with_iothread_lock(^{ + with_bql(^{ [self updateUIInfoLocked]; }); } @@ -790,7 +790,7 @@ - (void) handleMonitorInput:(NSEvent *)event - (bool) handleEvent:(NSEvent *)event { - return bool_with_iothread_lock(^{ + return bool_with_bql(^{ return [self handleEventLocked:event]; }); } @@ -1182,7 +1182,7 @@ - (QEMUScreen) gscreen {return screen;} */ - (void) raiseAllKeys { - with_iothread_lock(^{ + with_bql(^{ qkbd_state_lift_all_keys(kbd); }); } @@ -1282,7 +1282,7 @@ - (void)applicationWillTerminate:(NSNotification *)aNotification { COCOA_DEBUG("QemuCocoaAppController: applicationWillTerminate\n"); - with_iothread_lock(^{ + with_bql(^{ shutdown_action = SHUTDOWN_ACTION_POWEROFF; qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_UI); }); @@ -1420,7 +1420,7 @@ - (void)displayConsole:(id)sender /* Pause the guest */ - (void)pauseQEMU:(id)sender { - with_iothread_lock(^{ + with_bql(^{ qmp_stop(NULL); }); [sender setEnabled: NO]; @@ -1431,7 +1431,7 @@ - (void)pauseQEMU:(id)sender /* Resume running the guest operating system */ - (void)resumeQEMU:(id) sender { - with_iothread_lock(^{ + with_bql(^{ qmp_cont(NULL); }); [sender setEnabled: NO]; @@ -1461,7 +1461,7 @@ - (void)removePause /* Restarts QEMU */ - (void)restartQEMU:(id)sender { - with_iothread_lock(^{ + with_bql(^{ qmp_system_reset(NULL); }); } @@ -1469,7 +1469,7 @@ - (void)restartQEMU:(id)sender /* Powers down QEMU */ - (void)powerDownQEMU:(id)sender { - with_iothread_lock(^{ + with_bql(^{ qmp_system_powerdown(NULL); }); } @@ -1488,7 +1488,7 @@ - (void)ejectDeviceMedia:(id)sender } __block Error *err = NULL; - with_iothread_lock(^{ + with_bql(^{ qmp_eject([drive cStringUsingEncoding: NSASCIIStringEncoding], NULL, false, false, &err); }); @@ -1523,7 +1523,7 @@ - (void)changeDeviceMedia:(id)sender } __block Error *err = NULL; - with_iothread_lock(^{ + with_bql(^{ qmp_blockdev_change_medium([drive cStringUsingEncoding: NSASCIIStringEncoding], NULL, @@ -1605,7 +1605,7 @@ - (void)adjustSpeed:(id)sender // get the throttle percentage throttle_pct = [sender tag]; - with_iothread_lock(^{ + with_bql(^{ cpu_throttle_set(throttle_pct); }); COCOA_DEBUG("cpu throttling at %d%c\n", cpu_throttle_get_percentage(), '%'); @@ -1819,7 +1819,7 @@ - (void)pasteboard:(NSPasteboard *)sender provideDataForType:(NSPasteboardType)t return; } - with_iothread_lock(^{ + with_bql(^{ QemuClipboardInfo *info = qemu_clipboard_info_ref(cbinfo); qemu_event_reset(&cbevent); qemu_clipboard_request(info, QEMU_CLIPBOARD_TYPE_TEXT); @@ -1827,9 +1827,9 @@ - (void)pasteboard:(NSPasteboard *)sender provideDataForType:(NSPasteboardType)t while (info == cbinfo && info->types[QEMU_CLIPBOARD_TYPE_TEXT].available && info->types[QEMU_CLIPBOARD_TYPE_TEXT].data == NULL) { - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); qemu_event_wait(&cbevent); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); } if (info == cbinfo) { @@ -1927,9 +1927,9 @@ static void cocoa_clipboard_request(QemuClipboardInfo *info, int status; COCOA_DEBUG("Second thread: calling qemu_default_main()\n"); - qemu_mutex_lock_iothread(); + qemu_bql_lock(); status = qemu_default_main(); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); COCOA_DEBUG("Second thread: qemu_default_main() returned, exiting\n"); [cbowner release]; exit(status); @@ -1941,7 +1941,7 @@ static int cocoa_main(void) COCOA_DEBUG("Entered %s()\n", __func__); - qemu_mutex_unlock_iothread(); + qemu_bql_unlock(); qemu_thread_create(&thread, "qemu_main", call_qemu_main, NULL, QEMU_THREAD_DETACHED); -- 2.42.0 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* Re: [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() 2023-11-29 21:26 ` [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() Stefan Hajnoczi @ 2023-11-30 9:02 ` Paul Durrant 2023-11-30 12:20 ` Fabiano Rosas ` (5 subsequent siblings) 6 siblings, 0 replies; 34+ messages in thread From: Paul Durrant @ 2023-11-30 9:02 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang On 29/11/2023 21:26, Stefan Hajnoczi wrote: > The Big QEMU Lock (BQL) has many names and they are confusing. The > actual QemuMutex variable is called qemu_global_mutex but it's commonly > referred to as the BQL in discussions and some code comments. The > locking APIs, however, are called qemu_mutex_lock_iothread() and > qemu_mutex_unlock_iothread(). > > The "iothread" name is historic and comes from when the main thread was > split into into KVM vcpu threads and the "iothread" (now called the main > loop thread). I have contributed to the confusion myself by introducing > a separate --object iothread, a separate concept unrelated to the BQL. > > The "iothread" name is no longer appropriate for the BQL. Rename the > locking APIs to: > - void qemu_bql_lock(void) > - void qemu_bql_unlock(void) > - bool qemu_bql_locked(void) > > There are more APIs with "iothread" in their names. Subsequent patches > will rename them. There are also comments and documentation that will be > updated in later patches. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > include/block/aio-wait.h | 2 +- > include/qemu/main-loop.h | 26 +++--- > accel/accel-blocker.c | 10 +-- > accel/dummy-cpus.c | 8 +- > accel/hvf/hvf-accel-ops.c | 4 +- > accel/kvm/kvm-accel-ops.c | 4 +- > accel/kvm/kvm-all.c | 22 ++--- > accel/tcg/cpu-exec.c | 26 +++--- > accel/tcg/cputlb.c | 16 ++-- > accel/tcg/tcg-accel-ops-icount.c | 4 +- > accel/tcg/tcg-accel-ops-mttcg.c | 12 +-- > accel/tcg/tcg-accel-ops-rr.c | 14 ++-- > accel/tcg/tcg-accel-ops.c | 2 +- > accel/tcg/translate-all.c | 2 +- > cpu-common.c | 4 +- > dump/dump.c | 4 +- > hw/core/cpu-common.c | 6 +- > hw/i386/intel_iommu.c | 6 +- > hw/i386/kvm/xen_evtchn.c | 16 ++-- > hw/i386/kvm/xen_overlay.c | 2 +- > hw/i386/kvm/xen_xenstore.c | 2 +- > hw/intc/arm_gicv3_cpuif.c | 2 +- > hw/intc/s390_flic.c | 18 ++-- > hw/misc/edu.c | 4 +- > hw/misc/imx6_src.c | 2 +- > hw/misc/imx7_src.c | 2 +- > hw/net/xen_nic.c | 8 +- > hw/ppc/pegasos2.c | 2 +- > hw/ppc/ppc.c | 4 +- > hw/ppc/spapr.c | 2 +- > hw/ppc/spapr_rng.c | 4 +- > hw/ppc/spapr_softmmu.c | 4 +- > hw/remote/mpqemu-link.c | 12 +-- > hw/remote/vfio-user-obj.c | 2 +- > hw/s390x/s390-skeys.c | 2 +- > migration/block-dirty-bitmap.c | 4 +- > migration/block.c | 16 ++-- > migration/colo.c | 60 +++++++------- > migration/dirtyrate.c | 12 +-- > migration/migration.c | 52 ++++++------ > migration/ram.c | 12 +-- > replay/replay-internal.c | 2 +- > semihosting/console.c | 8 +- > stubs/iothread-lock.c | 6 +- > system/cpu-throttle.c | 4 +- > system/cpus.c | 28 +++---- > system/dirtylimit.c | 4 +- > system/memory.c | 2 +- > system/physmem.c | 8 +- > system/runstate.c | 2 +- > system/watchpoint.c | 4 +- > target/arm/arm-powerctl.c | 14 ++-- > target/arm/helper.c | 4 +- > target/arm/hvf/hvf.c | 8 +- > target/arm/kvm.c | 4 +- > target/arm/kvm64.c | 4 +- > target/arm/ptw.c | 6 +- > target/arm/tcg/helper-a64.c | 8 +- > target/arm/tcg/m_helper.c | 4 +- > target/arm/tcg/op_helper.c | 24 +++--- > target/arm/tcg/psci.c | 2 +- > target/hppa/int_helper.c | 8 +- > target/i386/hvf/hvf.c | 6 +- > target/i386/kvm/hyperv.c | 4 +- > target/i386/kvm/kvm.c | 28 +++---- > target/i386/kvm/xen-emu.c | 14 ++-- > target/i386/nvmm/nvmm-accel-ops.c | 4 +- > target/i386/nvmm/nvmm-all.c | 20 ++--- > target/i386/tcg/sysemu/fpu_helper.c | 6 +- > target/i386/tcg/sysemu/misc_helper.c | 4 +- > target/i386/whpx/whpx-accel-ops.c | 4 +- > target/i386/whpx/whpx-all.c | 24 +++--- > target/loongarch/csr_helper.c | 4 +- > target/mips/kvm.c | 4 +- > target/mips/tcg/sysemu/cp0_helper.c | 4 +- > target/openrisc/sys_helper.c | 16 ++-- > target/ppc/excp_helper.c | 12 +-- > target/ppc/kvm.c | 4 +- > target/ppc/misc_helper.c | 8 +- > target/ppc/timebase_helper.c | 8 +- > target/s390x/kvm/kvm.c | 4 +- > target/s390x/tcg/misc_helper.c | 118 +++++++++++++-------------- > target/sparc/int32_helper.c | 2 +- > target/sparc/int64_helper.c | 6 +- > target/sparc/win_helper.c | 20 ++--- > target/xtensa/exc_helper.c | 8 +- > ui/spice-core.c | 4 +- > util/async.c | 2 +- > util/main-loop.c | 8 +- > util/rcu.c | 14 ++-- > audio/coreaudio.m | 4 +- > memory_ldst.c.inc | 18 ++-- > target/i386/hvf/README.md | 2 +- > ui/cocoa.m | 50 ++++++------ > 94 files changed, 502 insertions(+), 502 deletions(-) > Reviewed-by: Paul Durrant <paul@xen.org> ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() 2023-11-29 21:26 ` [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() Stefan Hajnoczi 2023-11-30 9:02 ` Paul Durrant @ 2023-11-30 12:20 ` Fabiano Rosas 2023-11-30 12:25 ` David Woodhouse ` (4 subsequent siblings) 6 siblings, 0 replies; 34+ messages in thread From: Fabiano Rosas @ 2023-11-30 12:20 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel Cc: Jean-Christophe Dubois, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, Stefan Hajnoczi, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang Stefan Hajnoczi <stefanha@redhat.com> writes: > The Big QEMU Lock (BQL) has many names and they are confusing. The > actual QemuMutex variable is called qemu_global_mutex but it's commonly > referred to as the BQL in discussions and some code comments. The > locking APIs, however, are called qemu_mutex_lock_iothread() and > qemu_mutex_unlock_iothread(). > > The "iothread" name is historic and comes from when the main thread was > split into into KVM vcpu threads and the "iothread" (now called the main > loop thread). I have contributed to the confusion myself by introducing > a separate --object iothread, a separate concept unrelated to the BQL. > > The "iothread" name is no longer appropriate for the BQL. Rename the > locking APIs to: > - void qemu_bql_lock(void) > - void qemu_bql_unlock(void) > - bool qemu_bql_locked(void) > > There are more APIs with "iothread" in their names. Subsequent patches > will rename them. There are also comments and documentation that will be > updated in later patches. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Acked-by: Fabiano Rosas <farosas@suse.de> ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() 2023-11-29 21:26 ` [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() Stefan Hajnoczi 2023-11-30 9:02 ` Paul Durrant 2023-11-30 12:20 ` Fabiano Rosas @ 2023-11-30 12:25 ` David Woodhouse 2023-11-30 12:57 ` Cédric Le Goater ` (3 subsequent siblings) 6 siblings, 0 replies; 34+ messages in thread From: David Woodhouse @ 2023-11-30 12:25 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang [-- Attachment #1: Type: text/plain, Size: 1160 bytes --] On Wed, 2023-11-29 at 16:26 -0500, Stefan Hajnoczi wrote: > The Big QEMU Lock (BQL) has many names and they are confusing. The > actual QemuMutex variable is called qemu_global_mutex but it's commonly > referred to as the BQL in discussions and some code comments. The > locking APIs, however, are called qemu_mutex_lock_iothread() and > qemu_mutex_unlock_iothread(). > > The "iothread" name is historic and comes from when the main thread was > split into into KVM vcpu threads and the "iothread" (now called the main > loop thread). I have contributed to the confusion myself by introducing > a separate --object iothread, a separate concept unrelated to the BQL. > > The "iothread" name is no longer appropriate for the BQL. Rename the > locking APIs to: > - void qemu_bql_lock(void) > - void qemu_bql_unlock(void) > - bool qemu_bql_locked(void) > > There are more APIs with "iothread" in their names. Subsequent patches > will rename them. There are also comments and documentation that will be > updated in later patches. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Acked-by: David Woodhouse <dwmw@amazon.co.uk> [-- Attachment #2: smime.p7s --] [-- Type: application/pkcs7-signature, Size: 5965 bytes --] ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() 2023-11-29 21:26 ` [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() Stefan Hajnoczi ` (2 preceding siblings ...) 2023-11-30 12:25 ` David Woodhouse @ 2023-11-30 12:57 ` Cédric Le Goater 2023-11-30 20:08 ` Peter Xu ` (2 subsequent siblings) 6 siblings, 0 replies; 34+ messages in thread From: Cédric Le Goater @ 2023-11-30 12:57 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang On 11/29/23 22:26, Stefan Hajnoczi wrote: > The Big QEMU Lock (BQL) has many names and they are confusing. The > actual QemuMutex variable is called qemu_global_mutex but it's commonly > referred to as the BQL in discussions and some code comments. The > locking APIs, however, are called qemu_mutex_lock_iothread() and > qemu_mutex_unlock_iothread(). > > The "iothread" name is historic and comes from when the main thread was > split into into KVM vcpu threads and the "iothread" (now called the main > loop thread). I have contributed to the confusion myself by introducing > a separate --object iothread, a separate concept unrelated to the BQL. > > The "iothread" name is no longer appropriate for the BQL. Rename the > locking APIs to: > - void qemu_bql_lock(void) > - void qemu_bql_unlock(void) > - bool qemu_bql_locked(void) > > There are more APIs with "iothread" in their names. Subsequent patches > will rename them. There are also comments and documentation that will be > updated in later patches. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() 2023-11-29 21:26 ` [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() Stefan Hajnoczi ` (3 preceding siblings ...) 2023-11-30 12:57 ` Cédric Le Goater @ 2023-11-30 20:08 ` Peter Xu 2023-11-30 20:43 ` Stefan Hajnoczi 2023-11-30 21:48 ` Eric Farman 2023-12-01 5:12 ` Harsh Prateek Bora 6 siblings, 1 reply; 34+ messages in thread From: Peter Xu @ 2023-11-30 20:08 UTC (permalink / raw) To: Stefan Hajnoczi Cc: qemu-devel, Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang On Wed, Nov 29, 2023 at 04:26:20PM -0500, Stefan Hajnoczi wrote: > The Big QEMU Lock (BQL) has many names and they are confusing. The > actual QemuMutex variable is called qemu_global_mutex but it's commonly > referred to as the BQL in discussions and some code comments. The > locking APIs, however, are called qemu_mutex_lock_iothread() and > qemu_mutex_unlock_iothread(). > > The "iothread" name is historic and comes from when the main thread was > split into into KVM vcpu threads and the "iothread" (now called the main > loop thread). I have contributed to the confusion myself by introducing > a separate --object iothread, a separate concept unrelated to the BQL. > > The "iothread" name is no longer appropriate for the BQL. Rename the > locking APIs to: > - void qemu_bql_lock(void) > - void qemu_bql_unlock(void) > - bool qemu_bql_locked(void) > > There are more APIs with "iothread" in their names. Subsequent patches > will rename them. There are also comments and documentation that will be > updated in later patches. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Acked-by: Peter Xu <peterx@redhat.com> Two nickpicks: - BQL contains "QEMU" as the 2nd character, so maybe easier to further rename qemu_bql into bql_? - Could we keep the full spell of BQL at some places, so people can still reference it if not familiar? IIUC most of the BQL helpers will root back to the major three functions (_lock, _unlock, _locked), perhaps add a comment of "BQL stands for..." over these three functions as comment? Please take or ignore these nitpicks; my ACK will stand irrelevant. Thanks, -- Peter Xu ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() 2023-11-30 20:08 ` Peter Xu @ 2023-11-30 20:43 ` Stefan Hajnoczi 2023-11-30 20:56 ` Peter Xu 2023-11-30 21:41 ` BALATON Zoltan 0 siblings, 2 replies; 34+ messages in thread From: Stefan Hajnoczi @ 2023-11-30 20:43 UTC (permalink / raw) To: Peter Xu Cc: qemu-devel, Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang [-- Attachment #1: Type: text/plain, Size: 2355 bytes --] On Thu, Nov 30, 2023 at 03:08:49PM -0500, Peter Xu wrote: > On Wed, Nov 29, 2023 at 04:26:20PM -0500, Stefan Hajnoczi wrote: > > The Big QEMU Lock (BQL) has many names and they are confusing. The > > actual QemuMutex variable is called qemu_global_mutex but it's commonly > > referred to as the BQL in discussions and some code comments. The > > locking APIs, however, are called qemu_mutex_lock_iothread() and > > qemu_mutex_unlock_iothread(). > > > > The "iothread" name is historic and comes from when the main thread was > > split into into KVM vcpu threads and the "iothread" (now called the main > > loop thread). I have contributed to the confusion myself by introducing > > a separate --object iothread, a separate concept unrelated to the BQL. > > > > The "iothread" name is no longer appropriate for the BQL. Rename the > > locking APIs to: > > - void qemu_bql_lock(void) > > - void qemu_bql_unlock(void) > > - bool qemu_bql_locked(void) > > > > There are more APIs with "iothread" in their names. Subsequent patches > > will rename them. There are also comments and documentation that will be > > updated in later patches. > > > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > > Acked-by: Peter Xu <peterx@redhat.com> > > Two nickpicks: > > - BQL contains "QEMU" as the 2nd character, so maybe easier to further > rename qemu_bql into bql_? Philippe wondered whether the variable name should end with _mutex (or _lock is common too), so an alternative might be big_qemu_lock. That's imperfect because it doesn't start with the usual qemu_ prefix. qemu_big_lock is better in that regard but inconsistent with our BQL abbreviation. I don't like putting an underscore at the end. It's unusual and would make me wonder what that means. Naming is hard, but please discuss and I'm open to change to BQL variable's name to whatever we all agree on. > > - Could we keep the full spell of BQL at some places, so people can still > reference it if not familiar? IIUC most of the BQL helpers will root > back to the major three functions (_lock, _unlock, _locked), perhaps > add a comment of "BQL stands for..." over these three functions as > comment? Yes, I'll update the doc comments to say "Big QEMU Lock (BQL)" for each of these functions. Stefan [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() 2023-11-30 20:43 ` Stefan Hajnoczi @ 2023-11-30 20:56 ` Peter Xu 2023-11-30 21:41 ` BALATON Zoltan 1 sibling, 0 replies; 34+ messages in thread From: Peter Xu @ 2023-11-30 20:56 UTC (permalink / raw) To: Stefan Hajnoczi Cc: qemu-devel, Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang On Thu, Nov 30, 2023 at 03:43:25PM -0500, Stefan Hajnoczi wrote: > On Thu, Nov 30, 2023 at 03:08:49PM -0500, Peter Xu wrote: > > On Wed, Nov 29, 2023 at 04:26:20PM -0500, Stefan Hajnoczi wrote: > > > The Big QEMU Lock (BQL) has many names and they are confusing. The > > > actual QemuMutex variable is called qemu_global_mutex but it's commonly > > > referred to as the BQL in discussions and some code comments. The > > > locking APIs, however, are called qemu_mutex_lock_iothread() and > > > qemu_mutex_unlock_iothread(). > > > > > > The "iothread" name is historic and comes from when the main thread was > > > split into into KVM vcpu threads and the "iothread" (now called the main > > > loop thread). I have contributed to the confusion myself by introducing > > > a separate --object iothread, a separate concept unrelated to the BQL. > > > > > > The "iothread" name is no longer appropriate for the BQL. Rename the > > > locking APIs to: > > > - void qemu_bql_lock(void) > > > - void qemu_bql_unlock(void) > > > - bool qemu_bql_locked(void) > > > > > > There are more APIs with "iothread" in their names. Subsequent patches > > > will rename them. There are also comments and documentation that will be > > > updated in later patches. > > > > > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > > > > Acked-by: Peter Xu <peterx@redhat.com> > > > > Two nickpicks: > > > > - BQL contains "QEMU" as the 2nd character, so maybe easier to further > > rename qemu_bql into bql_? > > Philippe wondered whether the variable name should end with _mutex (or > _lock is common too), so an alternative might be big_qemu_lock. That's IMHO mutex isn't important in this context, but an implementation detail of the "lock" as an abstract concept. For example, we won't need to rename it again then if the impl changes, e.g. using pure futex or a rwlock replacement. When that happens we don't need to change all call sites again. (never really meant to change the lock impl, just an example.. :) KVM actually has that example of KVM_MMU_LOCK() macro taking as the rwlock write lock when the spinlock is replaced with rwlock, while it'll keep to be the spinlock "lock()" when !KVM_HAVE_MMU_RWLOCK. > imperfect because it doesn't start with the usual qemu_ prefix. > qemu_big_lock is better in that regard but inconsistent with our BQL > abbreviation. > > I don't like putting an underscore at the end. It's unusual and would > make me wonder what that means. Ah, I meant replacing the "qemu_bql_" prefix with "bql_", as that contains QEMU already, rather than making "_" at the end. So they'll be bql_lock(), bql_unlock(), bql_locked(). > > Naming is hard, but please discuss and I'm open to change to BQL > variable's name to whatever we all agree on. I'm pretty okay with qemu_bql_lock(), etc. too. I prefer a tiny little bit on bql_ over qemu_bql_ in this regard, but frankly they're all names good enough to me. The "qemu_" prefix can still be a good thing saying "this is a qemu global function", even if contained inside "bql" itself. > > > > > - Could we keep the full spell of BQL at some places, so people can still > > reference it if not familiar? IIUC most of the BQL helpers will root > > back to the major three functions (_lock, _unlock, _locked), perhaps > > add a comment of "BQL stands for..." over these three functions as > > comment? > > Yes, I'll update the doc comments to say "Big QEMU Lock (BQL)" for each > of these functions. Thanks! -- Peter Xu ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() 2023-11-30 20:43 ` Stefan Hajnoczi 2023-11-30 20:56 ` Peter Xu @ 2023-11-30 21:41 ` BALATON Zoltan 1 sibling, 0 replies; 34+ messages in thread From: BALATON Zoltan @ 2023-11-30 21:41 UTC (permalink / raw) To: Stefan Hajnoczi Cc: Peter Xu, qemu-devel, Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang On Thu, 30 Nov 2023, Stefan Hajnoczi wrote: > On Thu, Nov 30, 2023 at 03:08:49PM -0500, Peter Xu wrote: >> On Wed, Nov 29, 2023 at 04:26:20PM -0500, Stefan Hajnoczi wrote: >>> The Big QEMU Lock (BQL) has many names and they are confusing. The >>> actual QemuMutex variable is called qemu_global_mutex but it's commonly >>> referred to as the BQL in discussions and some code comments. The >>> locking APIs, however, are called qemu_mutex_lock_iothread() and >>> qemu_mutex_unlock_iothread(). >>> >>> The "iothread" name is historic and comes from when the main thread was >>> split into into KVM vcpu threads and the "iothread" (now called the main >>> loop thread). I have contributed to the confusion myself by introducing >>> a separate --object iothread, a separate concept unrelated to the BQL. >>> >>> The "iothread" name is no longer appropriate for the BQL. Rename the >>> locking APIs to: >>> - void qemu_bql_lock(void) >>> - void qemu_bql_unlock(void) >>> - bool qemu_bql_locked(void) >>> >>> There are more APIs with "iothread" in their names. Subsequent patches >>> will rename them. There are also comments and documentation that will be >>> updated in later patches. >>> >>> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> >> >> Acked-by: Peter Xu <peterx@redhat.com> >> >> Two nickpicks: >> >> - BQL contains "QEMU" as the 2nd character, so maybe easier to further >> rename qemu_bql into bql_? > > Philippe wondered whether the variable name should end with _mutex (or > _lock is common too), so an alternative might be big_qemu_lock. That's > imperfect because it doesn't start with the usual qemu_ prefix. > qemu_big_lock is better in that regard but inconsistent with our BQL > abbreviation. BQL isn't very specific for those unfamiliar with the code but it's short and already used and known by people so I'm OK with qemu_bql with some comments and docs explainig here and there what bql stands for should be enough for new people to quickly find out. If we want to be more verbose how about "qemu_global_mutex" which is self describing but longer and does not resemble BQL so then comments may be needed to explain this is what was called BQL as well. I don't mind either way though. Regards, BALATON Zoltan > I don't like putting an underscore at the end. It's unusual and would > make me wonder what that means. > > Naming is hard, but please discuss and I'm open to change to BQL > variable's name to whatever we all agree on. > >> >> - Could we keep the full spell of BQL at some places, so people can still >> reference it if not familiar? IIUC most of the BQL helpers will root >> back to the major three functions (_lock, _unlock, _locked), perhaps >> add a comment of "BQL stands for..." over these three functions as >> comment? > > Yes, I'll update the doc comments to say "Big QEMU Lock (BQL)" for each > of these functions. > > Stefan > ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() 2023-11-29 21:26 ` [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() Stefan Hajnoczi ` (4 preceding siblings ...) 2023-11-30 20:08 ` Peter Xu @ 2023-11-30 21:48 ` Eric Farman 2023-12-01 5:12 ` Harsh Prateek Bora 6 siblings, 0 replies; 34+ messages in thread From: Eric Farman @ 2023-11-30 21:48 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang On Wed, 2023-11-29 at 16:26 -0500, Stefan Hajnoczi wrote: > The Big QEMU Lock (BQL) has many names and they are confusing. The > actual QemuMutex variable is called qemu_global_mutex but it's > commonly > referred to as the BQL in discussions and some code comments. The > locking APIs, however, are called qemu_mutex_lock_iothread() and > qemu_mutex_unlock_iothread(). > > The "iothread" name is historic and comes from when the main thread > was > split into into KVM vcpu threads and the "iothread" (now called the > main > loop thread). I have contributed to the confusion myself by > introducing > a separate --object iothread, a separate concept unrelated to the > BQL. > > The "iothread" name is no longer appropriate for the BQL. Rename the > locking APIs to: > - void qemu_bql_lock(void) > - void qemu_bql_unlock(void) > - bool qemu_bql_locked(void) > > There are more APIs with "iothread" in their names. Subsequent > patches > will rename them. There are also comments and documentation that will > be > updated in later patches. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Acked-by: Eric Farman <farman@linux.ibm.com> ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() 2023-11-29 21:26 ` [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() Stefan Hajnoczi ` (5 preceding siblings ...) 2023-11-30 21:48 ` Eric Farman @ 2023-12-01 5:12 ` Harsh Prateek Bora 2023-12-07 11:44 ` Stefan Hajnoczi 6 siblings, 1 reply; 34+ messages in thread From: Harsh Prateek Bora @ 2023-12-01 5:12 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang Hi Stefan, On 11/30/23 02:56, Stefan Hajnoczi wrote: > The Big QEMU Lock (BQL) has many names and they are confusing. The > actual QemuMutex variable is called qemu_global_mutex but it's commonly > referred to as the BQL in discussions and some code comments. The > locking APIs, however, are called qemu_mutex_lock_iothread() and > qemu_mutex_unlock_iothread(). > > The "iothread" name is historic and comes from when the main thread was > split into into KVM vcpu threads and the "iothread" (now called the main > loop thread). I have contributed to the confusion myself by introducing > a separate --object iothread, a separate concept unrelated to the BQL. > > The "iothread" name is no longer appropriate for the BQL. Rename the > locking APIs to: > - void qemu_bql_lock(void) > - void qemu_bql_unlock(void) > - bool qemu_bql_locked(void) > > There are more APIs with "iothread" in their names. Subsequent patches > will rename them. There are also comments and documentation that will be > updated in later patches. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > include/block/aio-wait.h | 2 +- > include/qemu/main-loop.h | 26 +++--- > accel/accel-blocker.c | 10 +-- > accel/dummy-cpus.c | 8 +- > accel/hvf/hvf-accel-ops.c | 4 +- > accel/kvm/kvm-accel-ops.c | 4 +- > accel/kvm/kvm-all.c | 22 ++--- > accel/tcg/cpu-exec.c | 26 +++--- > accel/tcg/cputlb.c | 16 ++-- > accel/tcg/tcg-accel-ops-icount.c | 4 +- > accel/tcg/tcg-accel-ops-mttcg.c | 12 +-- > accel/tcg/tcg-accel-ops-rr.c | 14 ++-- > accel/tcg/tcg-accel-ops.c | 2 +- > accel/tcg/translate-all.c | 2 +- > cpu-common.c | 4 +- > dump/dump.c | 4 +- > hw/core/cpu-common.c | 6 +- > hw/i386/intel_iommu.c | 6 +- > hw/i386/kvm/xen_evtchn.c | 16 ++-- > hw/i386/kvm/xen_overlay.c | 2 +- > hw/i386/kvm/xen_xenstore.c | 2 +- > hw/intc/arm_gicv3_cpuif.c | 2 +- > hw/intc/s390_flic.c | 18 ++-- > hw/misc/edu.c | 4 +- > hw/misc/imx6_src.c | 2 +- > hw/misc/imx7_src.c | 2 +- > hw/net/xen_nic.c | 8 +- > hw/ppc/pegasos2.c | 2 +- > hw/ppc/ppc.c | 4 +- > hw/ppc/spapr.c | 2 +- > hw/ppc/spapr_rng.c | 4 +- > hw/ppc/spapr_softmmu.c | 4 +- > hw/remote/mpqemu-link.c | 12 +-- > hw/remote/vfio-user-obj.c | 2 +- > hw/s390x/s390-skeys.c | 2 +- > migration/block-dirty-bitmap.c | 4 +- > migration/block.c | 16 ++-- > migration/colo.c | 60 +++++++------- > migration/dirtyrate.c | 12 +-- > migration/migration.c | 52 ++++++------ > migration/ram.c | 12 +-- > replay/replay-internal.c | 2 +- > semihosting/console.c | 8 +- > stubs/iothread-lock.c | 6 +- > system/cpu-throttle.c | 4 +- > system/cpus.c | 28 +++---- > system/dirtylimit.c | 4 +- > system/memory.c | 2 +- > system/physmem.c | 8 +- > system/runstate.c | 2 +- > system/watchpoint.c | 4 +- > target/arm/arm-powerctl.c | 14 ++-- > target/arm/helper.c | 4 +- > target/arm/hvf/hvf.c | 8 +- > target/arm/kvm.c | 4 +- > target/arm/kvm64.c | 4 +- > target/arm/ptw.c | 6 +- > target/arm/tcg/helper-a64.c | 8 +- > target/arm/tcg/m_helper.c | 4 +- > target/arm/tcg/op_helper.c | 24 +++--- > target/arm/tcg/psci.c | 2 +- > target/hppa/int_helper.c | 8 +- > target/i386/hvf/hvf.c | 6 +- > target/i386/kvm/hyperv.c | 4 +- > target/i386/kvm/kvm.c | 28 +++---- > target/i386/kvm/xen-emu.c | 14 ++-- > target/i386/nvmm/nvmm-accel-ops.c | 4 +- > target/i386/nvmm/nvmm-all.c | 20 ++--- > target/i386/tcg/sysemu/fpu_helper.c | 6 +- > target/i386/tcg/sysemu/misc_helper.c | 4 +- > target/i386/whpx/whpx-accel-ops.c | 4 +- > target/i386/whpx/whpx-all.c | 24 +++--- > target/loongarch/csr_helper.c | 4 +- > target/mips/kvm.c | 4 +- > target/mips/tcg/sysemu/cp0_helper.c | 4 +- > target/openrisc/sys_helper.c | 16 ++-- > target/ppc/excp_helper.c | 12 +-- > target/ppc/kvm.c | 4 +- > target/ppc/misc_helper.c | 8 +- > target/ppc/timebase_helper.c | 8 +- > target/s390x/kvm/kvm.c | 4 +- > target/s390x/tcg/misc_helper.c | 118 +++++++++++++-------------- > target/sparc/int32_helper.c | 2 +- > target/sparc/int64_helper.c | 6 +- > target/sparc/win_helper.c | 20 ++--- > target/xtensa/exc_helper.c | 8 +- > ui/spice-core.c | 4 +- > util/async.c | 2 +- > util/main-loop.c | 8 +- > util/rcu.c | 14 ++-- > audio/coreaudio.m | 4 +- > memory_ldst.c.inc | 18 ++-- > target/i386/hvf/README.md | 2 +- > ui/cocoa.m | 50 ++++++------ > 94 files changed, 502 insertions(+), 502 deletions(-) > <snip> > > diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c > index 9bd98e8219..ffb2c25145 100644 > --- a/hw/remote/mpqemu-link.c > +++ b/hw/remote/mpqemu-link.c > @@ -33,7 +33,7 @@ > */ > bool mpqemu_msg_send(MPQemuMsg *msg, QIOChannel *ioc, Error **errp) > { > - bool iolock = qemu_mutex_iothread_locked(); > + bool iolock = qemu_bql_locked(); Should var name (one more below) be updated to reflect this update ? Otherwise, Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com> > bool iothread = qemu_in_iothread(); > struct iovec send[2] = {}; > int *fds = NULL; > @@ -64,7 +64,7 @@ bool mpqemu_msg_send(MPQemuMsg *msg, QIOChannel *ioc, Error **errp) > * Also skip lock handling while in a co-routine in the main context. > */ > if (iolock && !iothread && !qemu_in_coroutine()) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > if (!qio_channel_writev_full_all(ioc, send, G_N_ELEMENTS(send), > @@ -76,7 +76,7 @@ bool mpqemu_msg_send(MPQemuMsg *msg, QIOChannel *ioc, Error **errp) > > if (iolock && !iothread && !qemu_in_coroutine()) { > /* See above comment why skip locking here. */ > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > } > > return ret; > @@ -96,7 +96,7 @@ static ssize_t mpqemu_read(QIOChannel *ioc, void *buf, size_t len, int **fds, > size_t *nfds, Error **errp) > { > struct iovec iov = { .iov_base = buf, .iov_len = len }; > - bool iolock = qemu_mutex_iothread_locked(); > + bool iolock = qemu_bql_locked(); > bool iothread = qemu_in_iothread(); > int ret = -1; > > @@ -107,13 +107,13 @@ static ssize_t mpqemu_read(QIOChannel *ioc, void *buf, size_t len, int **fds, > assert(qemu_in_coroutine() || !iothread); > > if (iolock && !iothread && !qemu_in_coroutine()) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > ret = qio_channel_readv_full_all_eof(ioc, &iov, 1, fds, nfds, errp); > > if (iolock && !iothread && !qemu_in_coroutine()) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > } > > return (ret <= 0) ? ret : iov.iov_len; > diff --git a/hw/remote/vfio-user-obj.c b/hw/remote/vfio-user-obj.c > index 8b10c32a3c..d0d0386d52 100644 > --- a/hw/remote/vfio-user-obj.c > +++ b/hw/remote/vfio-user-obj.c > @@ -400,7 +400,7 @@ static int vfu_object_mr_rw(MemoryRegion *mr, uint8_t *buf, hwaddr offset, > } > > if (release_lock) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > release_lock = false; > } > > diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c > index 8f5159d85d..307344aa80 100644 > --- a/hw/s390x/s390-skeys.c > +++ b/hw/s390x/s390-skeys.c > @@ -153,7 +153,7 @@ void qmp_dump_skeys(const char *filename, Error **errp) > goto out; > } > > - assert(qemu_mutex_iothread_locked()); > + assert(qemu_bql_locked()); > guest_phys_blocks_init(&guest_phys_blocks); > guest_phys_blocks_append(&guest_phys_blocks); > > diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c > index 24347ab0f7..b5a2d377db 100644 > --- a/migration/block-dirty-bitmap.c > +++ b/migration/block-dirty-bitmap.c > @@ -774,7 +774,7 @@ static void dirty_bitmap_state_pending(void *opaque, > SaveBitmapState *dbms; > uint64_t pending = 0; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > QSIMPLEQ_FOREACH(dbms, &s->dbms_list, entry) { > uint64_t gran = bdrv_dirty_bitmap_granularity(dbms->bitmap); > @@ -784,7 +784,7 @@ static void dirty_bitmap_state_pending(void *opaque, > pending += DIV_ROUND_UP(sectors * BDRV_SECTOR_SIZE, gran); > } > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > trace_dirty_bitmap_state_pending(pending); > > diff --git a/migration/block.c b/migration/block.c > index a15f9bddcb..87f36e6e35 100644 > --- a/migration/block.c > +++ b/migration/block.c > @@ -269,7 +269,7 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds) > int64_t count; > > if (bmds->shared_base) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > aio_context_acquire(blk_get_aio_context(bb)); > /* Skip unallocated sectors; intentionally treats failure or > * partial sector as an allocated sector */ > @@ -282,7 +282,7 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds) > cur_sector += count >> BDRV_SECTOR_BITS; > } > aio_context_release(blk_get_aio_context(bb)); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > if (cur_sector >= total_sectors) { > @@ -321,14 +321,14 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds) > * This is ugly and will disappear when we make bdrv_* thread-safe, > * without the need to acquire the AioContext. > */ > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > aio_context_acquire(blk_get_aio_context(bmds->blk)); > bdrv_reset_dirty_bitmap(bmds->dirty_bitmap, cur_sector * BDRV_SECTOR_SIZE, > nr_sectors * BDRV_SECTOR_SIZE); > blk->aiocb = blk_aio_preadv(bb, cur_sector * BDRV_SECTOR_SIZE, &blk->qiov, > 0, blk_mig_read_cb, blk); > aio_context_release(blk_get_aio_context(bmds->blk)); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > bmds->cur_sector = cur_sector + nr_sectors; > return (bmds->cur_sector >= total_sectors); > @@ -786,9 +786,9 @@ static int block_save_iterate(QEMUFile *f, void *opaque) > /* Always called with iothread lock taken for > * simplicity, block_save_complete also calls it. > */ > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ret = blk_mig_save_dirty_block(f, 1); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > if (ret < 0) { > return ret; > @@ -860,9 +860,9 @@ static void block_state_pending(void *opaque, uint64_t *must_precopy, > /* Estimate pending number of bytes to send */ > uint64_t pending; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > pending = get_remaining_dirty(); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > blk_mig_lock(); > pending += block_mig_state.submitted * BLK_MIG_BLOCK_SIZE + > diff --git a/migration/colo.c b/migration/colo.c > index 4447e34914..2e68107cfa 100644 > --- a/migration/colo.c > +++ b/migration/colo.c > @@ -420,13 +420,13 @@ static int colo_do_checkpoint_transaction(MigrationState *s, > qio_channel_io_seek(QIO_CHANNEL(bioc), 0, 0, NULL); > bioc->usage = 0; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > if (failover_get_state() != FAILOVER_STATUS_NONE) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > goto out; > } > vm_stop_force_state(RUN_STATE_COLO); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > trace_colo_vm_state_change("run", "stop"); > /* > * Failover request bh could be called after vm_stop_force_state(), > @@ -435,23 +435,23 @@ static int colo_do_checkpoint_transaction(MigrationState *s, > if (failover_get_state() != FAILOVER_STATUS_NONE) { > goto out; > } > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > replication_do_checkpoint_all(&local_err); > if (local_err) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > goto out; > } > > colo_send_message(s->to_dst_file, COLO_MESSAGE_VMSTATE_SEND, &local_err); > if (local_err) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > goto out; > } > /* Note: device state is saved into buffer */ > ret = qemu_save_device_state(fb); > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > if (ret < 0) { > goto out; > } > @@ -504,9 +504,9 @@ static int colo_do_checkpoint_transaction(MigrationState *s, > > ret = 0; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > vm_start(); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > trace_colo_vm_state_change("stop", "run"); > > out: > @@ -557,15 +557,15 @@ static void colo_process_checkpoint(MigrationState *s) > fb = qemu_file_new_output(QIO_CHANNEL(bioc)); > object_unref(OBJECT(bioc)); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > replication_start_all(REPLICATION_MODE_PRIMARY, &local_err); > if (local_err) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > goto out; > } > > vm_start(); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > trace_colo_vm_state_change("stop", "run"); > > timer_mod(s->colo_delay_timer, qemu_clock_get_ms(QEMU_CLOCK_HOST) + > @@ -639,14 +639,14 @@ out: > > void migrate_start_colo_process(MigrationState *s) > { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > qemu_event_init(&s->colo_checkpoint_event, false); > s->colo_delay_timer = timer_new_ms(QEMU_CLOCK_HOST, > colo_checkpoint_notify, s); > > qemu_sem_init(&s->colo_exit_sem, 0); > colo_process_checkpoint(s); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > } > > static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, > @@ -657,9 +657,9 @@ static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, > Error *local_err = NULL; > int ret; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > vm_stop_force_state(RUN_STATE_COLO); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > trace_colo_vm_state_change("run", "stop"); > > /* FIXME: This is unnecessary for periodic checkpoint mode */ > @@ -677,10 +677,10 @@ static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, > return; > } > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > cpu_synchronize_all_states(); > ret = qemu_loadvm_state_main(mis->from_src_file, mis); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > if (ret < 0) { > error_setg(errp, "Load VM's live state (ram) error"); > @@ -719,14 +719,14 @@ static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, > return; > } > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > vmstate_loading = true; > colo_flush_ram_cache(); > ret = qemu_load_device_state(fb); > if (ret < 0) { > error_setg(errp, "COLO: load device state failed"); > vmstate_loading = false; > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > return; > } > > @@ -734,7 +734,7 @@ static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, > if (local_err) { > error_propagate(errp, local_err); > vmstate_loading = false; > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > return; > } > > @@ -743,7 +743,7 @@ static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, > if (local_err) { > error_propagate(errp, local_err); > vmstate_loading = false; > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > return; > } > /* Notify all filters of all NIC to do checkpoint */ > @@ -752,13 +752,13 @@ static void colo_incoming_process_checkpoint(MigrationIncomingState *mis, > if (local_err) { > error_propagate(errp, local_err); > vmstate_loading = false; > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > return; > } > > vmstate_loading = false; > vm_start(); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > trace_colo_vm_state_change("stop", "run"); > > if (failover_get_state() == FAILOVER_STATUS_RELAUNCH) { > @@ -851,14 +851,14 @@ static void *colo_process_incoming_thread(void *opaque) > fb = qemu_file_new_input(QIO_CHANNEL(bioc)); > object_unref(OBJECT(bioc)); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > replication_start_all(REPLICATION_MODE_SECONDARY, &local_err); > if (local_err) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > goto out; > } > vm_start(); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > trace_colo_vm_state_change("stop", "run"); > > colo_send_message(mis->to_src_file, COLO_MESSAGE_CHECKPOINT_READY, > @@ -920,7 +920,7 @@ int coroutine_fn colo_incoming_co(void) > Error *local_err = NULL; > QemuThread th; > > - assert(qemu_mutex_iothread_locked()); > + assert(qemu_bql_locked()); > > if (!migration_incoming_colo_enabled()) { > return 0; > @@ -940,10 +940,10 @@ int coroutine_fn colo_incoming_co(void) > qemu_coroutine_yield(); > mis->colo_incoming_co = NULL; > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > /* Wait checkpoint incoming thread exit before free resource */ > qemu_thread_join(&th); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > /* We hold the global iothread lock, so it is safe here */ > colo_release_ram_cache(); > diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c > index 036ac017fc..1d705092cd 100644 > --- a/migration/dirtyrate.c > +++ b/migration/dirtyrate.c > @@ -90,13 +90,13 @@ static int64_t do_calculate_dirtyrate(DirtyPageRecord dirty_pages, > > void global_dirty_log_change(unsigned int flag, bool start) > { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > if (start) { > memory_global_dirty_log_start(flag); > } else { > memory_global_dirty_log_stop(flag); > } > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > /* > @@ -106,12 +106,12 @@ void global_dirty_log_change(unsigned int flag, bool start) > */ > static void global_dirty_log_sync(unsigned int flag, bool one_shot) > { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > memory_global_dirty_log_sync(false); > if (one_shot) { > memory_global_dirty_log_stop(flag); > } > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > static DirtyPageRecord *vcpu_dirty_stat_alloc(VcpuStat *stat) > @@ -610,7 +610,7 @@ static void calculate_dirtyrate_dirty_bitmap(struct DirtyRateConfig config) > int64_t start_time; > DirtyPageRecord dirty_pages; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > memory_global_dirty_log_start(GLOBAL_DIRTY_DIRTY_RATE); > > /* > @@ -627,7 +627,7 @@ static void calculate_dirtyrate_dirty_bitmap(struct DirtyRateConfig config) > * KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE cap is enabled. > */ > dirtyrate_manual_reset_protect(); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > record_dirtypages_bitmap(&dirty_pages, true); > > diff --git a/migration/migration.c b/migration/migration.c > index 28a34c9068..b153133fba 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -1293,12 +1293,12 @@ static void migrate_fd_cleanup(MigrationState *s) > QEMUFile *tmp; > > trace_migrate_fd_cleanup(); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > if (s->migration_thread_running) { > qemu_thread_join(&s->thread); > s->migration_thread_running = false; > } > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > multifd_save_cleanup(); > qemu_mutex_lock(&s->qemu_file_lock); > @@ -2410,7 +2410,7 @@ static int postcopy_start(MigrationState *ms, Error **errp) > } > > trace_postcopy_start(); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > trace_postcopy_start_set_run(); > > migration_downtime_start(ms); > @@ -2519,7 +2519,7 @@ static int postcopy_start(MigrationState *ms, Error **errp) > > migration_downtime_end(ms); > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > if (migrate_postcopy_ram()) { > /* > @@ -2560,7 +2560,7 @@ fail: > error_report_err(local_err); > } > } > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > return -1; > } > > @@ -2594,14 +2594,14 @@ static int migration_maybe_pause(MigrationState *s, > * wait for the 'pause_sem' semaphore. > */ > if (s->state != MIGRATION_STATUS_CANCELLING) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > migrate_set_state(&s->state, *current_active_state, > MIGRATION_STATUS_PRE_SWITCHOVER); > qemu_sem_wait(&s->pause_sem); > migrate_set_state(&s->state, MIGRATION_STATUS_PRE_SWITCHOVER, > new_state); > *current_active_state = new_state; > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > } > > return s->state == new_state ? 0 : -EINVAL; > @@ -2612,7 +2612,7 @@ static int migration_completion_precopy(MigrationState *s, > { > int ret; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > migration_downtime_start(s); > qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL); > > @@ -2640,7 +2640,7 @@ static int migration_completion_precopy(MigrationState *s, > ret = qemu_savevm_state_complete_precopy(s->to_dst_file, false, > s->block_inactive); > out_unlock: > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > return ret; > } > > @@ -2648,9 +2648,9 @@ static void migration_completion_postcopy(MigrationState *s) > { > trace_migration_completion_postcopy_end(); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > qemu_savevm_state_complete_postcopy(s->to_dst_file); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > /* > * Shutdown the postcopy fast path thread. This is only needed when dest > @@ -2674,14 +2674,14 @@ static void migration_completion_failed(MigrationState *s, > */ > Error *local_err = NULL; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > bdrv_activate_all(&local_err); > if (local_err) { > error_report_err(local_err); > } else { > s->block_inactive = false; > } > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > migrate_set_state(&s->state, current_active_state, > @@ -3121,7 +3121,7 @@ static void migration_iteration_finish(MigrationState *s) > /* If we enabled cpu throttling for auto-converge, turn it off. */ > cpu_throttle_stop(); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > switch (s->state) { > case MIGRATION_STATUS_COMPLETED: > migration_calculate_complete(s); > @@ -3152,7 +3152,7 @@ static void migration_iteration_finish(MigrationState *s) > break; > } > migrate_fd_cleanup_schedule(s); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > static void bg_migration_iteration_finish(MigrationState *s) > @@ -3164,7 +3164,7 @@ static void bg_migration_iteration_finish(MigrationState *s) > */ > ram_write_tracking_stop(); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > switch (s->state) { > case MIGRATION_STATUS_COMPLETED: > migration_calculate_complete(s); > @@ -3183,7 +3183,7 @@ static void bg_migration_iteration_finish(MigrationState *s) > } > > migrate_fd_cleanup_schedule(s); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > /* > @@ -3305,9 +3305,9 @@ static void *migration_thread(void *opaque) > object_ref(OBJECT(s)); > update_iteration_initial_status(s); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > qemu_savevm_state_header(s->to_dst_file); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > /* > * If we opened the return path, we need to make sure dst has it > @@ -3335,9 +3335,9 @@ static void *migration_thread(void *opaque) > qemu_savevm_send_colo_enable(s->to_dst_file); > } > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > qemu_savevm_state_setup(s->to_dst_file); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > qemu_savevm_wait_unplug(s, MIGRATION_STATUS_SETUP, > MIGRATION_STATUS_ACTIVE); > @@ -3448,10 +3448,10 @@ static void *bg_migration_thread(void *opaque) > ram_write_tracking_prepare(); > #endif > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > qemu_savevm_state_header(s->to_dst_file); > qemu_savevm_state_setup(s->to_dst_file); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > qemu_savevm_wait_unplug(s, MIGRATION_STATUS_SETUP, > MIGRATION_STATUS_ACTIVE); > @@ -3461,7 +3461,7 @@ static void *bg_migration_thread(void *opaque) > trace_migration_thread_setup_complete(); > migration_downtime_start(s); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > /* > * If VM is currently in suspended state, then, to make a valid runstate > @@ -3504,7 +3504,7 @@ static void *bg_migration_thread(void *opaque) > s->vm_start_bh = qemu_bh_new(bg_migration_vm_start_bh, s); > qemu_bh_schedule(s->vm_start_bh); > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > while (migration_is_active(s)) { > MigIterateState iter_state = bg_migration_iteration_run(s); > @@ -3533,7 +3533,7 @@ fail: > if (early_fail) { > migrate_set_state(&s->state, MIGRATION_STATUS_ACTIVE, > MIGRATION_STATUS_FAILED); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > bg_migration_iteration_finish(s); > diff --git a/migration/ram.c b/migration/ram.c > index 8c7886ab79..f274bcf655 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -2984,9 +2984,9 @@ static int ram_save_setup(QEMUFile *f, void *opaque) > migration_ops = g_malloc0(sizeof(MigrationOps)); > migration_ops->ram_save_target_page = ram_save_target_page_legacy; > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > ret = multifd_send_sync_main(f); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > if (ret < 0) { > return ret; > } > @@ -3221,11 +3221,11 @@ static void ram_state_pending_exact(void *opaque, uint64_t *must_precopy, > uint64_t remaining_size = rs->migration_dirty_pages * TARGET_PAGE_SIZE; > > if (!migration_in_postcopy() && remaining_size < s->threshold_size) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > WITH_RCU_READ_LOCK_GUARD() { > migration_bitmap_sync_precopy(rs, false); > } > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > remaining_size = rs->migration_dirty_pages * TARGET_PAGE_SIZE; > } > > @@ -3453,7 +3453,7 @@ void colo_incoming_start_dirty_log(void) > { > RAMBlock *block = NULL; > /* For memory_global_dirty_log_start below. */ > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > qemu_mutex_lock_ramlist(); > > memory_global_dirty_log_sync(false); > @@ -3467,7 +3467,7 @@ void colo_incoming_start_dirty_log(void) > } > ram_state->migration_dirty_pages = 0; > qemu_mutex_unlock_ramlist(); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > /* It is need to hold the global lock to call this helper */ > diff --git a/replay/replay-internal.c b/replay/replay-internal.c > index 77d0c82327..04c9c6374b 100644 > --- a/replay/replay-internal.c > +++ b/replay/replay-internal.c > @@ -216,7 +216,7 @@ void replay_mutex_lock(void) > { > if (replay_mode != REPLAY_MODE_NONE) { > unsigned long id; > - g_assert(!qemu_mutex_iothread_locked()); > + g_assert(!qemu_bql_locked()); > g_assert(!replay_mutex_locked()); > qemu_mutex_lock(&lock); > id = mutex_tail++; > diff --git a/semihosting/console.c b/semihosting/console.c > index 5d61e8207e..666285541d 100644 > --- a/semihosting/console.c > +++ b/semihosting/console.c > @@ -43,7 +43,7 @@ static SemihostingConsole console; > static int console_can_read(void *opaque) > { > SemihostingConsole *c = opaque; > - g_assert(qemu_mutex_iothread_locked()); > + g_assert(qemu_bql_locked()); > return (int)fifo8_num_free(&c->fifo); > } > > @@ -58,7 +58,7 @@ static void console_wake_up(gpointer data, gpointer user_data) > static void console_read(void *opaque, const uint8_t *buf, int size) > { > SemihostingConsole *c = opaque; > - g_assert(qemu_mutex_iothread_locked()); > + g_assert(qemu_bql_locked()); > while (size-- && !fifo8_is_full(&c->fifo)) { > fifo8_push(&c->fifo, *buf++); > } > @@ -70,7 +70,7 @@ bool qemu_semihosting_console_ready(void) > { > SemihostingConsole *c = &console; > > - g_assert(qemu_mutex_iothread_locked()); > + g_assert(qemu_bql_locked()); > return !fifo8_is_empty(&c->fifo); > } > > @@ -78,7 +78,7 @@ void qemu_semihosting_console_block_until_ready(CPUState *cs) > { > SemihostingConsole *c = &console; > > - g_assert(qemu_mutex_iothread_locked()); > + g_assert(qemu_bql_locked()); > > /* Block if the fifo is completely empty. */ > if (fifo8_is_empty(&c->fifo)) { > diff --git a/stubs/iothread-lock.c b/stubs/iothread-lock.c > index 5b45b7fc8b..1f24c3203a 100644 > --- a/stubs/iothread-lock.c > +++ b/stubs/iothread-lock.c > @@ -1,15 +1,15 @@ > #include "qemu/osdep.h" > #include "qemu/main-loop.h" > > -bool qemu_mutex_iothread_locked(void) > +bool qemu_bql_locked(void) > { > return false; > } > > -void qemu_mutex_lock_iothread_impl(const char *file, int line) > +void qemu_bql_lock_impl(const char *file, int line) > { > } > > -void qemu_mutex_unlock_iothread(void) > +void qemu_bql_unlock(void) > { > } > diff --git a/system/cpu-throttle.c b/system/cpu-throttle.c > index d9bb30a223..e98836311b 100644 > --- a/system/cpu-throttle.c > +++ b/system/cpu-throttle.c > @@ -57,9 +57,9 @@ static void cpu_throttle_thread(CPUState *cpu, run_on_cpu_data opaque) > qemu_cond_timedwait_iothread(cpu->halt_cond, > sleeptime_ns / SCALE_MS); > } else { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > g_usleep(sleeptime_ns / SCALE_US); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > } > sleeptime_ns = endtime_ns - qemu_clock_get_ns(QEMU_CLOCK_REALTIME); > } > diff --git a/system/cpus.c b/system/cpus.c > index a444a747f0..d5b98c11f5 100644 > --- a/system/cpus.c > +++ b/system/cpus.c > @@ -481,35 +481,35 @@ bool qemu_in_vcpu_thread(void) > return current_cpu && qemu_cpu_is_self(current_cpu); > } > > -QEMU_DEFINE_STATIC_CO_TLS(bool, iothread_locked) > +QEMU_DEFINE_STATIC_CO_TLS(bool, bql_locked) > > -bool qemu_mutex_iothread_locked(void) > +bool qemu_bql_locked(void) > { > - return get_iothread_locked(); > + return get_bql_locked(); > } > > bool qemu_in_main_thread(void) > { > - return qemu_mutex_iothread_locked(); > + return qemu_bql_locked(); > } > > /* > * The BQL is taken from so many places that it is worth profiling the > * callers directly, instead of funneling them all through a single function. > */ > -void qemu_mutex_lock_iothread_impl(const char *file, int line) > +void qemu_bql_lock_impl(const char *file, int line) > { > QemuMutexLockFunc bql_lock = qatomic_read(&qemu_bql_mutex_lock_func); > > - g_assert(!qemu_mutex_iothread_locked()); > + g_assert(!qemu_bql_locked()); > bql_lock(&qemu_global_mutex, file, line); > - set_iothread_locked(true); > + set_bql_locked(true); > } > > -void qemu_mutex_unlock_iothread(void) > +void qemu_bql_unlock(void) > { > - g_assert(qemu_mutex_iothread_locked()); > - set_iothread_locked(false); > + g_assert(qemu_bql_locked()); > + set_bql_locked(false); > qemu_mutex_unlock(&qemu_global_mutex); > } > > @@ -577,9 +577,9 @@ void pause_all_vcpus(void) > } > } > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > replay_mutex_lock(); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > } > > void cpu_resume(CPUState *cpu) > @@ -608,9 +608,9 @@ void cpu_remove_sync(CPUState *cpu) > cpu->stop = true; > cpu->unplug = true; > qemu_cpu_kick(cpu); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > qemu_thread_join(cpu->thread); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > } > > void cpus_register_accel(const AccelOpsClass *ops) > diff --git a/system/dirtylimit.c b/system/dirtylimit.c > index 495c7a7082..f89bf6b61f 100644 > --- a/system/dirtylimit.c > +++ b/system/dirtylimit.c > @@ -148,9 +148,9 @@ void vcpu_dirty_rate_stat_stop(void) > { > qatomic_set(&vcpu_dirty_rate_stat->running, 0); > dirtylimit_state_unlock(); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > qemu_thread_join(&vcpu_dirty_rate_stat->thread); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > dirtylimit_state_lock(); > } > > diff --git a/system/memory.c b/system/memory.c > index 4d9cb0a7ff..8d78334cb2 100644 > --- a/system/memory.c > +++ b/system/memory.c > @@ -1119,7 +1119,7 @@ void memory_region_transaction_commit(void) > AddressSpace *as; > > assert(memory_region_transaction_depth); > - assert(qemu_mutex_iothread_locked()); > + assert(qemu_bql_locked()); > > --memory_region_transaction_depth; > if (!memory_region_transaction_depth) { > diff --git a/system/physmem.c b/system/physmem.c > index a63853a7bc..c136675876 100644 > --- a/system/physmem.c > +++ b/system/physmem.c > @@ -2639,8 +2639,8 @@ bool prepare_mmio_access(MemoryRegion *mr) > { > bool release_lock = false; > > - if (!qemu_mutex_iothread_locked()) { > - qemu_mutex_lock_iothread(); > + if (!qemu_bql_locked()) { > + qemu_bql_lock(); > release_lock = true; > } > if (mr->flush_coalesced_mmio) { > @@ -2721,7 +2721,7 @@ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr, > } > > if (release_lock) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > release_lock = false; > } > > @@ -2799,7 +2799,7 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, > } > > if (release_lock) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > release_lock = false; > } > > diff --git a/system/runstate.c b/system/runstate.c > index ea9d6c2a32..5718e6827c 100644 > --- a/system/runstate.c > +++ b/system/runstate.c > @@ -810,7 +810,7 @@ void qemu_init_subsystems(void) > > qemu_init_cpu_list(); > qemu_init_cpu_loop(); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > atexit(qemu_run_exit_notifiers); > > diff --git a/system/watchpoint.c b/system/watchpoint.c > index ba5ad13352..d9cc71dd33 100644 > --- a/system/watchpoint.c > +++ b/system/watchpoint.c > @@ -155,9 +155,9 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len, > * Now raise the debug interrupt so that it will > * trigger after the current instruction. > */ > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > cpu_interrupt(cpu, CPU_INTERRUPT_DEBUG); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > return; > } > > diff --git a/target/arm/arm-powerctl.c b/target/arm/arm-powerctl.c > index c078849403..aec104834d 100644 > --- a/target/arm/arm-powerctl.c > +++ b/target/arm/arm-powerctl.c > @@ -88,7 +88,7 @@ static void arm_set_cpu_on_async_work(CPUState *target_cpu_state, > g_free(info); > > /* Finally set the power status */ > - assert(qemu_mutex_iothread_locked()); > + assert(qemu_bql_locked()); > target_cpu->power_state = PSCI_ON; > } > > @@ -99,7 +99,7 @@ int arm_set_cpu_on(uint64_t cpuid, uint64_t entry, uint64_t context_id, > ARMCPU *target_cpu; > struct CpuOnInfo *info; > > - assert(qemu_mutex_iothread_locked()); > + assert(qemu_bql_locked()); > > DPRINTF("cpu %" PRId64 " (EL %d, %s) @ 0x%" PRIx64 " with R0 = 0x%" PRIx64 > "\n", cpuid, target_el, target_aa64 ? "aarch64" : "aarch32", entry, > @@ -196,7 +196,7 @@ static void arm_set_cpu_on_and_reset_async_work(CPUState *target_cpu_state, > target_cpu_state->halted = 0; > > /* Finally set the power status */ > - assert(qemu_mutex_iothread_locked()); > + assert(qemu_bql_locked()); > target_cpu->power_state = PSCI_ON; > } > > @@ -205,7 +205,7 @@ int arm_set_cpu_on_and_reset(uint64_t cpuid) > CPUState *target_cpu_state; > ARMCPU *target_cpu; > > - assert(qemu_mutex_iothread_locked()); > + assert(qemu_bql_locked()); > > /* Retrieve the cpu we are powering up */ > target_cpu_state = arm_get_cpu_by_id(cpuid); > @@ -247,7 +247,7 @@ static void arm_set_cpu_off_async_work(CPUState *target_cpu_state, > { > ARMCPU *target_cpu = ARM_CPU(target_cpu_state); > > - assert(qemu_mutex_iothread_locked()); > + assert(qemu_bql_locked()); > target_cpu->power_state = PSCI_OFF; > target_cpu_state->halted = 1; > target_cpu_state->exception_index = EXCP_HLT; > @@ -258,7 +258,7 @@ int arm_set_cpu_off(uint64_t cpuid) > CPUState *target_cpu_state; > ARMCPU *target_cpu; > > - assert(qemu_mutex_iothread_locked()); > + assert(qemu_bql_locked()); > > DPRINTF("cpu %" PRId64 "\n", cpuid); > > @@ -294,7 +294,7 @@ int arm_reset_cpu(uint64_t cpuid) > CPUState *target_cpu_state; > ARMCPU *target_cpu; > > - assert(qemu_mutex_iothread_locked()); > + assert(qemu_bql_locked()); > > DPRINTF("cpu %" PRId64 "\n", cpuid); > > diff --git a/target/arm/helper.c b/target/arm/helper.c > index 2746d3fdac..f472043986 100644 > --- a/target/arm/helper.c > +++ b/target/arm/helper.c > @@ -5831,7 +5831,7 @@ static void do_hcr_write(CPUARMState *env, uint64_t value, uint64_t valid_mask) > * VFIQ are masked unless running at EL0 or EL1, and HCR > * can only be written at EL2. > */ > - g_assert(qemu_mutex_iothread_locked()); > + g_assert(qemu_bql_locked()); > arm_cpu_update_virq(cpu); > arm_cpu_update_vfiq(cpu); > arm_cpu_update_vserr(cpu); > @@ -11344,7 +11344,7 @@ void arm_cpu_do_interrupt(CPUState *cs) > * BQL needs to be held for any modification of > * cs->interrupt_request. > */ > - g_assert(qemu_mutex_iothread_locked()); > + g_assert(qemu_bql_locked()); > > arm_call_pre_el_change_hook(cpu); > > diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c > index 757e13b0f9..017fd13c5d 100644 > --- a/target/arm/hvf/hvf.c > +++ b/target/arm/hvf/hvf.c > @@ -1718,9 +1718,9 @@ static void hvf_wait_for_ipi(CPUState *cpu, struct timespec *ts) > * sleeping. > */ > qatomic_set_mb(&cpu->thread_kicked, false); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > pselect(0, 0, 0, 0, ts, &cpu->accel->unblock_ipi_mask); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > } > > static void hvf_wfi(CPUState *cpu) > @@ -1821,7 +1821,7 @@ int hvf_vcpu_exec(CPUState *cpu) > > flush_cpu_state(cpu); > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > assert_hvf_ok(hv_vcpu_run(cpu->accel->fd)); > > /* handle VMEXIT */ > @@ -1830,7 +1830,7 @@ int hvf_vcpu_exec(CPUState *cpu) > uint32_t ec = syn_get_ec(syndrome); > > ret = 0; > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > switch (exit_reason) { > case HV_EXIT_REASON_EXCEPTION: > /* This is the main one, handle below. */ > diff --git a/target/arm/kvm.c b/target/arm/kvm.c > index 7903e2ddde..431b82e509 100644 > --- a/target/arm/kvm.c > +++ b/target/arm/kvm.c > @@ -833,7 +833,7 @@ MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run) > if (run->s.regs.device_irq_level != cpu->device_irq_level) { > switched_level = cpu->device_irq_level ^ run->s.regs.device_irq_level; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > if (switched_level & KVM_ARM_DEV_EL1_VTIMER) { > qemu_set_irq(cpu->gt_timer_outputs[GTIMER_VIRT], > @@ -862,7 +862,7 @@ MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run) > > /* We also mark unknown levels as processed to not waste cycles */ > cpu->device_irq_level = run->s.regs.device_irq_level; > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > return MEMTXATTRS_UNSPECIFIED; > diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c > index 3c175c93a7..282dc5920e 100644 > --- a/target/arm/kvm64.c > +++ b/target/arm/kvm64.c > @@ -1233,9 +1233,9 @@ bool kvm_arm_handle_debug(CPUState *cs, struct kvm_debug_exit_arch *debug_exit) > env->exception.syndrome = debug_exit->hsr; > env->exception.vaddress = debug_exit->far; > env->exception.target_el = 1; > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > arm_cpu_do_interrupt(cs); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > return false; > } > diff --git a/target/arm/ptw.c b/target/arm/ptw.c > index 1762b058ae..e3cc0a7ab8 100644 > --- a/target/arm/ptw.c > +++ b/target/arm/ptw.c > @@ -772,9 +772,9 @@ static uint64_t arm_casq_ptw(CPUARMState *env, uint64_t old_val, > #if !TCG_OVERSIZED_GUEST > # error "Unexpected configuration" > #endif > - bool locked = qemu_mutex_iothread_locked(); > + bool locked = qemu_bql_locked(); > if (!locked) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > } > if (ptw->out_be) { > cur_val = ldq_be_p(host); > @@ -788,7 +788,7 @@ static uint64_t arm_casq_ptw(CPUARMState *env, uint64_t old_val, > } > } > if (!locked) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > #endif > > diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c > index 8ad84623d3..22d453e6e0 100644 > --- a/target/arm/tcg/helper-a64.c > +++ b/target/arm/tcg/helper-a64.c > @@ -809,9 +809,9 @@ void HELPER(exception_return)(CPUARMState *env, uint64_t new_pc) > goto illegal_return; > } > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > arm_call_pre_el_change_hook(env_archcpu(env)); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > if (!return_to_aa64) { > env->aarch64 = false; > @@ -876,9 +876,9 @@ void HELPER(exception_return)(CPUARMState *env, uint64_t new_pc) > */ > aarch64_sve_change_el(env, cur_el, new_el, return_to_aa64); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > arm_call_el_change_hook(env_archcpu(env)); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > return; > > diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c > index a26adb75aa..5f38b9a4a1 100644 > --- a/target/arm/tcg/m_helper.c > +++ b/target/arm/tcg/m_helper.c > @@ -374,7 +374,7 @@ void HELPER(v7m_preserve_fp_state)(CPUARMState *env) > bool take_exception; > > /* Take the iothread lock as we are going to touch the NVIC */ > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > /* Check the background context had access to the FPU */ > if (!v7m_cpacr_pass(env, is_secure, is_priv)) { > @@ -428,7 +428,7 @@ void HELPER(v7m_preserve_fp_state)(CPUARMState *env) > take_exception = !stacked_ok && > armv7m_nvic_can_take_pending_exception(env->nvic); > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > if (take_exception) { > raise_exception_ra(env, EXCP_LAZYFP, 0, 1, GETPC()); > diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c > index ea08936a85..46a14aac52 100644 > --- a/target/arm/tcg/op_helper.c > +++ b/target/arm/tcg/op_helper.c > @@ -427,9 +427,9 @@ void HELPER(cpsr_write_eret)(CPUARMState *env, uint32_t val) > { > uint32_t mask; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > arm_call_pre_el_change_hook(env_archcpu(env)); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > mask = aarch32_cpsr_valid_mask(env->features, &env_archcpu(env)->isar); > cpsr_write(env, val, mask, CPSRWriteExceptionReturn); > @@ -442,9 +442,9 @@ void HELPER(cpsr_write_eret)(CPUARMState *env, uint32_t val) > env->regs[15] &= (env->thumb ? ~1 : ~3); > arm_rebuild_hflags(env); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > arm_call_el_change_hook(env_archcpu(env)); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > /* Access to user mode registers from privileged modes. */ > @@ -803,9 +803,9 @@ void HELPER(set_cp_reg)(CPUARMState *env, const void *rip, uint32_t value) > const ARMCPRegInfo *ri = rip; > > if (ri->type & ARM_CP_IO) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ri->writefn(env, ri, value); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } else { > ri->writefn(env, ri, value); > } > @@ -817,9 +817,9 @@ uint32_t HELPER(get_cp_reg)(CPUARMState *env, const void *rip) > uint32_t res; > > if (ri->type & ARM_CP_IO) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > res = ri->readfn(env, ri); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } else { > res = ri->readfn(env, ri); > } > @@ -832,9 +832,9 @@ void HELPER(set_cp_reg64)(CPUARMState *env, const void *rip, uint64_t value) > const ARMCPRegInfo *ri = rip; > > if (ri->type & ARM_CP_IO) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ri->writefn(env, ri, value); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } else { > ri->writefn(env, ri, value); > } > @@ -846,9 +846,9 @@ uint64_t HELPER(get_cp_reg64)(CPUARMState *env, const void *rip) > uint64_t res; > > if (ri->type & ARM_CP_IO) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > res = ri->readfn(env, ri); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } else { > res = ri->readfn(env, ri); > } > diff --git a/target/arm/tcg/psci.c b/target/arm/tcg/psci.c > index 6c1239bb96..51af10db99 100644 > --- a/target/arm/tcg/psci.c > +++ b/target/arm/tcg/psci.c > @@ -107,7 +107,7 @@ void arm_handle_psci_call(ARMCPU *cpu) > } > target_cpu = ARM_CPU(target_cpu_state); > > - g_assert(qemu_mutex_iothread_locked()); > + g_assert(qemu_bql_locked()); > ret = target_cpu->power_state; > break; > default: > diff --git a/target/hppa/int_helper.c b/target/hppa/int_helper.c > index 98e9d688f6..9ef8cf7ff4 100644 > --- a/target/hppa/int_helper.c > +++ b/target/hppa/int_helper.c > @@ -84,17 +84,17 @@ void hppa_cpu_alarm_timer(void *opaque) > void HELPER(write_eirr)(CPUHPPAState *env, target_ulong val) > { > env->cr[CR_EIRR] &= ~val; > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > eval_interrupt(env_archcpu(env)); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(write_eiem)(CPUHPPAState *env, target_ulong val) > { > env->cr[CR_EIEM] = val; > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > eval_interrupt(env_archcpu(env)); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void hppa_cpu_do_interrupt(CPUState *cs) > diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c > index 20b9ca3ef5..2cc8b115f7 100644 > --- a/target/i386/hvf/hvf.c > +++ b/target/i386/hvf/hvf.c > @@ -429,9 +429,9 @@ int hvf_vcpu_exec(CPUState *cpu) > } > vmx_update_tpr(cpu); > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > if (!cpu_is_bsp(X86_CPU(cpu)) && cpu->halted) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > return EXCP_HLT; > } > > @@ -450,7 +450,7 @@ int hvf_vcpu_exec(CPUState *cpu) > rip = rreg(cpu->accel->fd, HV_X86_RIP); > env->eflags = rreg(cpu->accel->fd, HV_X86_RFLAGS); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > update_apic_tpr(cpu); > current_cpu = cpu; > diff --git a/target/i386/kvm/hyperv.c b/target/i386/kvm/hyperv.c > index e3ac978648..dcad09f6c9 100644 > --- a/target/i386/kvm/hyperv.c > +++ b/target/i386/kvm/hyperv.c > @@ -45,9 +45,9 @@ void hyperv_x86_synic_update(X86CPU *cpu) > > static void async_synic_update(CPUState *cs, run_on_cpu_data data) > { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > hyperv_x86_synic_update(X86_CPU(cs)); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > int kvm_hv_handle_exit(X86CPU *cpu, struct kvm_hyperv_exit *exit) > diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c > index 11b8177eff..084f5e6b8b 100644 > --- a/target/i386/kvm/kvm.c > +++ b/target/i386/kvm/kvm.c > @@ -4705,9 +4705,9 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run) > /* Inject NMI */ > if (cpu->interrupt_request & (CPU_INTERRUPT_NMI | CPU_INTERRUPT_SMI)) { > if (cpu->interrupt_request & CPU_INTERRUPT_NMI) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > cpu->interrupt_request &= ~CPU_INTERRUPT_NMI; > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > DPRINTF("injected NMI\n"); > ret = kvm_vcpu_ioctl(cpu, KVM_NMI); > if (ret < 0) { > @@ -4716,9 +4716,9 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run) > } > } > if (cpu->interrupt_request & CPU_INTERRUPT_SMI) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > cpu->interrupt_request &= ~CPU_INTERRUPT_SMI; > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > DPRINTF("injected SMI\n"); > ret = kvm_vcpu_ioctl(cpu, KVM_SMI); > if (ret < 0) { > @@ -4729,7 +4729,7 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run) > } > > if (!kvm_pic_in_kernel()) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > } > > /* Force the VCPU out of its inner loop to process any INIT requests > @@ -4782,7 +4782,7 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run) > DPRINTF("setting tpr\n"); > run->cr8 = cpu_get_apic_tpr(x86_cpu->apic_state); > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > } > > @@ -4830,12 +4830,12 @@ MemTxAttrs kvm_arch_post_run(CPUState *cpu, struct kvm_run *run) > /* We need to protect the apic state against concurrent accesses from > * different threads in case the userspace irqchip is used. */ > if (!kvm_irqchip_in_kernel()) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > } > cpu_set_apic_tpr(x86_cpu->apic_state, run->cr8); > cpu_set_apic_base(x86_cpu->apic_state, run->apic_base); > if (!kvm_irqchip_in_kernel()) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > return cpu_get_mem_attrs(env); > } > @@ -5269,17 +5269,17 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) > switch (run->exit_reason) { > case KVM_EXIT_HLT: > DPRINTF("handle_hlt\n"); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ret = kvm_handle_halt(cpu); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > break; > case KVM_EXIT_SET_TPR: > ret = 0; > break; > case KVM_EXIT_TPR_ACCESS: > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ret = kvm_handle_tpr_access(cpu); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > break; > case KVM_EXIT_FAIL_ENTRY: > code = run->fail_entry.hardware_entry_failure_reason; > @@ -5305,9 +5305,9 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) > break; > case KVM_EXIT_DEBUG: > DPRINTF("kvm_exit_debug\n"); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ret = kvm_handle_debug(cpu, &run->debug.arch); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > break; > case KVM_EXIT_HYPERV: > ret = kvm_hv_handle_exit(cpu, &run->hyperv); > diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c > index c0631f9cf4..f79f5d270f 100644 > --- a/target/i386/kvm/xen-emu.c > +++ b/target/i386/kvm/xen-emu.c > @@ -403,7 +403,7 @@ void kvm_xen_maybe_deassert_callback(CPUState *cs) > > /* If the evtchn_upcall_pending flag is cleared, turn the GSI off. */ > if (!vi->evtchn_upcall_pending) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > /* > * Check again now we have the lock, because it may have been > * asserted in the interim. And we don't want to take the lock > @@ -413,7 +413,7 @@ void kvm_xen_maybe_deassert_callback(CPUState *cs) > X86_CPU(cs)->env.xen_callback_asserted = false; > xen_evtchn_set_callback_level(0); > } > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > } > > @@ -773,9 +773,9 @@ static bool handle_set_param(struct kvm_xen_exit *exit, X86CPU *cpu, > > switch (hp.index) { > case HVM_PARAM_CALLBACK_IRQ: > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > err = xen_evtchn_set_callback_param(hp.value); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > xen_set_long_mode(exit->u.hcall.longmode); > break; > default: > @@ -1408,7 +1408,7 @@ int kvm_xen_soft_reset(void) > CPUState *cpu; > int err; > > - assert(qemu_mutex_iothread_locked()); > + assert(qemu_bql_locked()); > > trace_kvm_xen_soft_reset(); > > @@ -1481,9 +1481,9 @@ static int schedop_shutdown(CPUState *cs, uint64_t arg) > break; > > case SHUTDOWN_soft_reset: > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ret = kvm_xen_soft_reset(); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > break; > > default: > diff --git a/target/i386/nvmm/nvmm-accel-ops.c b/target/i386/nvmm/nvmm-accel-ops.c > index 6c46101ac1..387ccfcce5 100644 > --- a/target/i386/nvmm/nvmm-accel-ops.c > +++ b/target/i386/nvmm/nvmm-accel-ops.c > @@ -25,7 +25,7 @@ static void *qemu_nvmm_cpu_thread_fn(void *arg) > > rcu_register_thread(); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > qemu_thread_get_self(cpu->thread); > cpu->thread_id = qemu_get_thread_id(); > current_cpu = cpu; > @@ -55,7 +55,7 @@ static void *qemu_nvmm_cpu_thread_fn(void *arg) > > nvmm_destroy_vcpu(cpu); > cpu_thread_signal_destroyed(cpu); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > rcu_unregister_thread(); > return NULL; > } > diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c > index 7d752bc5e0..9fa5b2e34a 100644 > --- a/target/i386/nvmm/nvmm-all.c > +++ b/target/i386/nvmm/nvmm-all.c > @@ -399,7 +399,7 @@ nvmm_vcpu_pre_run(CPUState *cpu) > uint8_t tpr; > int ret; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > tpr = cpu_get_apic_tpr(x86_cpu->apic_state); > if (tpr != qcpu->tpr) { > @@ -462,7 +462,7 @@ nvmm_vcpu_pre_run(CPUState *cpu) > } > } > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > /* > @@ -485,9 +485,9 @@ nvmm_vcpu_post_run(CPUState *cpu, struct nvmm_vcpu_exit *exit) > tpr = exit->exitstate.cr8; > if (qcpu->tpr != tpr) { > qcpu->tpr = tpr; > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > cpu_set_apic_tpr(x86_cpu->apic_state, qcpu->tpr); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > } > > @@ -648,7 +648,7 @@ nvmm_handle_halted(struct nvmm_machine *mach, CPUState *cpu, > CPUX86State *env = cpu_env(cpu); > int ret = 0; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > if (!((cpu->interrupt_request & CPU_INTERRUPT_HARD) && > (env->eflags & IF_MASK)) && > @@ -658,7 +658,7 @@ nvmm_handle_halted(struct nvmm_machine *mach, CPUState *cpu, > ret = 1; > } > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > return ret; > } > @@ -721,7 +721,7 @@ nvmm_vcpu_loop(CPUState *cpu) > return 0; > } > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > cpu_exec_start(cpu); > > /* > @@ -806,16 +806,16 @@ nvmm_vcpu_loop(CPUState *cpu) > error_report("NVMM: Unexpected VM exit code 0x%lx [hw=0x%lx]", > exit->reason, exit->u.inv.hwcode); > nvmm_get_registers(cpu); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > qemu_system_guest_panicked(cpu_get_crash_info(cpu)); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > ret = -1; > break; > } > } while (ret == 0); > > cpu_exec_end(cpu); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > qatomic_set(&cpu->exit_request, false); > > diff --git a/target/i386/tcg/sysemu/fpu_helper.c b/target/i386/tcg/sysemu/fpu_helper.c > index 93506cdd94..4960e97ebc 100644 > --- a/target/i386/tcg/sysemu/fpu_helper.c > +++ b/target/i386/tcg/sysemu/fpu_helper.c > @@ -32,9 +32,9 @@ void x86_register_ferr_irq(qemu_irq irq) > void fpu_check_raise_ferr_irq(CPUX86State *env) > { > if (ferr_irq && !(env->hflags2 & HF2_IGNNE_MASK)) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > qemu_irq_raise(ferr_irq); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > return; > } > } > @@ -49,7 +49,7 @@ void cpu_set_ignne(void) > { > CPUX86State *env = &X86_CPU(first_cpu)->env; > > - assert(qemu_mutex_iothread_locked()); > + assert(qemu_bql_locked()); > > env->hflags2 |= HF2_IGNNE_MASK; > /* > diff --git a/target/i386/tcg/sysemu/misc_helper.c b/target/i386/tcg/sysemu/misc_helper.c > index e1528b7f80..e859879f4f 100644 > --- a/target/i386/tcg/sysemu/misc_helper.c > +++ b/target/i386/tcg/sysemu/misc_helper.c > @@ -118,9 +118,9 @@ void helper_write_crN(CPUX86State *env, int reg, target_ulong t0) > break; > case 8: > if (!(env->hflags2 & HF2_VINTR_MASK)) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > cpu_set_apic_tpr(env_archcpu(env)->apic_state, t0); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > env->int_ctl = (env->int_ctl & ~V_TPR_MASK) | (t0 & V_TPR_MASK); > > diff --git a/target/i386/whpx/whpx-accel-ops.c b/target/i386/whpx/whpx-accel-ops.c > index 67cad86720..1f29346a88 100644 > --- a/target/i386/whpx/whpx-accel-ops.c > +++ b/target/i386/whpx/whpx-accel-ops.c > @@ -25,7 +25,7 @@ static void *whpx_cpu_thread_fn(void *arg) > > rcu_register_thread(); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > qemu_thread_get_self(cpu->thread); > cpu->thread_id = qemu_get_thread_id(); > current_cpu = cpu; > @@ -55,7 +55,7 @@ static void *whpx_cpu_thread_fn(void *arg) > > whpx_destroy_vcpu(cpu); > cpu_thread_signal_destroyed(cpu); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > rcu_unregister_thread(); > return NULL; > } > diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c > index d29ba916a0..50057b22ee 100644 > --- a/target/i386/whpx/whpx-all.c > +++ b/target/i386/whpx/whpx-all.c > @@ -1324,7 +1324,7 @@ static int whpx_first_vcpu_starting(CPUState *cpu) > struct whpx_state *whpx = &whpx_global; > HRESULT hr; > > - g_assert(qemu_mutex_iothread_locked()); > + g_assert(qemu_bql_locked()); > > if (!QTAILQ_EMPTY(&cpu->breakpoints) || > (whpx->breakpoints.breakpoints && > @@ -1442,7 +1442,7 @@ static int whpx_handle_halt(CPUState *cpu) > CPUX86State *env = cpu_env(cpu); > int ret = 0; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > if (!((cpu->interrupt_request & CPU_INTERRUPT_HARD) && > (env->eflags & IF_MASK)) && > !(cpu->interrupt_request & CPU_INTERRUPT_NMI)) { > @@ -1450,7 +1450,7 @@ static int whpx_handle_halt(CPUState *cpu) > cpu->halted = true; > ret = 1; > } > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > return ret; > } > @@ -1472,7 +1472,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) > memset(&new_int, 0, sizeof(new_int)); > memset(reg_values, 0, sizeof(reg_values)); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > /* Inject NMI */ > if (!vcpu->interruption_pending && > @@ -1563,7 +1563,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) > reg_count += 1; > } > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > vcpu->ready_for_pic_interrupt = false; > > if (reg_count) { > @@ -1590,9 +1590,9 @@ static void whpx_vcpu_post_run(CPUState *cpu) > uint64_t tpr = vcpu->exit_ctx.VpContext.Cr8; > if (vcpu->tpr != tpr) { > vcpu->tpr = tpr; > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > cpu_set_apic_tpr(x86_cpu->apic_state, whpx_cr8_to_apic_tpr(vcpu->tpr)); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > vcpu->interruption_pending = > @@ -1652,7 +1652,7 @@ static int whpx_vcpu_run(CPUState *cpu) > WhpxStepMode exclusive_step_mode = WHPX_STEP_NONE; > int ret; > > - g_assert(qemu_mutex_iothread_locked()); > + g_assert(qemu_bql_locked()); > > if (whpx->running_cpus++ == 0) { > /* Insert breakpoints into memory, update exception exit bitmap. */ > @@ -1690,7 +1690,7 @@ static int whpx_vcpu_run(CPUState *cpu) > } > } > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > if (exclusive_step_mode != WHPX_STEP_NONE) { > start_exclusive(); > @@ -2028,9 +2028,9 @@ static int whpx_vcpu_run(CPUState *cpu) > error_report("WHPX: Unexpected VP exit code %d", > vcpu->exit_ctx.ExitReason); > whpx_get_registers(cpu); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > qemu_system_guest_panicked(cpu_get_crash_info(cpu)); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > break; > } > > @@ -2055,7 +2055,7 @@ static int whpx_vcpu_run(CPUState *cpu) > cpu_exec_end(cpu); > } > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > current_cpu = cpu; > > if (--whpx->running_cpus == 0) { > diff --git a/target/loongarch/csr_helper.c b/target/loongarch/csr_helper.c > index 55341551a5..fa3f08335e 100644 > --- a/target/loongarch/csr_helper.c > +++ b/target/loongarch/csr_helper.c > @@ -89,9 +89,9 @@ target_ulong helper_csrwr_ticlr(CPULoongArchState *env, target_ulong val) > int64_t old_v = 0; > > if (val & 0x1) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > loongarch_cpu_set_irq(cpu, IRQ_TIMER, 0); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > return old_v; > } > diff --git a/target/mips/kvm.c b/target/mips/kvm.c > index e22e24ed97..7e2bac9a84 100644 > --- a/target/mips/kvm.c > +++ b/target/mips/kvm.c > @@ -138,7 +138,7 @@ void kvm_arch_pre_run(CPUState *cs, struct kvm_run *run) > int r; > struct kvm_mips_interrupt intr; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > if ((cs->interrupt_request & CPU_INTERRUPT_HARD) && > cpu_mips_io_interrupts_pending(cpu)) { > @@ -151,7 +151,7 @@ void kvm_arch_pre_run(CPUState *cs, struct kvm_run *run) > } > } > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run) > diff --git a/target/mips/tcg/sysemu/cp0_helper.c b/target/mips/tcg/sysemu/cp0_helper.c > index d349548743..fe87b72a2c 100644 > --- a/target/mips/tcg/sysemu/cp0_helper.c > +++ b/target/mips/tcg/sysemu/cp0_helper.c > @@ -59,9 +59,9 @@ static inline void mips_vpe_wake(MIPSCPU *c) > * because there might be other conditions that state that c should > * be sleeping. > */ > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > cpu_interrupt(CPU(c), CPU_INTERRUPT_WAKE); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > static inline void mips_vpe_sleep(MIPSCPU *cpu) > diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c > index 782a5751b7..1e9a55cec1 100644 > --- a/target/openrisc/sys_helper.c > +++ b/target/openrisc/sys_helper.c > @@ -160,20 +160,20 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb) > break; > case TO_SPR(9, 0): /* PICMR */ > env->picmr = rb; > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > if (env->picsr & env->picmr) { > cpu_interrupt(cs, CPU_INTERRUPT_HARD); > } else { > cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD); > } > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > break; > case TO_SPR(9, 2): /* PICSR */ > env->picsr &= ~rb; > break; > case TO_SPR(10, 0): /* TTMR */ > { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > if ((env->ttmr & TTMR_M) ^ (rb & TTMR_M)) { > switch (rb & TTMR_M) { > case TIMER_NONE: > @@ -198,15 +198,15 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb) > cs->interrupt_request &= ~CPU_INTERRUPT_TIMER; > } > cpu_openrisc_timer_update(cpu); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > break; > > case TO_SPR(10, 1): /* TTCR */ > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > cpu_openrisc_count_set(cpu, rb); > cpu_openrisc_timer_update(cpu); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > break; > } > #endif > @@ -347,9 +347,9 @@ target_ulong HELPER(mfspr)(CPUOpenRISCState *env, target_ulong rd, > return env->ttmr; > > case TO_SPR(10, 1): /* TTCR */ > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > cpu_openrisc_count_update(cpu); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > return cpu_openrisc_count_get(cpu); > } > #endif > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index a42743a3e0..0a1c942831 100644 > --- a/target/ppc/excp_helper.c > +++ b/target/ppc/excp_helper.c > @@ -3056,7 +3056,7 @@ void helper_msgsnd(target_ulong rb) > return; > } > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > CPU_FOREACH(cs) { > PowerPCCPU *cpu = POWERPC_CPU(cs); > CPUPPCState *cenv = &cpu->env; > @@ -3065,7 +3065,7 @@ void helper_msgsnd(target_ulong rb) > ppc_set_irq(cpu, irq, 1); > } > } > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > /* Server Processor Control */ > @@ -3093,7 +3093,7 @@ static void book3s_msgsnd_common(int pir, int irq) > { > CPUState *cs; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > CPU_FOREACH(cs) { > PowerPCCPU *cpu = POWERPC_CPU(cs); > CPUPPCState *cenv = &cpu->env; > @@ -3103,7 +3103,7 @@ static void book3s_msgsnd_common(int pir, int irq) > ppc_set_irq(cpu, irq, 1); > } > } > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void helper_book3s_msgsnd(target_ulong rb) > @@ -3157,14 +3157,14 @@ void helper_book3s_msgsndp(CPUPPCState *env, target_ulong rb) > } > > /* Does iothread need to be locked for walking CPU list? */ > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > THREAD_SIBLING_FOREACH(cs, ccs) { > PowerPCCPU *ccpu = POWERPC_CPU(ccs); > uint32_t thread_id = ppc_cpu_tir(ccpu); > > if (ttir == thread_id) { > ppc_set_irq(ccpu, PPC_INTERRUPT_DOORBELL, 1); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > return; > } > } > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c > index 9b1abe2fc4..132834505c 100644 > --- a/target/ppc/kvm.c > +++ b/target/ppc/kvm.c > @@ -1656,7 +1656,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) > CPUPPCState *env = &cpu->env; > int ret; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > switch (run->exit_reason) { > case KVM_EXIT_DCR: > @@ -1715,7 +1715,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) > break; > } > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > return ret; > } > > diff --git a/target/ppc/misc_helper.c b/target/ppc/misc_helper.c > index a05bdf78c9..41ef14bf24 100644 > --- a/target/ppc/misc_helper.c > +++ b/target/ppc/misc_helper.c > @@ -238,7 +238,7 @@ target_ulong helper_load_dpdes(CPUPPCState *env) > return dpdes; > } > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > THREAD_SIBLING_FOREACH(cs, ccs) { > PowerPCCPU *ccpu = POWERPC_CPU(ccs); > CPUPPCState *cenv = &ccpu->env; > @@ -248,7 +248,7 @@ target_ulong helper_load_dpdes(CPUPPCState *env) > dpdes |= (0x1 << thread_id); > } > } > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > return dpdes; > } > @@ -278,14 +278,14 @@ void helper_store_dpdes(CPUPPCState *env, target_ulong val) > } > > /* Does iothread need to be locked for walking CPU list? */ > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > THREAD_SIBLING_FOREACH(cs, ccs) { > PowerPCCPU *ccpu = POWERPC_CPU(ccs); > uint32_t thread_id = ppc_cpu_tir(ccpu); > > ppc_set_irq(cpu, PPC_INTERRUPT_DOORBELL, val & (0x1 << thread_id)); > } > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > #endif /* defined(TARGET_PPC64) */ > > diff --git a/target/ppc/timebase_helper.c b/target/ppc/timebase_helper.c > index 08a6b47ee0..4cc0572fad 100644 > --- a/target/ppc/timebase_helper.c > +++ b/target/ppc/timebase_helper.c > @@ -173,9 +173,9 @@ target_ulong helper_load_dcr(CPUPPCState *env, target_ulong dcrn) > } else { > int ret; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ret = ppc_dcr_read(env->dcr_env, (uint32_t)dcrn, &val); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > if (unlikely(ret != 0)) { > qemu_log_mask(LOG_GUEST_ERROR, "DCR read error %d %03x\n", > (uint32_t)dcrn, (uint32_t)dcrn); > @@ -196,9 +196,9 @@ void helper_store_dcr(CPUPPCState *env, target_ulong dcrn, target_ulong val) > POWERPC_EXCP_INVAL_INVAL, GETPC()); > } else { > int ret; > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ret = ppc_dcr_write(env->dcr_env, (uint32_t)dcrn, (uint32_t)val); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > if (unlikely(ret != 0)) { > qemu_log_mask(LOG_GUEST_ERROR, "DCR write error %d %03x\n", > (uint32_t)dcrn, (uint32_t)dcrn); > diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c > index 33ab3551f4..27533d0401 100644 > --- a/target/s390x/kvm/kvm.c > +++ b/target/s390x/kvm/kvm.c > @@ -1923,7 +1923,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) > S390CPU *cpu = S390_CPU(cs); > int ret = 0; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > kvm_cpu_synchronize_state(cs); > > @@ -1947,7 +1947,7 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) > fprintf(stderr, "Unknown KVM exit: %d\n", run->exit_reason); > break; > } > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > if (ret == 0) { > ret = EXCP_INTERRUPT; > diff --git a/target/s390x/tcg/misc_helper.c b/target/s390x/tcg/misc_helper.c > index 6aa7907438..4be69c5ae8 100644 > --- a/target/s390x/tcg/misc_helper.c > +++ b/target/s390x/tcg/misc_helper.c > @@ -101,9 +101,9 @@ uint64_t HELPER(stck)(CPUS390XState *env) > /* SCLP service call */ > uint32_t HELPER(servc)(CPUS390XState *env, uint64_t r1, uint64_t r2) > { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > int r = sclp_service_call(env_archcpu(env), r1, r2); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > if (r < 0) { > tcg_s390_program_interrupt(env, -r, GETPC()); > } > @@ -117,9 +117,9 @@ void HELPER(diag)(CPUS390XState *env, uint32_t r1, uint32_t r3, uint32_t num) > switch (num) { > case 0x500: > /* KVM hypercall */ > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > r = s390_virtio_hypercall(env); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > break; > case 0x44: > /* yield */ > @@ -127,9 +127,9 @@ void HELPER(diag)(CPUS390XState *env, uint32_t r1, uint32_t r3, uint32_t num) > break; > case 0x308: > /* ipl */ > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > handle_diag_308(env, r1, r3, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > r = 0; > break; > case 0x288: > @@ -185,7 +185,7 @@ static void update_ckc_timer(CPUS390XState *env) > > /* stop the timer and remove pending CKC IRQs */ > timer_del(env->tod_timer); > - g_assert(qemu_mutex_iothread_locked()); > + g_assert(qemu_bql_locked()); > env->pending_int &= ~INTERRUPT_EXT_CLOCK_COMPARATOR; > > /* the tod has to exceed the ckc, this can never happen if ckc is all 1's */ > @@ -207,9 +207,9 @@ void HELPER(sckc)(CPUS390XState *env, uint64_t ckc) > { > env->ckc = ckc; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > update_ckc_timer(env); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque) > @@ -229,9 +229,9 @@ uint32_t HELPER(sck)(CPUS390XState *env, uint64_t tod_low) > .low = tod_low, > }; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > tdc->set(td, &tod, &error_abort); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > return 0; > } > > @@ -421,9 +421,9 @@ uint32_t HELPER(sigp)(CPUS390XState *env, uint64_t order_code, uint32_t r1, > int cc; > > /* TODO: needed to inject interrupts - push further down */ > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > cc = handle_sigp(env, order_code & SIGP_ORDER_MASK, r1, r3); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > return cc; > } > @@ -433,92 +433,92 @@ uint32_t HELPER(sigp)(CPUS390XState *env, uint64_t order_code, uint32_t r1, > void HELPER(xsch)(CPUS390XState *env, uint64_t r1) > { > S390CPU *cpu = env_archcpu(env); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ioinst_handle_xsch(cpu, r1, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(csch)(CPUS390XState *env, uint64_t r1) > { > S390CPU *cpu = env_archcpu(env); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ioinst_handle_csch(cpu, r1, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(hsch)(CPUS390XState *env, uint64_t r1) > { > S390CPU *cpu = env_archcpu(env); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ioinst_handle_hsch(cpu, r1, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(msch)(CPUS390XState *env, uint64_t r1, uint64_t inst) > { > S390CPU *cpu = env_archcpu(env); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ioinst_handle_msch(cpu, r1, inst >> 16, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(rchp)(CPUS390XState *env, uint64_t r1) > { > S390CPU *cpu = env_archcpu(env); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ioinst_handle_rchp(cpu, r1, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(rsch)(CPUS390XState *env, uint64_t r1) > { > S390CPU *cpu = env_archcpu(env); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ioinst_handle_rsch(cpu, r1, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(sal)(CPUS390XState *env, uint64_t r1) > { > S390CPU *cpu = env_archcpu(env); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ioinst_handle_sal(cpu, r1, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(schm)(CPUS390XState *env, uint64_t r1, uint64_t r2, uint64_t inst) > { > S390CPU *cpu = env_archcpu(env); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ioinst_handle_schm(cpu, r1, r2, inst >> 16, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(ssch)(CPUS390XState *env, uint64_t r1, uint64_t inst) > { > S390CPU *cpu = env_archcpu(env); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ioinst_handle_ssch(cpu, r1, inst >> 16, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(stcrw)(CPUS390XState *env, uint64_t inst) > { > S390CPU *cpu = env_archcpu(env); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ioinst_handle_stcrw(cpu, inst >> 16, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(stsch)(CPUS390XState *env, uint64_t r1, uint64_t inst) > { > S390CPU *cpu = env_archcpu(env); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ioinst_handle_stsch(cpu, r1, inst >> 16, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > uint32_t HELPER(tpi)(CPUS390XState *env, uint64_t addr) > @@ -533,10 +533,10 @@ uint32_t HELPER(tpi)(CPUS390XState *env, uint64_t addr) > tcg_s390_program_interrupt(env, PGM_SPECIFICATION, ra); > } > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > io = qemu_s390_flic_dequeue_io(flic, env->cregs[6]); > if (!io) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > return 0; > } > > @@ -554,7 +554,7 @@ uint32_t HELPER(tpi)(CPUS390XState *env, uint64_t addr) > if (s390_cpu_virt_mem_write(cpu, addr, 0, &intc, sizeof(intc))) { > /* writing failed, reinject and properly clean up */ > s390_io_interrupt(io->id, io->nr, io->parm, io->word); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > g_free(io); > s390_cpu_virt_mem_handle_exc(cpu, ra); > return 0; > @@ -570,24 +570,24 @@ uint32_t HELPER(tpi)(CPUS390XState *env, uint64_t addr) > } > > g_free(io); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > return 1; > } > > void HELPER(tsch)(CPUS390XState *env, uint64_t r1, uint64_t inst) > { > S390CPU *cpu = env_archcpu(env); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ioinst_handle_tsch(cpu, r1, inst >> 16, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(chsc)(CPUS390XState *env, uint64_t inst) > { > S390CPU *cpu = env_archcpu(env); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > ioinst_handle_chsc(cpu, inst >> 16, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > #endif > > @@ -726,27 +726,27 @@ void HELPER(clp)(CPUS390XState *env, uint32_t r2) > { > S390CPU *cpu = env_archcpu(env); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > clp_service_call(cpu, r2, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(pcilg)(CPUS390XState *env, uint32_t r1, uint32_t r2) > { > S390CPU *cpu = env_archcpu(env); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > pcilg_service_call(cpu, r1, r2, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(pcistg)(CPUS390XState *env, uint32_t r1, uint32_t r2) > { > S390CPU *cpu = env_archcpu(env); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > pcistg_service_call(cpu, r1, r2, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(stpcifc)(CPUS390XState *env, uint32_t r1, uint64_t fiba, > @@ -754,9 +754,9 @@ void HELPER(stpcifc)(CPUS390XState *env, uint32_t r1, uint64_t fiba, > { > S390CPU *cpu = env_archcpu(env); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > stpcifc_service_call(cpu, r1, fiba, ar, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(sic)(CPUS390XState *env, uint64_t r1, uint64_t r3) > @@ -764,9 +764,9 @@ void HELPER(sic)(CPUS390XState *env, uint64_t r1, uint64_t r3) > S390CPU *cpu = env_archcpu(env); > int r; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > r = css_do_sic(cpu, (r3 >> 27) & 0x7, r1 & 0xffff); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > /* css_do_sic() may actually return a PGM_xxx value to inject */ > if (r) { > tcg_s390_program_interrupt(env, -r, GETPC()); > @@ -777,9 +777,9 @@ void HELPER(rpcit)(CPUS390XState *env, uint32_t r1, uint32_t r2) > { > S390CPU *cpu = env_archcpu(env); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > rpcit_service_call(cpu, r1, r2, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(pcistb)(CPUS390XState *env, uint32_t r1, uint32_t r3, > @@ -787,9 +787,9 @@ void HELPER(pcistb)(CPUS390XState *env, uint32_t r1, uint32_t r3, > { > S390CPU *cpu = env_archcpu(env); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > pcistb_service_call(cpu, r1, r3, gaddr, ar, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(mpcifc)(CPUS390XState *env, uint32_t r1, uint64_t fiba, > @@ -797,8 +797,8 @@ void HELPER(mpcifc)(CPUS390XState *env, uint32_t r1, uint64_t fiba, > { > S390CPU *cpu = env_archcpu(env); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > mpcifc_service_call(cpu, r1, fiba, ar, GETPC()); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > #endif > diff --git a/target/sparc/int32_helper.c b/target/sparc/int32_helper.c > index 1563613582..3fd28a04e7 100644 > --- a/target/sparc/int32_helper.c > +++ b/target/sparc/int32_helper.c > @@ -70,7 +70,7 @@ void cpu_check_irqs(CPUSPARCState *env) > CPUState *cs; > > /* We should be holding the BQL before we mess with IRQs */ > - g_assert(qemu_mutex_iothread_locked()); > + g_assert(qemu_bql_locked()); > > if (env->pil_in && (env->interrupt_index == 0 || > (env->interrupt_index & ~15) == TT_EXTINT)) { > diff --git a/target/sparc/int64_helper.c b/target/sparc/int64_helper.c > index 1b4155f5f3..dacbbf6b5b 100644 > --- a/target/sparc/int64_helper.c > +++ b/target/sparc/int64_helper.c > @@ -69,7 +69,7 @@ void cpu_check_irqs(CPUSPARCState *env) > (env->softint & ~(SOFTINT_TIMER | SOFTINT_STIMER)); > > /* We should be holding the BQL before we mess with IRQs */ > - g_assert(qemu_mutex_iothread_locked()); > + g_assert(qemu_bql_locked()); > > /* TT_IVEC has a higher priority (16) than TT_EXTINT (31..17) */ > if (env->ivec_status & 0x20) { > @@ -267,9 +267,9 @@ static bool do_modify_softint(CPUSPARCState *env, uint32_t value) > env->softint = value; > #if !defined(CONFIG_USER_ONLY) > if (cpu_interrupts_enabled(env)) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > cpu_check_irqs(env); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > #endif > return true; > diff --git a/target/sparc/win_helper.c b/target/sparc/win_helper.c > index 16d1c70fe7..ba666ec50e 100644 > --- a/target/sparc/win_helper.c > +++ b/target/sparc/win_helper.c > @@ -179,9 +179,9 @@ void helper_wrpsr(CPUSPARCState *env, target_ulong new_psr) > cpu_raise_exception_ra(env, TT_ILL_INSN, GETPC()); > } else { > /* cpu_put_psr may trigger interrupts, hence BQL */ > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > cpu_put_psr(env, new_psr); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > } > > @@ -407,9 +407,9 @@ void helper_wrpstate(CPUSPARCState *env, target_ulong new_state) > > #if !defined(CONFIG_USER_ONLY) > if (cpu_interrupts_enabled(env)) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > cpu_check_irqs(env); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > #endif > } > @@ -422,9 +422,9 @@ void helper_wrpil(CPUSPARCState *env, target_ulong new_pil) > env->psrpil = new_pil; > > if (cpu_interrupts_enabled(env)) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > cpu_check_irqs(env); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > #endif > } > @@ -451,9 +451,9 @@ void helper_done(CPUSPARCState *env) > > #if !defined(CONFIG_USER_ONLY) > if (cpu_interrupts_enabled(env)) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > cpu_check_irqs(env); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > #endif > } > @@ -480,9 +480,9 @@ void helper_retry(CPUSPARCState *env) > > #if !defined(CONFIG_USER_ONLY) > if (cpu_interrupts_enabled(env)) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > cpu_check_irqs(env); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > #endif > } > diff --git a/target/xtensa/exc_helper.c b/target/xtensa/exc_helper.c > index 91354884f7..405387decb 100644 > --- a/target/xtensa/exc_helper.c > +++ b/target/xtensa/exc_helper.c > @@ -105,9 +105,9 @@ void HELPER(waiti)(CPUXtensaState *env, uint32_t pc, uint32_t intlevel) > env->sregs[PS] = (env->sregs[PS] & ~PS_INTLEVEL) | > (intlevel << PS_INTLEVEL_SHIFT); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > check_interrupts(env); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > if (env->pending_irq_level) { > cpu_loop_exit(cpu); > @@ -120,9 +120,9 @@ void HELPER(waiti)(CPUXtensaState *env, uint32_t pc, uint32_t intlevel) > > void HELPER(check_interrupts)(CPUXtensaState *env) > { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > check_interrupts(env); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > void HELPER(intset)(CPUXtensaState *env, uint32_t v) > diff --git a/ui/spice-core.c b/ui/spice-core.c > index db21db2c94..1d895d2fe8 100644 > --- a/ui/spice-core.c > +++ b/ui/spice-core.c > @@ -222,7 +222,7 @@ static void channel_event(int event, SpiceChannelEventInfo *info) > */ > bool need_lock = !qemu_thread_is_self(&me); > if (need_lock) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > } > > if (info->flags & SPICE_CHANNEL_EVENT_FLAG_ADDR_EXT) { > @@ -260,7 +260,7 @@ static void channel_event(int event, SpiceChannelEventInfo *info) > } > > if (need_lock) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > qapi_free_SpiceServerInfo(server); > diff --git a/util/async.c b/util/async.c > index 8f90ddc304..49d07b3c73 100644 > --- a/util/async.c > +++ b/util/async.c > @@ -741,7 +741,7 @@ AioContext *qemu_get_current_aio_context(void) > if (ctx) { > return ctx; > } > - if (qemu_mutex_iothread_locked()) { > + if (qemu_bql_locked()) { > /* Possibly in a vCPU thread. */ > return qemu_get_aio_context(); > } > diff --git a/util/main-loop.c b/util/main-loop.c > index 797b640c41..921fab3f32 100644 > --- a/util/main-loop.c > +++ b/util/main-loop.c > @@ -302,13 +302,13 @@ static int os_host_main_loop_wait(int64_t timeout) > > glib_pollfds_fill(&timeout); > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > replay_mutex_unlock(); > > ret = qemu_poll_ns((GPollFD *)gpollfds->data, gpollfds->len, timeout); > > replay_mutex_lock(); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > glib_pollfds_poll(); > > @@ -517,7 +517,7 @@ static int os_host_main_loop_wait(int64_t timeout) > > poll_timeout_ns = qemu_soonest_timeout(poll_timeout_ns, timeout); > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > > replay_mutex_unlock(); > > @@ -525,7 +525,7 @@ static int os_host_main_loop_wait(int64_t timeout) > > replay_mutex_lock(); > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > if (g_poll_ret > 0) { > for (i = 0; i < w->num; i++) { > w->revents[i] = poll_fds[n_poll_fds + i].revents; > diff --git a/util/rcu.c b/util/rcu.c > index e587bcc483..8331f24288 100644 > --- a/util/rcu.c > +++ b/util/rcu.c > @@ -283,24 +283,24 @@ static void *call_rcu_thread(void *opaque) > > qatomic_sub(&rcu_call_count, n); > synchronize_rcu(); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > while (n > 0) { > node = try_dequeue(); > while (!node) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > qemu_event_reset(&rcu_call_ready_event); > node = try_dequeue(); > if (!node) { > qemu_event_wait(&rcu_call_ready_event); > node = try_dequeue(); > } > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > } > > n--; > node->func(node); > } > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > abort(); > } > @@ -337,13 +337,13 @@ static void drain_rcu_callback(struct rcu_head *node) > void drain_call_rcu(void) > { > struct rcu_drain rcu_drain; > - bool locked = qemu_mutex_iothread_locked(); > + bool locked = qemu_bql_locked(); > > memset(&rcu_drain, 0, sizeof(struct rcu_drain)); > qemu_event_init(&rcu_drain.drain_complete_event, false); > > if (locked) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > > > @@ -365,7 +365,7 @@ void drain_call_rcu(void) > qatomic_dec(&in_drain_call_rcu); > > if (locked) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > } > > } > diff --git a/audio/coreaudio.m b/audio/coreaudio.m > index 8cd129a27d..866d7a9436 100644 > --- a/audio/coreaudio.m > +++ b/audio/coreaudio.m > @@ -547,7 +547,7 @@ static OSStatus handle_voice_change( > { > coreaudioVoiceOut *core = in_client_data; > > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > > if (core->outputDeviceID) { > fini_out_device(core); > @@ -557,7 +557,7 @@ static OSStatus handle_voice_change( > update_device_playback_state(core); > } > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > return 0; > } > > diff --git a/memory_ldst.c.inc b/memory_ldst.c.inc > index 84b868f294..cd8a629816 100644 > --- a/memory_ldst.c.inc > +++ b/memory_ldst.c.inc > @@ -61,7 +61,7 @@ static inline uint32_t glue(address_space_ldl_internal, SUFFIX)(ARG1_DECL, > *result = r; > } > if (release_lock) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > RCU_READ_UNLOCK(); > return val; > @@ -130,7 +130,7 @@ static inline uint64_t glue(address_space_ldq_internal, SUFFIX)(ARG1_DECL, > *result = r; > } > if (release_lock) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > RCU_READ_UNLOCK(); > return val; > @@ -186,7 +186,7 @@ uint8_t glue(address_space_ldub, SUFFIX)(ARG1_DECL, > *result = r; > } > if (release_lock) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > RCU_READ_UNLOCK(); > return val; > @@ -234,7 +234,7 @@ static inline uint16_t glue(address_space_lduw_internal, SUFFIX)(ARG1_DECL, > *result = r; > } > if (release_lock) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > RCU_READ_UNLOCK(); > return val; > @@ -295,7 +295,7 @@ void glue(address_space_stl_notdirty, SUFFIX)(ARG1_DECL, > *result = r; > } > if (release_lock) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > RCU_READ_UNLOCK(); > } > @@ -339,7 +339,7 @@ static inline void glue(address_space_stl_internal, SUFFIX)(ARG1_DECL, > *result = r; > } > if (release_lock) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > RCU_READ_UNLOCK(); > } > @@ -391,7 +391,7 @@ void glue(address_space_stb, SUFFIX)(ARG1_DECL, > *result = r; > } > if (release_lock) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > RCU_READ_UNLOCK(); > } > @@ -435,7 +435,7 @@ static inline void glue(address_space_stw_internal, SUFFIX)(ARG1_DECL, > *result = r; > } > if (release_lock) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > RCU_READ_UNLOCK(); > } > @@ -499,7 +499,7 @@ static void glue(address_space_stq_internal, SUFFIX)(ARG1_DECL, > *result = r; > } > if (release_lock) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > RCU_READ_UNLOCK(); > } > diff --git a/target/i386/hvf/README.md b/target/i386/hvf/README.md > index 2d33477aca..679b93b630 100644 > --- a/target/i386/hvf/README.md > +++ b/target/i386/hvf/README.md > @@ -4,4 +4,4 @@ These sources (and ../hvf-all.c) are adapted from Veertu Inc's vdhh (Veertu Desk > > 1. Adapt to our current QEMU's `CPUState` structure and `address_space_rw` API; many struct members have been moved around (emulated x86 state, xsave_buf) due to historical differences + QEMU needing to handle more emulation targets. > 2. Removal of `apic_page` and hyperv-related functionality. > -3. More relaxed use of `qemu_mutex_lock_iothread`. > +3. More relaxed use of `qemu_bql_lock`. > diff --git a/ui/cocoa.m b/ui/cocoa.m > index cd069da696..8a7d0a6f0c 100644 > --- a/ui/cocoa.m > +++ b/ui/cocoa.m > @@ -117,29 +117,29 @@ static void cocoa_switch(DisplayChangeListener *dcl, > typedef void (^CodeBlock)(void); > typedef bool (^BoolCodeBlock)(void); > > -static void with_iothread_lock(CodeBlock block) > +static void with_bql(CodeBlock block) > { > - bool locked = qemu_mutex_iothread_locked(); > + bool locked = qemu_bql_locked(); > if (!locked) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > } > block(); > if (!locked) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > } > > -static bool bool_with_iothread_lock(BoolCodeBlock block) > +static bool bool_with_bql(BoolCodeBlock block) > { > - bool locked = qemu_mutex_iothread_locked(); > + bool locked = qemu_bql_locked(); > bool val; > > if (!locked) { > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > } > val = block(); > if (!locked) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > } > return val; > } > @@ -605,7 +605,7 @@ - (void) updateUIInfo > return; > } > > - with_iothread_lock(^{ > + with_bql(^{ > [self updateUIInfoLocked]; > }); > } > @@ -790,7 +790,7 @@ - (void) handleMonitorInput:(NSEvent *)event > > - (bool) handleEvent:(NSEvent *)event > { > - return bool_with_iothread_lock(^{ > + return bool_with_bql(^{ > return [self handleEventLocked:event]; > }); > } > @@ -1182,7 +1182,7 @@ - (QEMUScreen) gscreen {return screen;} > */ > - (void) raiseAllKeys > { > - with_iothread_lock(^{ > + with_bql(^{ > qkbd_state_lift_all_keys(kbd); > }); > } > @@ -1282,7 +1282,7 @@ - (void)applicationWillTerminate:(NSNotification *)aNotification > { > COCOA_DEBUG("QemuCocoaAppController: applicationWillTerminate\n"); > > - with_iothread_lock(^{ > + with_bql(^{ > shutdown_action = SHUTDOWN_ACTION_POWEROFF; > qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_UI); > }); > @@ -1420,7 +1420,7 @@ - (void)displayConsole:(id)sender > /* Pause the guest */ > - (void)pauseQEMU:(id)sender > { > - with_iothread_lock(^{ > + with_bql(^{ > qmp_stop(NULL); > }); > [sender setEnabled: NO]; > @@ -1431,7 +1431,7 @@ - (void)pauseQEMU:(id)sender > /* Resume running the guest operating system */ > - (void)resumeQEMU:(id) sender > { > - with_iothread_lock(^{ > + with_bql(^{ > qmp_cont(NULL); > }); > [sender setEnabled: NO]; > @@ -1461,7 +1461,7 @@ - (void)removePause > /* Restarts QEMU */ > - (void)restartQEMU:(id)sender > { > - with_iothread_lock(^{ > + with_bql(^{ > qmp_system_reset(NULL); > }); > } > @@ -1469,7 +1469,7 @@ - (void)restartQEMU:(id)sender > /* Powers down QEMU */ > - (void)powerDownQEMU:(id)sender > { > - with_iothread_lock(^{ > + with_bql(^{ > qmp_system_powerdown(NULL); > }); > } > @@ -1488,7 +1488,7 @@ - (void)ejectDeviceMedia:(id)sender > } > > __block Error *err = NULL; > - with_iothread_lock(^{ > + with_bql(^{ > qmp_eject([drive cStringUsingEncoding: NSASCIIStringEncoding], > NULL, false, false, &err); > }); > @@ -1523,7 +1523,7 @@ - (void)changeDeviceMedia:(id)sender > } > > __block Error *err = NULL; > - with_iothread_lock(^{ > + with_bql(^{ > qmp_blockdev_change_medium([drive cStringUsingEncoding: > NSASCIIStringEncoding], > NULL, > @@ -1605,7 +1605,7 @@ - (void)adjustSpeed:(id)sender > // get the throttle percentage > throttle_pct = [sender tag]; > > - with_iothread_lock(^{ > + with_bql(^{ > cpu_throttle_set(throttle_pct); > }); > COCOA_DEBUG("cpu throttling at %d%c\n", cpu_throttle_get_percentage(), '%'); > @@ -1819,7 +1819,7 @@ - (void)pasteboard:(NSPasteboard *)sender provideDataForType:(NSPasteboardType)t > return; > } > > - with_iothread_lock(^{ > + with_bql(^{ > QemuClipboardInfo *info = qemu_clipboard_info_ref(cbinfo); > qemu_event_reset(&cbevent); > qemu_clipboard_request(info, QEMU_CLIPBOARD_TYPE_TEXT); > @@ -1827,9 +1827,9 @@ - (void)pasteboard:(NSPasteboard *)sender provideDataForType:(NSPasteboardType)t > while (info == cbinfo && > info->types[QEMU_CLIPBOARD_TYPE_TEXT].available && > info->types[QEMU_CLIPBOARD_TYPE_TEXT].data == NULL) { > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > qemu_event_wait(&cbevent); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > } > > if (info == cbinfo) { > @@ -1927,9 +1927,9 @@ static void cocoa_clipboard_request(QemuClipboardInfo *info, > int status; > > COCOA_DEBUG("Second thread: calling qemu_default_main()\n"); > - qemu_mutex_lock_iothread(); > + qemu_bql_lock(); > status = qemu_default_main(); > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > COCOA_DEBUG("Second thread: qemu_default_main() returned, exiting\n"); > [cbowner release]; > exit(status); > @@ -1941,7 +1941,7 @@ static int cocoa_main(void) > > COCOA_DEBUG("Entered %s()\n", __func__); > > - qemu_mutex_unlock_iothread(); > + qemu_bql_unlock(); > qemu_thread_create(&thread, "qemu_main", call_qemu_main, > NULL, QEMU_THREAD_DETACHED); > ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() 2023-12-01 5:12 ` Harsh Prateek Bora @ 2023-12-07 11:44 ` Stefan Hajnoczi 0 siblings, 0 replies; 34+ messages in thread From: Stefan Hajnoczi @ 2023-12-07 11:44 UTC (permalink / raw) To: Harsh Prateek Bora Cc: qemu-devel, Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang [-- Attachment #1: Type: text/plain, Size: 672 bytes --] On Fri, Dec 01, 2023 at 10:42:43AM +0530, Harsh Prateek Bora wrote: > On 11/30/23 02:56, Stefan Hajnoczi wrote: > > diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c > > index 9bd98e8219..ffb2c25145 100644 > > --- a/hw/remote/mpqemu-link.c > > +++ b/hw/remote/mpqemu-link.c > > @@ -33,7 +33,7 @@ > > */ > > bool mpqemu_msg_send(MPQemuMsg *msg, QIOChannel *ioc, Error **errp) > > { > > - bool iolock = qemu_mutex_iothread_locked(); > > + bool iolock = qemu_bql_locked(); > > Should var name (one more below) be updated to reflect this update ? Yes. I'll grep for that tree-wide because there might be other instances. Stefan [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 2/6] qemu/main-loop: rename QEMU_IOTHREAD_LOCK_GUARD to QEMU_BQL_LOCK_GUARD 2023-11-29 21:26 [PATCH 0/6] Make Big QEMU Lock naming consistent Stefan Hajnoczi 2023-11-29 21:26 ` [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() Stefan Hajnoczi @ 2023-11-29 21:26 ` Stefan Hajnoczi 2023-11-30 9:03 ` Paul Durrant ` (3 more replies) 2023-11-29 21:26 ` [PATCH 3/6] qemu/main-loop: rename qemu_cond_wait_iothread() to qemu_cond_wait_bql() Stefan Hajnoczi ` (3 subsequent siblings) 5 siblings, 4 replies; 34+ messages in thread From: Stefan Hajnoczi @ 2023-11-29 21:26 UTC (permalink / raw) To: qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, Stefan Hajnoczi, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang The name "iothread" is overloaded. Use the term Big QEMU Lock (BQL) instead, it is already widely used and unambiguous. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- include/qemu/main-loop.h | 20 ++++++++++---------- hw/i386/kvm/xen_evtchn.c | 14 +++++++------- hw/i386/kvm/xen_gnttab.c | 2 +- hw/mips/mips_int.c | 2 +- hw/ppc/ppc.c | 2 +- target/i386/kvm/xen-emu.c | 2 +- target/ppc/excp_helper.c | 2 +- target/ppc/helper_regs.c | 2 +- target/riscv/cpu_helper.c | 4 ++-- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h index d6f75e57bd..0b6a3e4824 100644 --- a/include/qemu/main-loop.h +++ b/include/qemu/main-loop.h @@ -344,13 +344,13 @@ void qemu_bql_lock_impl(const char *file, int line); void qemu_bql_unlock(void); /** - * QEMU_IOTHREAD_LOCK_GUARD + * QEMU_BQL_LOCK_GUARD * - * Wrap a block of code in a conditional qemu_mutex_{lock,unlock}_iothread. + * Wrap a block of code in a conditional qemu_bql_{lock,unlock}. */ -typedef struct IOThreadLockAuto IOThreadLockAuto; +typedef struct BQLLockAuto BQLLockAuto; -static inline IOThreadLockAuto *qemu_iothread_auto_lock(const char *file, +static inline BQLLockAuto *qemu_bql_auto_lock(const char *file, int line) { if (qemu_bql_locked()) { @@ -358,19 +358,19 @@ static inline IOThreadLockAuto *qemu_iothread_auto_lock(const char *file, } qemu_bql_lock_impl(file, line); /* Anything non-NULL causes the cleanup function to be called */ - return (IOThreadLockAuto *)(uintptr_t)1; + return (BQLLockAuto *)(uintptr_t)1; } -static inline void qemu_iothread_auto_unlock(IOThreadLockAuto *l) +static inline void qemu_bql_auto_unlock(BQLLockAuto *l) { qemu_bql_unlock(); } -G_DEFINE_AUTOPTR_CLEANUP_FUNC(IOThreadLockAuto, qemu_iothread_auto_unlock) +G_DEFINE_AUTOPTR_CLEANUP_FUNC(BQLLockAuto, qemu_bql_auto_unlock) -#define QEMU_IOTHREAD_LOCK_GUARD() \ - g_autoptr(IOThreadLockAuto) _iothread_lock_auto __attribute__((unused)) \ - = qemu_iothread_auto_lock(__FILE__, __LINE__) +#define QEMU_BQL_LOCK_GUARD() \ + g_autoptr(BQLLockAuto) _bql_lock_auto __attribute__((unused)) \ + = qemu_bql_auto_lock(__FILE__, __LINE__) /* * qemu_cond_wait_iothread: Wait on condition for the main loop mutex diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c index 07d0ff0253..3ab686bd79 100644 --- a/hw/i386/kvm/xen_evtchn.c +++ b/hw/i386/kvm/xen_evtchn.c @@ -1127,7 +1127,7 @@ int xen_evtchn_reset_op(struct evtchn_reset *reset) return -ESRCH; } - QEMU_IOTHREAD_LOCK_GUARD(); + QEMU_BQL_LOCK_GUARD(); return xen_evtchn_soft_reset(); } @@ -1145,7 +1145,7 @@ int xen_evtchn_close_op(struct evtchn_close *close) return -EINVAL; } - QEMU_IOTHREAD_LOCK_GUARD(); + QEMU_BQL_LOCK_GUARD(); qemu_mutex_lock(&s->port_lock); ret = close_port(s, close->port, &flush_kvm_routes); @@ -1272,7 +1272,7 @@ int xen_evtchn_bind_pirq_op(struct evtchn_bind_pirq *pirq) return -EINVAL; } - QEMU_IOTHREAD_LOCK_GUARD(); + QEMU_BQL_LOCK_GUARD(); if (s->pirq[pirq->pirq].port) { return -EBUSY; @@ -1824,7 +1824,7 @@ int xen_physdev_map_pirq(struct physdev_map_pirq *map) return -ENOTSUP; } - QEMU_IOTHREAD_LOCK_GUARD(); + QEMU_BQL_LOCK_GUARD(); QEMU_LOCK_GUARD(&s->port_lock); if (map->domid != DOMID_SELF && map->domid != xen_domid) { @@ -1884,7 +1884,7 @@ int xen_physdev_unmap_pirq(struct physdev_unmap_pirq *unmap) return -EINVAL; } - QEMU_IOTHREAD_LOCK_GUARD(); + QEMU_BQL_LOCK_GUARD(); qemu_mutex_lock(&s->port_lock); if (!pirq_inuse(s, pirq)) { @@ -1924,7 +1924,7 @@ int xen_physdev_eoi_pirq(struct physdev_eoi *eoi) return -ENOTSUP; } - QEMU_IOTHREAD_LOCK_GUARD(); + QEMU_BQL_LOCK_GUARD(); QEMU_LOCK_GUARD(&s->port_lock); if (!pirq_inuse(s, pirq)) { @@ -1956,7 +1956,7 @@ int xen_physdev_query_pirq(struct physdev_irq_status_query *query) return -ENOTSUP; } - QEMU_IOTHREAD_LOCK_GUARD(); + QEMU_BQL_LOCK_GUARD(); QEMU_LOCK_GUARD(&s->port_lock); if (!pirq_inuse(s, pirq)) { diff --git a/hw/i386/kvm/xen_gnttab.c b/hw/i386/kvm/xen_gnttab.c index 0a24f53f20..ee5f8cf257 100644 --- a/hw/i386/kvm/xen_gnttab.c +++ b/hw/i386/kvm/xen_gnttab.c @@ -176,7 +176,7 @@ int xen_gnttab_map_page(uint64_t idx, uint64_t gfn) return -EINVAL; } - QEMU_IOTHREAD_LOCK_GUARD(); + QEMU_BQL_LOCK_GUARD(); QEMU_LOCK_GUARD(&s->gnt_lock); xen_overlay_do_map_page(&s->gnt_aliases[idx], gpa); diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c index 6c32e466a3..c2454f9724 100644 --- a/hw/mips/mips_int.c +++ b/hw/mips/mips_int.c @@ -36,7 +36,7 @@ static void cpu_mips_irq_request(void *opaque, int irq, int level) return; } - QEMU_IOTHREAD_LOCK_GUARD(); + QEMU_BQL_LOCK_GUARD(); if (level) { env->CP0_Cause |= 1 << (irq + CP0Ca_IP); diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index c8c3b43602..ce7d3692c4 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -47,7 +47,7 @@ void ppc_set_irq(PowerPCCPU *cpu, int irq, int level) unsigned int old_pending; /* We may already have the BQL if coming from the reset path */ - QEMU_IOTHREAD_LOCK_GUARD(); + QEMU_BQL_LOCK_GUARD(); old_pending = env->pending_interrupts; diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c index f79f5d270f..be8a1fef58 100644 --- a/target/i386/kvm/xen-emu.c +++ b/target/i386/kvm/xen-emu.c @@ -581,7 +581,7 @@ static int xen_set_shared_info(uint64_t gfn) uint64_t gpa = gfn << TARGET_PAGE_BITS; int i, err; - QEMU_IOTHREAD_LOCK_GUARD(); + QEMU_BQL_LOCK_GUARD(); /* * The xen_overlay device tells KVM about it too, since it had to diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 0a1c942831..2122f89990 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -2222,7 +2222,7 @@ static int ppc_next_unmasked_interrupt(CPUPPCState *env) void ppc_maybe_interrupt(CPUPPCState *env) { CPUState *cs = env_cpu(env); - QEMU_IOTHREAD_LOCK_GUARD(); + QEMU_BQL_LOCK_GUARD(); if (ppc_next_unmasked_interrupt(env)) { cpu_interrupt(cs, CPU_INTERRUPT_HARD); diff --git a/target/ppc/helper_regs.c b/target/ppc/helper_regs.c index f380342d4d..b92e3a223a 100644 --- a/target/ppc/helper_regs.c +++ b/target/ppc/helper_regs.c @@ -244,7 +244,7 @@ void cpu_interrupt_exittb(CPUState *cs) * unless running with TCG. */ if (tcg_enabled()) { - QEMU_IOTHREAD_LOCK_GUARD(); + QEMU_BQL_LOCK_GUARD(); cpu_interrupt(cs, CPU_INTERRUPT_EXITTB); } } diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index e7e23b34f4..fa73bb8ce9 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -655,7 +655,7 @@ void riscv_cpu_interrupt(CPURISCVState *env) uint64_t gein, vsgein = 0, vstip = 0, irqf = 0; CPUState *cs = env_cpu(env); - QEMU_IOTHREAD_LOCK_GUARD(); + QEMU_BQL_LOCK_GUARD(); if (env->virt_enabled) { gein = get_field(env->hstatus, HSTATUS_VGEIN); @@ -681,7 +681,7 @@ uint64_t riscv_cpu_update_mip(CPURISCVState *env, uint64_t mask, uint64_t value) /* No need to update mip for VSTIP */ mask = ((mask == MIP_VSTIP) && env->vstime_irq) ? 0 : mask; - QEMU_IOTHREAD_LOCK_GUARD(); + QEMU_BQL_LOCK_GUARD(); env->mip = (env->mip & ~mask) | (value & mask); -- 2.42.0 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* Re: [PATCH 2/6] qemu/main-loop: rename QEMU_IOTHREAD_LOCK_GUARD to QEMU_BQL_LOCK_GUARD 2023-11-29 21:26 ` [PATCH 2/6] qemu/main-loop: rename QEMU_IOTHREAD_LOCK_GUARD to QEMU_BQL_LOCK_GUARD Stefan Hajnoczi @ 2023-11-30 9:03 ` Paul Durrant 2023-11-30 9:14 ` Ilya Leoshkevich ` (2 subsequent siblings) 3 siblings, 0 replies; 34+ messages in thread From: Paul Durrant @ 2023-11-30 9:03 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang On 29/11/2023 21:26, Stefan Hajnoczi wrote: > The name "iothread" is overloaded. Use the term Big QEMU Lock (BQL) > instead, it is already widely used and unambiguous. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > include/qemu/main-loop.h | 20 ++++++++++---------- > hw/i386/kvm/xen_evtchn.c | 14 +++++++------- > hw/i386/kvm/xen_gnttab.c | 2 +- > hw/mips/mips_int.c | 2 +- > hw/ppc/ppc.c | 2 +- > target/i386/kvm/xen-emu.c | 2 +- > target/ppc/excp_helper.c | 2 +- > target/ppc/helper_regs.c | 2 +- > target/riscv/cpu_helper.c | 4 ++-- > 9 files changed, 25 insertions(+), 25 deletions(-) > Reviewed-by: Paul Durrant <paul@xen.org> ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 2/6] qemu/main-loop: rename QEMU_IOTHREAD_LOCK_GUARD to QEMU_BQL_LOCK_GUARD 2023-11-29 21:26 ` [PATCH 2/6] qemu/main-loop: rename QEMU_IOTHREAD_LOCK_GUARD to QEMU_BQL_LOCK_GUARD Stefan Hajnoczi 2023-11-30 9:03 ` Paul Durrant @ 2023-11-30 9:14 ` Ilya Leoshkevich 2023-11-30 20:27 ` Stefan Hajnoczi 2023-11-30 12:26 ` David Woodhouse 2023-11-30 12:58 ` Cédric Le Goater 3 siblings, 1 reply; 34+ messages in thread From: Ilya Leoshkevich @ 2023-11-30 9:14 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang On Wed, 2023-11-29 at 16:26 -0500, Stefan Hajnoczi wrote: > The name "iothread" is overloaded. Use the term Big QEMU Lock (BQL) > instead, it is already widely used and unambiguous. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > include/qemu/main-loop.h | 20 ++++++++++---------- > hw/i386/kvm/xen_evtchn.c | 14 +++++++------- > hw/i386/kvm/xen_gnttab.c | 2 +- > hw/mips/mips_int.c | 2 +- > hw/ppc/ppc.c | 2 +- > target/i386/kvm/xen-emu.c | 2 +- > target/ppc/excp_helper.c | 2 +- > target/ppc/helper_regs.c | 2 +- > target/riscv/cpu_helper.c | 4 ++-- > 9 files changed, 25 insertions(+), 25 deletions(-) > > diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h > index d6f75e57bd..0b6a3e4824 100644 > --- a/include/qemu/main-loop.h > +++ b/include/qemu/main-loop.h > @@ -344,13 +344,13 @@ void qemu_bql_lock_impl(const char *file, int > line); > void qemu_bql_unlock(void); > > /** > - * QEMU_IOTHREAD_LOCK_GUARD > + * QEMU_BQL_LOCK_GUARD > * > - * Wrap a block of code in a conditional > qemu_mutex_{lock,unlock}_iothread. > + * Wrap a block of code in a conditional qemu_bql_{lock,unlock}. > */ > -typedef struct IOThreadLockAuto IOThreadLockAuto; > +typedef struct BQLLockAuto BQLLockAuto; > > -static inline IOThreadLockAuto *qemu_iothread_auto_lock(const char > *file, > +static inline BQLLockAuto *qemu_bql_auto_lock(const char *file, > int line) The padding is not correct anymore. Other than this: Acked-by: Ilya Leoshkevich <iii@linux.ibm.com> ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 2/6] qemu/main-loop: rename QEMU_IOTHREAD_LOCK_GUARD to QEMU_BQL_LOCK_GUARD 2023-11-30 9:14 ` Ilya Leoshkevich @ 2023-11-30 20:27 ` Stefan Hajnoczi 2023-12-01 7:10 ` Harsh Prateek Bora 0 siblings, 1 reply; 34+ messages in thread From: Stefan Hajnoczi @ 2023-11-30 20:27 UTC (permalink / raw) To: Ilya Leoshkevich Cc: qemu-devel, Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang [-- Attachment #1: Type: text/plain, Size: 1853 bytes --] On Thu, Nov 30, 2023 at 10:14:47AM +0100, Ilya Leoshkevich wrote: > On Wed, 2023-11-29 at 16:26 -0500, Stefan Hajnoczi wrote: > > The name "iothread" is overloaded. Use the term Big QEMU Lock (BQL) > > instead, it is already widely used and unambiguous. > > > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > > --- > > include/qemu/main-loop.h | 20 ++++++++++---------- > > hw/i386/kvm/xen_evtchn.c | 14 +++++++------- > > hw/i386/kvm/xen_gnttab.c | 2 +- > > hw/mips/mips_int.c | 2 +- > > hw/ppc/ppc.c | 2 +- > > target/i386/kvm/xen-emu.c | 2 +- > > target/ppc/excp_helper.c | 2 +- > > target/ppc/helper_regs.c | 2 +- > > target/riscv/cpu_helper.c | 4 ++-- > > 9 files changed, 25 insertions(+), 25 deletions(-) > > > > diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h > > index d6f75e57bd..0b6a3e4824 100644 > > --- a/include/qemu/main-loop.h > > +++ b/include/qemu/main-loop.h > > @@ -344,13 +344,13 @@ void qemu_bql_lock_impl(const char *file, int > > line); > > void qemu_bql_unlock(void); > > > > /** > > - * QEMU_IOTHREAD_LOCK_GUARD > > + * QEMU_BQL_LOCK_GUARD > > * > > - * Wrap a block of code in a conditional > > qemu_mutex_{lock,unlock}_iothread. > > + * Wrap a block of code in a conditional qemu_bql_{lock,unlock}. > > */ > > -typedef struct IOThreadLockAuto IOThreadLockAuto; > > +typedef struct BQLLockAuto BQLLockAuto; > > > > -static inline IOThreadLockAuto *qemu_iothread_auto_lock(const char > > *file, > > +static inline BQLLockAuto *qemu_bql_auto_lock(const char *file, > > int line) > > The padding is not correct anymore. Good point, I didn't check the formatting after search-and-replace. I will fix this across the patch series in v2. Stefan [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 2/6] qemu/main-loop: rename QEMU_IOTHREAD_LOCK_GUARD to QEMU_BQL_LOCK_GUARD 2023-11-30 20:27 ` Stefan Hajnoczi @ 2023-12-01 7:10 ` Harsh Prateek Bora 0 siblings, 0 replies; 34+ messages in thread From: Harsh Prateek Bora @ 2023-12-01 7:10 UTC (permalink / raw) To: Stefan Hajnoczi, Ilya Leoshkevich Cc: qemu-devel, Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang On 12/1/23 01:57, Stefan Hajnoczi wrote: > On Thu, Nov 30, 2023 at 10:14:47AM +0100, Ilya Leoshkevich wrote: >> On Wed, 2023-11-29 at 16:26 -0500, Stefan Hajnoczi wrote: >>> The name "iothread" is overloaded. Use the term Big QEMU Lock (BQL) >>> instead, it is already widely used and unambiguous. >>> >>> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> >>> --- >>> include/qemu/main-loop.h | 20 ++++++++++---------- >>> hw/i386/kvm/xen_evtchn.c | 14 +++++++------- >>> hw/i386/kvm/xen_gnttab.c | 2 +- >>> hw/mips/mips_int.c | 2 +- >>> hw/ppc/ppc.c | 2 +- >>> target/i386/kvm/xen-emu.c | 2 +- >>> target/ppc/excp_helper.c | 2 +- >>> target/ppc/helper_regs.c | 2 +- >>> target/riscv/cpu_helper.c | 4 ++-- >>> 9 files changed, 25 insertions(+), 25 deletions(-) >>> >>> diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h >>> index d6f75e57bd..0b6a3e4824 100644 >>> --- a/include/qemu/main-loop.h >>> +++ b/include/qemu/main-loop.h >>> @@ -344,13 +344,13 @@ void qemu_bql_lock_impl(const char *file, int >>> line); >>> void qemu_bql_unlock(void); >>> >>> /** >>> - * QEMU_IOTHREAD_LOCK_GUARD >>> + * QEMU_BQL_LOCK_GUARD >>> * >>> - * Wrap a block of code in a conditional >>> qemu_mutex_{lock,unlock}_iothread. >>> + * Wrap a block of code in a conditional qemu_bql_{lock,unlock}. >>> */ >>> -typedef struct IOThreadLockAuto IOThreadLockAuto; >>> +typedef struct BQLLockAuto BQLLockAuto; >>> >>> -static inline IOThreadLockAuto *qemu_iothread_auto_lock(const char >>> *file, >>> +static inline BQLLockAuto *qemu_bql_auto_lock(const char *file, >>> int line) >> >> The padding is not correct anymore. > > Good point, I didn't check the formatting after search-and-replace. I > will fix this across the patch series in v2. > Yeh, some comments in 5/6 and 6/6 can also make full use of 80 char width after search-replace effect. regards, Harsh > Stefan ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 2/6] qemu/main-loop: rename QEMU_IOTHREAD_LOCK_GUARD to QEMU_BQL_LOCK_GUARD 2023-11-29 21:26 ` [PATCH 2/6] qemu/main-loop: rename QEMU_IOTHREAD_LOCK_GUARD to QEMU_BQL_LOCK_GUARD Stefan Hajnoczi 2023-11-30 9:03 ` Paul Durrant 2023-11-30 9:14 ` Ilya Leoshkevich @ 2023-11-30 12:26 ` David Woodhouse 2023-11-30 12:58 ` Cédric Le Goater 3 siblings, 0 replies; 34+ messages in thread From: David Woodhouse @ 2023-11-30 12:26 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang [-- Attachment #1: Type: text/plain, Size: 294 bytes --] On Wed, 2023-11-29 at 16:26 -0500, Stefan Hajnoczi wrote: > The name "iothread" is overloaded. Use the term Big QEMU Lock (BQL) > instead, it is already widely used and unambiguous. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Acked-by: David Woodhouse <dwmw@amazon.co.uk> [-- Attachment #2: smime.p7s --] [-- Type: application/pkcs7-signature, Size: 5965 bytes --] ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 2/6] qemu/main-loop: rename QEMU_IOTHREAD_LOCK_GUARD to QEMU_BQL_LOCK_GUARD 2023-11-29 21:26 ` [PATCH 2/6] qemu/main-loop: rename QEMU_IOTHREAD_LOCK_GUARD to QEMU_BQL_LOCK_GUARD Stefan Hajnoczi ` (2 preceding siblings ...) 2023-11-30 12:26 ` David Woodhouse @ 2023-11-30 12:58 ` Cédric Le Goater 3 siblings, 0 replies; 34+ messages in thread From: Cédric Le Goater @ 2023-11-30 12:58 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang On 11/29/23 22:26, Stefan Hajnoczi wrote: > The name "iothread" is overloaded. Use the term Big QEMU Lock (BQL) > instead, it is already widely used and unambiguous. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. ^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 3/6] qemu/main-loop: rename qemu_cond_wait_iothread() to qemu_cond_wait_bql() 2023-11-29 21:26 [PATCH 0/6] Make Big QEMU Lock naming consistent Stefan Hajnoczi 2023-11-29 21:26 ` [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() Stefan Hajnoczi 2023-11-29 21:26 ` [PATCH 2/6] qemu/main-loop: rename QEMU_IOTHREAD_LOCK_GUARD to QEMU_BQL_LOCK_GUARD Stefan Hajnoczi @ 2023-11-29 21:26 ` Stefan Hajnoczi 2023-11-30 13:19 ` Cédric Le Goater 2023-11-30 13:36 ` Philippe Mathieu-Daudé 2023-11-29 21:26 ` [PATCH 4/6] system/cpus: rename qemu_global_mutex to qemu_bql Stefan Hajnoczi ` (2 subsequent siblings) 5 siblings, 2 replies; 34+ messages in thread From: Stefan Hajnoczi @ 2023-11-29 21:26 UTC (permalink / raw) To: qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, Stefan Hajnoczi, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang The name "iothread" is overloaded. Use the term Big QEMU Lock (BQL) instead, it is already widely used and unambiguous. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- include/qemu/main-loop.h | 8 ++++---- accel/tcg/tcg-accel-ops-rr.c | 4 ++-- hw/display/virtio-gpu.c | 2 +- hw/ppc/spapr_events.c | 2 +- system/cpu-throttle.c | 2 +- system/cpus.c | 4 ++-- target/i386/nvmm/nvmm-accel-ops.c | 2 +- target/i386/whpx/whpx-accel-ops.c | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h index 0b6a3e4824..ec2a70f041 100644 --- a/include/qemu/main-loop.h +++ b/include/qemu/main-loop.h @@ -373,17 +373,17 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(BQLLockAuto, qemu_bql_auto_unlock) = qemu_bql_auto_lock(__FILE__, __LINE__) /* - * qemu_cond_wait_iothread: Wait on condition for the main loop mutex + * qemu_cond_wait_bql: Wait on condition for the main loop mutex * * This function atomically releases the main loop mutex and causes * the calling thread to block on the condition. */ -void qemu_cond_wait_iothread(QemuCond *cond); +void qemu_cond_wait_bql(QemuCond *cond); /* - * qemu_cond_timedwait_iothread: like the previous, but with timeout + * qemu_cond_timedwait_bql: like the previous, but with timeout */ -void qemu_cond_timedwait_iothread(QemuCond *cond, int ms); +void qemu_cond_timedwait_bql(QemuCond *cond, int ms); /* internal interfaces */ diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c index c21215a094..1e5a688085 100644 --- a/accel/tcg/tcg-accel-ops-rr.c +++ b/accel/tcg/tcg-accel-ops-rr.c @@ -111,7 +111,7 @@ static void rr_wait_io_event(void) while (all_cpu_threads_idle()) { rr_stop_kick_timer(); - qemu_cond_wait_iothread(first_cpu->halt_cond); + qemu_cond_wait_bql(first_cpu->halt_cond); } rr_start_kick_timer(); @@ -198,7 +198,7 @@ static void *rr_cpu_thread_fn(void *arg) /* wait for initial kick-off after machine start */ while (first_cpu->stopped) { - qemu_cond_wait_iothread(first_cpu->halt_cond); + qemu_cond_wait_bql(first_cpu->halt_cond); /* process any pending work */ CPU_FOREACH(cpu) { diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index b016d3bac8..67c5be1a4e 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -1512,7 +1512,7 @@ void virtio_gpu_reset(VirtIODevice *vdev) g->reset_finished = false; qemu_bh_schedule(g->reset_bh); while (!g->reset_finished) { - qemu_cond_wait_iothread(&g->reset_cond); + qemu_cond_wait_bql(&g->reset_cond); } } else { virtio_gpu_reset_bh(g); diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c index deb4641505..cb0eeee587 100644 --- a/hw/ppc/spapr_events.c +++ b/hw/ppc/spapr_events.c @@ -899,7 +899,7 @@ void spapr_mce_req_event(PowerPCCPU *cpu, bool recovered) } return; } - qemu_cond_wait_iothread(&spapr->fwnmi_machine_check_interlock_cond); + qemu_cond_wait_bql(&spapr->fwnmi_machine_check_interlock_cond); if (spapr->fwnmi_machine_check_addr == -1) { /* * If the machine was reset while waiting for the interlock, diff --git a/system/cpu-throttle.c b/system/cpu-throttle.c index e98836311b..1d2b73369e 100644 --- a/system/cpu-throttle.c +++ b/system/cpu-throttle.c @@ -54,7 +54,7 @@ static void cpu_throttle_thread(CPUState *cpu, run_on_cpu_data opaque) endtime_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME) + sleeptime_ns; while (sleeptime_ns > 0 && !cpu->stop) { if (sleeptime_ns > SCALE_MS) { - qemu_cond_timedwait_iothread(cpu->halt_cond, + qemu_cond_timedwait_bql(cpu->halt_cond, sleeptime_ns / SCALE_MS); } else { qemu_bql_unlock(); diff --git a/system/cpus.c b/system/cpus.c index d5b98c11f5..eb24a4db8e 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -513,12 +513,12 @@ void qemu_bql_unlock(void) qemu_mutex_unlock(&qemu_global_mutex); } -void qemu_cond_wait_iothread(QemuCond *cond) +void qemu_cond_wait_bql(QemuCond *cond) { qemu_cond_wait(cond, &qemu_global_mutex); } -void qemu_cond_timedwait_iothread(QemuCond *cond, int ms) +void qemu_cond_timedwait_bql(QemuCond *cond, int ms) { qemu_cond_timedwait(cond, &qemu_global_mutex, ms); } diff --git a/target/i386/nvmm/nvmm-accel-ops.c b/target/i386/nvmm/nvmm-accel-ops.c index 387ccfcce5..0fe8a76820 100644 --- a/target/i386/nvmm/nvmm-accel-ops.c +++ b/target/i386/nvmm/nvmm-accel-ops.c @@ -48,7 +48,7 @@ static void *qemu_nvmm_cpu_thread_fn(void *arg) } } while (cpu_thread_is_idle(cpu)) { - qemu_cond_wait_iothread(cpu->halt_cond); + qemu_cond_wait_bql(cpu->halt_cond); } qemu_wait_io_event_common(cpu); } while (!cpu->unplug || cpu_can_run(cpu)); diff --git a/target/i386/whpx/whpx-accel-ops.c b/target/i386/whpx/whpx-accel-ops.c index 1f29346a88..d8bec46081 100644 --- a/target/i386/whpx/whpx-accel-ops.c +++ b/target/i386/whpx/whpx-accel-ops.c @@ -48,7 +48,7 @@ static void *whpx_cpu_thread_fn(void *arg) } } while (cpu_thread_is_idle(cpu)) { - qemu_cond_wait_iothread(cpu->halt_cond); + qemu_cond_wait_bql(cpu->halt_cond); } qemu_wait_io_event_common(cpu); } while (!cpu->unplug || cpu_can_run(cpu)); -- 2.42.0 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* Re: [PATCH 3/6] qemu/main-loop: rename qemu_cond_wait_iothread() to qemu_cond_wait_bql() 2023-11-29 21:26 ` [PATCH 3/6] qemu/main-loop: rename qemu_cond_wait_iothread() to qemu_cond_wait_bql() Stefan Hajnoczi @ 2023-11-30 13:19 ` Cédric Le Goater 2023-11-30 13:36 ` Philippe Mathieu-Daudé 1 sibling, 0 replies; 34+ messages in thread From: Cédric Le Goater @ 2023-11-30 13:19 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang On 11/29/23 22:26, Stefan Hajnoczi wrote: > The name "iothread" is overloaded. Use the term Big QEMU Lock (BQL) > instead, it is already widely used and unambiguous. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 3/6] qemu/main-loop: rename qemu_cond_wait_iothread() to qemu_cond_wait_bql() 2023-11-29 21:26 ` [PATCH 3/6] qemu/main-loop: rename qemu_cond_wait_iothread() to qemu_cond_wait_bql() Stefan Hajnoczi 2023-11-30 13:19 ` Cédric Le Goater @ 2023-11-30 13:36 ` Philippe Mathieu-Daudé 1 sibling, 0 replies; 34+ messages in thread From: Philippe Mathieu-Daudé @ 2023-11-30 13:36 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang On 29/11/23 22:26, Stefan Hajnoczi wrote: > The name "iothread" is overloaded. Use the term Big QEMU Lock (BQL) > instead, it is already widely used and unambiguous. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > include/qemu/main-loop.h | 8 ++++---- > accel/tcg/tcg-accel-ops-rr.c | 4 ++-- > hw/display/virtio-gpu.c | 2 +- > hw/ppc/spapr_events.c | 2 +- > system/cpu-throttle.c | 2 +- > system/cpus.c | 4 ++-- > target/i386/nvmm/nvmm-accel-ops.c | 2 +- > target/i386/whpx/whpx-accel-ops.c | 2 +- > 8 files changed, 13 insertions(+), 13 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> ^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 4/6] system/cpus: rename qemu_global_mutex to qemu_bql 2023-11-29 21:26 [PATCH 0/6] Make Big QEMU Lock naming consistent Stefan Hajnoczi ` (2 preceding siblings ...) 2023-11-29 21:26 ` [PATCH 3/6] qemu/main-loop: rename qemu_cond_wait_iothread() to qemu_cond_wait_bql() Stefan Hajnoczi @ 2023-11-29 21:26 ` Stefan Hajnoczi 2023-11-30 13:20 ` Cédric Le Goater 2023-11-30 13:44 ` Philippe Mathieu-Daudé 2023-11-29 21:26 ` [PATCH 5/6] Replace "iothread lock" with "BQL" in comments Stefan Hajnoczi 2023-11-29 21:26 ` [PATCH 6/6] Rename "QEMU global mutex" to "BQL" in comments and docs Stefan Hajnoczi 5 siblings, 2 replies; 34+ messages in thread From: Stefan Hajnoczi @ 2023-11-29 21:26 UTC (permalink / raw) To: qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, Stefan Hajnoczi, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang The APIs using qemu_global_mutex now follow the Big QEMU Lock (BQL) nomenclature. It's a little strange that the actual QemuMutex variable that embodies the BQL is called qemu_global_mutex instead of qemu_bql. Rename it for consistency. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- system/cpus.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/system/cpus.c b/system/cpus.c index eb24a4db8e..138720a540 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -65,7 +65,7 @@ #endif /* CONFIG_LINUX */ -static QemuMutex qemu_global_mutex; +static QemuMutex qemu_bql; /* * The chosen accelerator is supposed to register this. @@ -389,14 +389,14 @@ void qemu_init_cpu_loop(void) qemu_init_sigbus(); qemu_cond_init(&qemu_cpu_cond); qemu_cond_init(&qemu_pause_cond); - qemu_mutex_init(&qemu_global_mutex); + qemu_mutex_init(&qemu_bql); qemu_thread_get_self(&io_thread); } void run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data) { - do_run_on_cpu(cpu, func, data, &qemu_global_mutex); + do_run_on_cpu(cpu, func, data, &qemu_bql); } static void qemu_cpu_stop(CPUState *cpu, bool exit) @@ -428,7 +428,7 @@ void qemu_wait_io_event(CPUState *cpu) slept = true; qemu_plugin_vcpu_idle_cb(cpu); } - qemu_cond_wait(cpu->halt_cond, &qemu_global_mutex); + qemu_cond_wait(cpu->halt_cond, &qemu_bql); } if (slept) { qemu_plugin_vcpu_resume_cb(cpu); @@ -502,7 +502,7 @@ void qemu_bql_lock_impl(const char *file, int line) QemuMutexLockFunc bql_lock = qatomic_read(&qemu_bql_mutex_lock_func); g_assert(!qemu_bql_locked()); - bql_lock(&qemu_global_mutex, file, line); + bql_lock(&qemu_bql, file, line); set_bql_locked(true); } @@ -510,17 +510,17 @@ void qemu_bql_unlock(void) { g_assert(qemu_bql_locked()); set_bql_locked(false); - qemu_mutex_unlock(&qemu_global_mutex); + qemu_mutex_unlock(&qemu_bql); } void qemu_cond_wait_bql(QemuCond *cond) { - qemu_cond_wait(cond, &qemu_global_mutex); + qemu_cond_wait(cond, &qemu_bql); } void qemu_cond_timedwait_bql(QemuCond *cond, int ms) { - qemu_cond_timedwait(cond, &qemu_global_mutex, ms); + qemu_cond_timedwait(cond, &qemu_bql, ms); } /* signal CPU creation */ @@ -571,7 +571,7 @@ void pause_all_vcpus(void) replay_mutex_unlock(); while (!all_vcpus_paused()) { - qemu_cond_wait(&qemu_pause_cond, &qemu_global_mutex); + qemu_cond_wait(&qemu_pause_cond, &qemu_bql); CPU_FOREACH(cpu) { qemu_cpu_kick(cpu); } @@ -649,7 +649,7 @@ void qemu_init_vcpu(CPUState *cpu) cpus_accel->create_vcpu_thread(cpu); while (!cpu->created) { - qemu_cond_wait(&qemu_cpu_cond, &qemu_global_mutex); + qemu_cond_wait(&qemu_cpu_cond, &qemu_bql); } } -- 2.42.0 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* Re: [PATCH 4/6] system/cpus: rename qemu_global_mutex to qemu_bql 2023-11-29 21:26 ` [PATCH 4/6] system/cpus: rename qemu_global_mutex to qemu_bql Stefan Hajnoczi @ 2023-11-30 13:20 ` Cédric Le Goater 2023-11-30 13:44 ` Philippe Mathieu-Daudé 1 sibling, 0 replies; 34+ messages in thread From: Cédric Le Goater @ 2023-11-30 13:20 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang On 11/29/23 22:26, Stefan Hajnoczi wrote: > The APIs using qemu_global_mutex now follow the Big QEMU Lock (BQL) > nomenclature. It's a little strange that the actual QemuMutex variable > that embodies the BQL is called qemu_global_mutex instead of qemu_bql. > Rename it for consistency. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 4/6] system/cpus: rename qemu_global_mutex to qemu_bql 2023-11-29 21:26 ` [PATCH 4/6] system/cpus: rename qemu_global_mutex to qemu_bql Stefan Hajnoczi 2023-11-30 13:20 ` Cédric Le Goater @ 2023-11-30 13:44 ` Philippe Mathieu-Daudé 2023-11-30 20:31 ` Stefan Hajnoczi 1 sibling, 1 reply; 34+ messages in thread From: Philippe Mathieu-Daudé @ 2023-11-30 13:44 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang Hi Stefan, On 29/11/23 22:26, Stefan Hajnoczi wrote: > The APIs using qemu_global_mutex now follow the Big QEMU Lock (BQL) > nomenclature. It's a little strange that the actual QemuMutex variable > that embodies the BQL is called qemu_global_mutex instead of qemu_bql. > Rename it for consistency. > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > system/cpus.c | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/system/cpus.c b/system/cpus.c > index eb24a4db8e..138720a540 100644 > --- a/system/cpus.c > +++ b/system/cpus.c > @@ -65,7 +65,7 @@ > > #endif /* CONFIG_LINUX */ > > -static QemuMutex qemu_global_mutex; > +static QemuMutex qemu_bql; I thought we were using _cond/_sem/_mutex suffixes, but this is not enforced: $ git grep -hE 'Qemu(Cond|Mutex|Semaphore) [a-zA-Z]' \ | sed -e 's/static //' -e 's/extern //' -e 's/^ *//' \ | sort -u QemuCond comp_done_cond; QemuCond cond; QemuCond decomp_done_cond; QemuCond event_complete_cond; QemuCond exclusive_cond; QemuCond exclusive_resume; QemuCond fwnmi_machine_check_interlock_cond; QemuCond handle_apdu_cond; QemuCond init_done_cond; /* is thread initialization done? */ QemuCond key_cond; QemuCond mutex_cond; QemuCond page_cond; QemuCond page_request_cond; QemuCond qemu_cpu_cond; QemuCond qemu_pause_cond; QemuCond qemu_work_cond; QemuCond request_cond; QemuCond reset_cond; QemuCond thr_cond; QemuCond thread_cond; QemuCond worker_stopped; QemuMutex active_timers_lock; QemuMutex aio_context_list_lock; QemuMutex bitmap_mutex; QemuMutex blkio_lock; QemuMutex chr_write_lock; QemuMutex cmdq_mutex; QemuMutex colo_compare_mutex; QemuMutex comp_done_lock; QemuMutex counts_mutex; QemuMutex decomp_done_lock; QemuMutex dirty_bitmap_mutex; QemuMutex dirtylimit_mutex; QemuMutex error_mutex; QemuMutex event_list_mutex; QemuMutex event_mtx; QemuMutex evlock; QemuMutex free_page_lock; QemuMutex global_mutex; QemuMutex gnt_lock; QemuMutex handle_apdu_mutex; QemuMutex handlers_mutex; QemuMutex init_done_lock; QemuMutex intp_mutex; /* protect the intp_list IRQ state */ QemuMutex io_mutex; QemuMutex iommu_lock; QemuMutex irq_level_lock[REMOTE_IOHUB_NB_PIRQS]; QemuMutex job_mutex; QemuMutex key_mutex; QemuMutex kml_slots_lock; QemuMutex lock; QemuMutex m; QemuMutex map_client_list_lock; QemuMutex migration_threads_lock; QemuMutex mon_fdsets_lock; QemuMutex mon_lock; QemuMutex monitor_lock; QemuMutex mutex; QemuMutex output_mutex; QemuMutex page_mutex; QemuMutex page_request_mutex; QemuMutex pending_out_mutex; QemuMutex port_lock; QemuMutex postcopy_prio_thread_mutex; QemuMutex qemu_cpu_list_lock; QemuMutex qemu_file_lock; QemuMutex qemu_global_mutex; QemuMutex qemu_sigp_mutex; QemuMutex qjack_shutdown_lock; QemuMutex qmp_queue_lock; QemuMutex queue_mutex; QemuMutex queued_requests_lock; /* protects queued_requests */ QemuMutex ram_block_discard_disable_mutex; QemuMutex rcu_registry_lock; QemuMutex rcu_sync_lock; QemuMutex readdir_mutex_L; QemuMutex reqs_lock; QemuMutex requests_lock; QemuMutex rp_mutex; /* We send replies from multiple threads */ QemuMutex rsp_mutex; QemuMutex rx_queue_lock; QemuMutex sigbus_mutex; QemuMutex sint_routes_mutex; QemuMutex src_page_req_mutex; QemuMutex start_lock; QemuMutex target_fd_trans_lock; QemuMutex thr_mutex; QemuMutex thread_lock; QemuMutex vdev_mutex; QemuMutex vmstop_lock; QemuMutex vreader_mutex; /* and guest_apdu_list mutex */ QemuMutex work_mutex; QemuMutex xen_timers_lock; QemuMutex yank_lock; QemuSemaphore channels_ready; QemuSemaphore colo_exit_sem; QemuSemaphore colo_incoming_sem; QemuSemaphore init_done_sem; /* is thread init done? */ QemuSemaphore pause_sem; QemuSemaphore postcopy_pause_sem; QemuSemaphore postcopy_pause_sem_dst; QemuSemaphore postcopy_pause_sem_fast_load; QemuSemaphore postcopy_pause_sem_fault; QemuSemaphore postcopy_qemufile_dst_done; QemuSemaphore postcopy_qemufile_src_sem; QemuSemaphore rate_limit_sem; QemuSemaphore rp_pong_acks; QemuSemaphore rp_sem; QemuSemaphore sem; QemuSemaphore sem_sync; QemuSemaphore sem_thread; QemuSemaphore wait_unplug_sem; So: Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 4/6] system/cpus: rename qemu_global_mutex to qemu_bql 2023-11-30 13:44 ` Philippe Mathieu-Daudé @ 2023-11-30 20:31 ` Stefan Hajnoczi 0 siblings, 0 replies; 34+ messages in thread From: Stefan Hajnoczi @ 2023-11-30 20:31 UTC (permalink / raw) To: Philippe Mathieu-Daudé Cc: qemu-devel, Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang [-- Attachment #1: Type: text/plain, Size: 1201 bytes --] On Thu, Nov 30, 2023 at 02:44:07PM +0100, Philippe Mathieu-Daudé wrote: > Hi Stefan, > > On 29/11/23 22:26, Stefan Hajnoczi wrote: > > The APIs using qemu_global_mutex now follow the Big QEMU Lock (BQL) > > nomenclature. It's a little strange that the actual QemuMutex variable > > that embodies the BQL is called qemu_global_mutex instead of qemu_bql. > > Rename it for consistency. > > > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > > --- > > system/cpus.c | 20 ++++++++++---------- > > 1 file changed, 10 insertions(+), 10 deletions(-) > > > > diff --git a/system/cpus.c b/system/cpus.c > > index eb24a4db8e..138720a540 100644 > > --- a/system/cpus.c > > +++ b/system/cpus.c > > @@ -65,7 +65,7 @@ > > #endif /* CONFIG_LINUX */ > > -static QemuMutex qemu_global_mutex; > > +static QemuMutex qemu_bql; > > I thought we were using _cond/_sem/_mutex suffixes, but > this is not enforced: I'm open to alternative names. Here are some I can think of: - big_qemu_lock (although grepping for "bql" won't find it) - qemu_bql_mutex If there is no strong feeling about this then let's leave it at qemu_bql. Otherwise, please discuss. Thanks, Stefan [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 5/6] Replace "iothread lock" with "BQL" in comments 2023-11-29 21:26 [PATCH 0/6] Make Big QEMU Lock naming consistent Stefan Hajnoczi ` (3 preceding siblings ...) 2023-11-29 21:26 ` [PATCH 4/6] system/cpus: rename qemu_global_mutex to qemu_bql Stefan Hajnoczi @ 2023-11-29 21:26 ` Stefan Hajnoczi 2023-11-30 13:47 ` Philippe Mathieu-Daudé 2023-11-29 21:26 ` [PATCH 6/6] Rename "QEMU global mutex" to "BQL" in comments and docs Stefan Hajnoczi 5 siblings, 1 reply; 34+ messages in thread From: Stefan Hajnoczi @ 2023-11-29 21:26 UTC (permalink / raw) To: qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, Stefan Hajnoczi, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang The term "iothread lock" is obsolete. The APIs use Big QEMU Lock (BQL) in their names. Update the code comments to use "BQL" instead of "iothread lock". Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- docs/devel/reset.rst | 2 +- hw/display/qxl.h | 2 +- include/exec/cpu-common.h | 2 +- include/exec/memory.h | 4 ++-- include/exec/ramblock.h | 2 +- include/migration/register.h | 8 ++++---- target/arm/internals.h | 4 ++-- accel/tcg/cputlb.c | 4 ++-- accel/tcg/tcg-accel-ops-icount.c | 2 +- hw/remote/mpqemu-link.c | 2 +- migration/block-dirty-bitmap.c | 10 +++++----- migration/block.c | 24 ++++++++++++------------ migration/colo.c | 2 +- migration/migration.c | 2 +- migration/ram.c | 4 ++-- system/physmem.c | 6 +++--- target/arm/helper.c | 2 +- target/arm/tcg/m_helper.c | 2 +- ui/spice-core.c | 2 +- util/rcu.c | 2 +- audio/coreaudio.m | 4 ++-- ui/cocoa.m | 6 +++--- 22 files changed, 49 insertions(+), 49 deletions(-) diff --git a/docs/devel/reset.rst b/docs/devel/reset.rst index 38ed1790f7..d4e79718ba 100644 --- a/docs/devel/reset.rst +++ b/docs/devel/reset.rst @@ -19,7 +19,7 @@ Triggering reset This section documents the APIs which "users" of a resettable object should use to control it. All resettable control functions must be called while holding -the iothread lock. +the BQL. You can apply a reset to an object using ``resettable_assert_reset()``. You need to call ``resettable_release_reset()`` to release the object from reset. To diff --git a/hw/display/qxl.h b/hw/display/qxl.h index fdac14edad..e0a85a5ca4 100644 --- a/hw/display/qxl.h +++ b/hw/display/qxl.h @@ -159,7 +159,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(PCIQXLDevice, PCI_QXL) * * Use with care; by the time this function returns, the returned pointer is * not protected by RCU anymore. If the caller is not within an RCU critical - * section and does not hold the iothread lock, it must have other means of + * section and does not hold the BQL, it must have other means of * protecting the pointer, such as a reference to the region that includes * the incoming ram_addr_t. * diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 41115d8919..fef3138d29 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -92,7 +92,7 @@ RAMBlock *qemu_ram_block_by_name(const char *name); * * By the time this function returns, the returned pointer is not protected * by RCU anymore. If the caller is not within an RCU critical section and - * does not hold the iothread lock, it must have other means of protecting the + * does not hold the BQL, it must have other means of protecting the * pointer, such as a reference to the memory region that owns the RAMBlock. */ RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_offset, diff --git a/include/exec/memory.h b/include/exec/memory.h index 831f7c996d..ad6466b07e 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -1962,7 +1962,7 @@ int memory_region_get_fd(MemoryRegion *mr); * * Use with care; by the time this function returns, the returned pointer is * not protected by RCU anymore. If the caller is not within an RCU critical - * section and does not hold the iothread lock, it must have other means of + * section and does not hold the BQL, it must have other means of * protecting the pointer, such as a reference to the region that includes * the incoming ram_addr_t. * @@ -1979,7 +1979,7 @@ MemoryRegion *memory_region_from_host(void *ptr, ram_addr_t *offset); * * Use with care; by the time this function returns, the returned pointer is * not protected by RCU anymore. If the caller is not within an RCU critical - * section and does not hold the iothread lock, it must have other means of + * section and does not hold the BQL, it must have other means of * protecting the pointer, such as a reference to the region that includes * the incoming ram_addr_t. * diff --git a/include/exec/ramblock.h b/include/exec/ramblock.h index 69c6a53902..a2bc0a345d 100644 --- a/include/exec/ramblock.h +++ b/include/exec/ramblock.h @@ -34,7 +34,7 @@ struct RAMBlock { ram_addr_t max_length; void (*resized)(const char*, uint64_t length, void *host); uint32_t flags; - /* Protected by iothread lock. */ + /* Protected by BQL. */ char idstr[256]; /* RCU-enabled, writes protected by the ramlist lock */ QLIST_ENTRY(RAMBlock) next; diff --git a/include/migration/register.h b/include/migration/register.h index fed1d04a3c..9ab1f79512 100644 --- a/include/migration/register.h +++ b/include/migration/register.h @@ -17,7 +17,7 @@ #include "hw/vmstate-if.h" typedef struct SaveVMHandlers { - /* This runs inside the iothread lock. */ + /* This runs inside the BQL. */ SaveStateHandler *save_state; /* @@ -30,7 +30,7 @@ typedef struct SaveVMHandlers { int (*save_live_complete_postcopy)(QEMUFile *f, void *opaque); int (*save_live_complete_precopy)(QEMUFile *f, void *opaque); - /* This runs both outside and inside the iothread lock. */ + /* This runs both outside and inside the BQL. */ bool (*is_active)(void *opaque); bool (*has_postcopy)(void *opaque); @@ -43,14 +43,14 @@ typedef struct SaveVMHandlers { */ bool (*is_active_iterate)(void *opaque); - /* This runs outside the iothread lock in the migration case, and + /* This runs outside the BQL in the migration case, and * within the lock in the savevm case. The callback had better only * use data that is local to the migration thread or protected * by other locks. */ int (*save_live_iterate)(QEMUFile *f, void *opaque); - /* This runs outside the iothread lock! */ + /* This runs outside the BQL! */ /* Note for save_live_pending: * must_precopy: * - must be migrated in precopy or in stopped state diff --git a/target/arm/internals.h b/target/arm/internals.h index 143d57c0fe..71d6c70bf3 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -940,7 +940,7 @@ static inline const char *aarch32_mode_name(uint32_t psr) * * Update the CPU_INTERRUPT_VIRQ bit in cs->interrupt_request, following * a change to either the input VIRQ line from the GIC or the HCR_EL2.VI bit. - * Must be called with the iothread lock held. + * Must be called with the BQL held. */ void arm_cpu_update_virq(ARMCPU *cpu); @@ -949,7 +949,7 @@ void arm_cpu_update_virq(ARMCPU *cpu); * * Update the CPU_INTERRUPT_VFIQ bit in cs->interrupt_request, following * a change to either the input VFIQ line from the GIC or the HCR_EL2.VF bit. - * Must be called with the iothread lock held. + * Must be called with the BQL held. */ void arm_cpu_update_vfiq(ARMCPU *cpu); diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 3c0b1658ee..a23d77e762 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1975,7 +1975,7 @@ static void *atomic_mmu_lookup(CPUState *cpu, vaddr addr, MemOpIdx oi, * @size: number of bytes * @mmu_idx: virtual address context * @ra: return address into tcg generated code, or 0 - * Context: iothread lock held + * Context: BQL held * * Load @size bytes from @addr, which is memory-mapped i/o. * The bytes are concatenated in big-endian order with @ret_be. @@ -2521,7 +2521,7 @@ static Int128 do_ld16_mmu(CPUState *cpu, vaddr addr, * @size: number of bytes * @mmu_idx: virtual address context * @ra: return address into tcg generated code, or 0 - * Context: iothread lock held + * Context: BQL held * * Store @size bytes at @addr, which is memory-mapped i/o. * The bytes to store are extracted in little-endian order from @val_le; diff --git a/accel/tcg/tcg-accel-ops-icount.c b/accel/tcg/tcg-accel-ops-icount.c index 76b9bedc08..c886d16218 100644 --- a/accel/tcg/tcg-accel-ops-icount.c +++ b/accel/tcg/tcg-accel-ops-icount.c @@ -123,7 +123,7 @@ void icount_prepare_for_run(CPUState *cpu, int64_t cpu_budget) if (cpu->icount_budget == 0) { /* - * We're called without the iothread lock, so must take it while + * We're called without the BQL, so must take it while * we're calling timer handlers. */ qemu_bql_lock(); diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c index ffb2c25145..c6c8821313 100644 --- a/hw/remote/mpqemu-link.c +++ b/hw/remote/mpqemu-link.c @@ -58,7 +58,7 @@ bool mpqemu_msg_send(MPQemuMsg *msg, QIOChannel *ioc, Error **errp) assert(qemu_in_coroutine() || !iothread); /* - * Skip unlocking/locking iothread lock when the IOThread is running + * Skip unlocking/locking BQL when the IOThread is running * in co-routine context. Co-routine context is asserted above * for IOThread case. * Also skip lock handling while in a co-routine in the main context. diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index b5a2d377db..f8bc70b45d 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -464,7 +464,7 @@ static void send_bitmap_bits(QEMUFile *f, DBMSaveState *s, g_free(buf); } -/* Called with iothread lock taken. */ +/* Called with BQL taken. */ static void dirty_bitmap_do_save_cleanup(DBMSaveState *s) { SaveBitmapState *dbms; @@ -479,7 +479,7 @@ static void dirty_bitmap_do_save_cleanup(DBMSaveState *s) } } -/* Called with iothread lock taken. */ +/* Called with BQL taken. */ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs, const char *bs_name, GHashTable *alias_map) { @@ -598,7 +598,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs, return 0; } -/* Called with iothread lock taken. */ +/* Called with BQL taken. */ static int init_dirty_bitmap_migration(DBMSaveState *s) { BlockDriverState *bs; @@ -607,7 +607,7 @@ static int init_dirty_bitmap_migration(DBMSaveState *s) BlockBackend *blk; GHashTable *alias_map = NULL; - /* Runs in the migration thread, but holds the iothread lock */ + /* Runs in the migration thread, but holds the BQL */ GLOBAL_STATE_CODE(); GRAPH_RDLOCK_GUARD_MAINLOOP(); @@ -742,7 +742,7 @@ static int dirty_bitmap_save_iterate(QEMUFile *f, void *opaque) return s->bulk_completed; } -/* Called with iothread lock taken. */ +/* Called with BQL taken. */ static int dirty_bitmap_save_complete(QEMUFile *f, void *opaque) { diff --git a/migration/block.c b/migration/block.c index 87f36e6e35..464510e889 100644 --- a/migration/block.c +++ b/migration/block.c @@ -66,7 +66,7 @@ typedef struct BlkMigDevState { /* Protected by block migration lock. */ int64_t completed_sectors; - /* During migration this is protected by iothread lock / AioContext. + /* During migration this is protected by BQL / AioContext. * Allocation and free happen during setup and cleanup respectively. */ BdrvDirtyBitmap *dirty_bitmap; @@ -101,7 +101,7 @@ typedef struct BlkMigState { int prev_progress; int bulk_completed; - /* Lock must be taken _inside_ the iothread lock and any AioContexts. */ + /* Lock must be taken _inside_ the BQL and any AioContexts. */ QemuMutex lock; } BlkMigState; @@ -117,7 +117,7 @@ static void blk_mig_unlock(void) qemu_mutex_unlock(&block_mig_state.lock); } -/* Must run outside of the iothread lock during the bulk phase, +/* Must run outside of the BQL during the bulk phase, * or the VM will stall. */ @@ -334,7 +334,7 @@ static int mig_save_device_bulk(QEMUFile *f, BlkMigDevState *bmds) return (bmds->cur_sector >= total_sectors); } -/* Called with iothread lock taken. */ +/* Called with BQL taken. */ static int set_dirty_tracking(void) { @@ -361,7 +361,7 @@ fail: return ret; } -/* Called with iothread lock taken. */ +/* Called with BQL taken. */ static void unset_dirty_tracking(void) { @@ -512,7 +512,7 @@ static void blk_mig_reset_dirty_cursor(void) } } -/* Called with iothread lock and AioContext taken. */ +/* Called with BQL and AioContext taken. */ static int mig_save_device_dirty(QEMUFile *f, BlkMigDevState *bmds, int is_async) @@ -594,7 +594,7 @@ error: return ret; } -/* Called with iothread lock taken. +/* Called with BQL taken. * * return value: * 0: too much data for max_downtime @@ -658,7 +658,7 @@ static int flush_blks(QEMUFile *f) return ret; } -/* Called with iothread lock taken. */ +/* Called with BQL taken. */ static int64_t get_remaining_dirty(void) { @@ -676,7 +676,7 @@ static int64_t get_remaining_dirty(void) -/* Called with iothread lock taken. */ +/* Called with BQL taken. */ static void block_migration_cleanup_bmds(void) { BlkMigDevState *bmds; @@ -706,7 +706,7 @@ static void block_migration_cleanup_bmds(void) } } -/* Called with iothread lock taken. */ +/* Called with BQL taken. */ static void block_migration_cleanup(void *opaque) { BlkMigBlock *blk; @@ -783,7 +783,7 @@ static int block_save_iterate(QEMUFile *f, void *opaque) } ret = 0; } else { - /* Always called with iothread lock taken for + /* Always called with BQL taken for * simplicity, block_save_complete also calls it. */ qemu_bql_lock(); @@ -811,7 +811,7 @@ static int block_save_iterate(QEMUFile *f, void *opaque) return (delta_bytes > 0); } -/* Called with iothread lock taken. */ +/* Called with BQL taken. */ static int block_save_complete(QEMUFile *f, void *opaque) { diff --git a/migration/colo.c b/migration/colo.c index 2e68107cfa..44c789b82b 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -945,7 +945,7 @@ int coroutine_fn colo_incoming_co(void) qemu_thread_join(&th); qemu_bql_lock(); - /* We hold the global iothread lock, so it is safe here */ + /* We hold the global BQL, so it is safe here */ colo_release_ram_cache(); return 0; diff --git a/migration/migration.c b/migration/migration.c index b153133fba..ceb5b69c0c 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2566,7 +2566,7 @@ fail: /** * migration_maybe_pause: Pause if required to by - * migrate_pause_before_switchover called with the iothread locked + * migrate_pause_before_switchover called with the BQL locked * Returns: 0 on success */ static int migration_maybe_pause(MigrationState *s, diff --git a/migration/ram.c b/migration/ram.c index f274bcf655..0884affa54 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2395,7 +2395,7 @@ static void ram_save_cleanup(void *opaque) /* We don't use dirty log with background snapshots */ if (!migrate_background_snapshot()) { - /* caller have hold iothread lock or is in a bh, so there is + /* caller have hold BQL or is in a bh, so there is * no writing race against the migration bitmap */ if (global_dirty_tracking & GLOBAL_DIRTY_MIGRATION) { @@ -3131,7 +3131,7 @@ out: * * Returns zero to indicate success or negative on error * - * Called with iothread lock + * Called with BQL * * @f: QEMUFile where to send the data * @opaque: RAMState pointer diff --git a/system/physmem.c b/system/physmem.c index c136675876..9d0cd31ef5 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -799,7 +799,7 @@ static RAMBlock *qemu_get_ram_block(ram_addr_t addr) abort(); found: - /* It is safe to write mru_block outside the iothread lock. This + /* It is safe to write mru_block outside the BQL. This * is what happens: * * mru_block = xxx @@ -1597,7 +1597,7 @@ int qemu_ram_get_fd(RAMBlock *rb) return rb->fd; } -/* Called with iothread lock held. */ +/* Called with BQL held. */ void qemu_ram_set_idstr(RAMBlock *new_block, const char *name, DeviceState *dev) { RAMBlock *block; @@ -1625,7 +1625,7 @@ void qemu_ram_set_idstr(RAMBlock *new_block, const char *name, DeviceState *dev) } } -/* Called with iothread lock held. */ +/* Called with BQL held. */ void qemu_ram_unset_idstr(RAMBlock *block) { /* FIXME: arch_init.c assumes that this is not called throughout diff --git a/target/arm/helper.c b/target/arm/helper.c index f472043986..1262a33844 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5824,7 +5824,7 @@ static void do_hcr_write(CPUARMState *env, uint64_t value, uint64_t valid_mask) * Updates to VI and VF require us to update the status of * virtual interrupts, which are the logical OR of these bits * and the state of the input lines from the GIC. (This requires - * that we have the iothread lock, which is done by marking the + * that we have the BQL, which is done by marking the * reginfo structs as ARM_CP_IO.) * Note that if a write to HCR pends a VIRQ or VFIQ it is never * possible for it to be taken immediately, because VIRQ and diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c index 5f38b9a4a1..78c339b526 100644 --- a/target/arm/tcg/m_helper.c +++ b/target/arm/tcg/m_helper.c @@ -373,7 +373,7 @@ void HELPER(v7m_preserve_fp_state)(CPUARMState *env) bool ts = is_secure && (env->v7m.fpccr[M_REG_S] & R_V7M_FPCCR_TS_MASK); bool take_exception; - /* Take the iothread lock as we are going to touch the NVIC */ + /* Take the BQL as we are going to touch the NVIC */ qemu_bql_lock(); /* Check the background context had access to the FPU */ diff --git a/ui/spice-core.c b/ui/spice-core.c index 1d895d2fe8..40923bfa58 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -217,7 +217,7 @@ static void channel_event(int event, SpiceChannelEventInfo *info) * not do that. It isn't that easy to fix it in spice and even * when it is fixed we still should cover the already released * spice versions. So detect that we've been called from another - * thread and grab the iothread lock if so before calling qemu + * thread and grab the BQL if so before calling qemu * functions. */ bool need_lock = !qemu_thread_is_self(&me); diff --git a/util/rcu.c b/util/rcu.c index 8331f24288..88fc7479b2 100644 --- a/util/rcu.c +++ b/util/rcu.c @@ -409,7 +409,7 @@ static void rcu_init_complete(void) qemu_event_init(&rcu_call_ready_event, false); - /* The caller is assumed to have iothread lock, so the call_rcu thread + /* The caller is assumed to have BQL, so the call_rcu thread * must have been quiescent even after forking, just recreate it. */ qemu_thread_create(&thread, "call_rcu", call_rcu_thread, diff --git a/audio/coreaudio.m b/audio/coreaudio.m index 866d7a9436..b192fc6e83 100644 --- a/audio/coreaudio.m +++ b/audio/coreaudio.m @@ -299,7 +299,7 @@ static ret_type glue(coreaudio_, name)args_decl \ #undef COREAUDIO_WRAPPER_FUNC /* - * callback to feed audiooutput buffer. called without iothread lock. + * callback to feed audiooutput buffer. called without BQL. * allowed to lock "buf_mutex", but disallowed to have any other locks. */ static OSStatus audioDeviceIOProc( @@ -538,7 +538,7 @@ static void update_device_playback_state(coreaudioVoiceOut *core) } } -/* called without iothread lock. */ +/* called without BQL. */ static OSStatus handle_voice_change( AudioObjectID in_object_id, UInt32 in_number_addresses, diff --git a/ui/cocoa.m b/ui/cocoa.m index 8a7d0a6f0c..51e41a6333 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -113,7 +113,7 @@ static void cocoa_switch(DisplayChangeListener *dcl, static QemuClipboardInfo *cbinfo; static QemuEvent cbevent; -// Utility functions to run specified code block with iothread lock held +// Utility functions to run specified code block with BQL held typedef void (^CodeBlock)(void); typedef bool (^BoolCodeBlock)(void); @@ -548,7 +548,7 @@ - (void) setContentDimensions - (void) updateUIInfoLocked { - /* Must be called with the iothread lock, i.e. via updateUIInfo */ + /* Must be called with the BQL, i.e. via updateUIInfo */ NSSize frameSize; QemuUIInfo info; @@ -2075,7 +2075,7 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts) * Create the menu entries which depend on QEMU state (for consoles * and removable devices). These make calls back into QEMU functions, * which is OK because at this point we know that the second thread - * holds the iothread lock and is synchronously waiting for us to + * holds the BQL and is synchronously waiting for us to * finish. */ add_console_menu_entries(); -- 2.42.0 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* Re: [PATCH 5/6] Replace "iothread lock" with "BQL" in comments 2023-11-29 21:26 ` [PATCH 5/6] Replace "iothread lock" with "BQL" in comments Stefan Hajnoczi @ 2023-11-30 13:47 ` Philippe Mathieu-Daudé 2023-11-30 20:36 ` Stefan Hajnoczi 0 siblings, 1 reply; 34+ messages in thread From: Philippe Mathieu-Daudé @ 2023-11-30 13:47 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang Hi Stefan, On 29/11/23 22:26, Stefan Hajnoczi wrote: > The term "iothread lock" is obsolete. The APIs use Big QEMU Lock (BQL) > in their names. Update the code comments to use "BQL" instead of > "iothread lock". > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > docs/devel/reset.rst | 2 +- > hw/display/qxl.h | 2 +- > include/exec/cpu-common.h | 2 +- > include/exec/memory.h | 4 ++-- > include/exec/ramblock.h | 2 +- > include/migration/register.h | 8 ++++---- > target/arm/internals.h | 4 ++-- > accel/tcg/cputlb.c | 4 ++-- > accel/tcg/tcg-accel-ops-icount.c | 2 +- > hw/remote/mpqemu-link.c | 2 +- > migration/block-dirty-bitmap.c | 10 +++++----- > migration/block.c | 24 ++++++++++++------------ > migration/colo.c | 2 +- > migration/migration.c | 2 +- > migration/ram.c | 4 ++-- > system/physmem.c | 6 +++--- > target/arm/helper.c | 2 +- > target/arm/tcg/m_helper.c | 2 +- > ui/spice-core.c | 2 +- > util/rcu.c | 2 +- > audio/coreaudio.m | 4 ++-- > ui/cocoa.m | 6 +++--- > 22 files changed, 49 insertions(+), 49 deletions(-) > diff --git a/include/exec/ramblock.h b/include/exec/ramblock.h > index 69c6a53902..a2bc0a345d 100644 > --- a/include/exec/ramblock.h > +++ b/include/exec/ramblock.h > @@ -34,7 +34,7 @@ struct RAMBlock { > ram_addr_t max_length; > void (*resized)(const char*, uint64_t length, void *host); > uint32_t flags; > - /* Protected by iothread lock. */ > + /* Protected by BQL. */ There is only one single BQL, so preferably: "by the BQL" > char idstr[256]; > /* RCU-enabled, writes protected by the ramlist lock */ > QLIST_ENTRY(RAMBlock) next; > -/* Called with iothread lock taken. */ > +/* Called with BQL taken. */ "with the BQL" (other uses) Otherwise, Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > static void dirty_bitmap_do_save_cleanup(DBMSaveState *s) > { > SaveBitmapState *dbms; > @@ -479,7 +479,7 @@ static void dirty_bitmap_do_save_cleanup(DBMSaveState *s) > } > } ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 5/6] Replace "iothread lock" with "BQL" in comments 2023-11-30 13:47 ` Philippe Mathieu-Daudé @ 2023-11-30 20:36 ` Stefan Hajnoczi 0 siblings, 0 replies; 34+ messages in thread From: Stefan Hajnoczi @ 2023-11-30 20:36 UTC (permalink / raw) To: Philippe Mathieu-Daudé Cc: qemu-devel, Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang [-- Attachment #1: Type: text/plain, Size: 2463 bytes --] On Thu, Nov 30, 2023 at 02:47:49PM +0100, Philippe Mathieu-Daudé wrote: > Hi Stefan, > > On 29/11/23 22:26, Stefan Hajnoczi wrote: > > The term "iothread lock" is obsolete. The APIs use Big QEMU Lock (BQL) > > in their names. Update the code comments to use "BQL" instead of > > "iothread lock". > > > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > > --- > > docs/devel/reset.rst | 2 +- > > hw/display/qxl.h | 2 +- > > include/exec/cpu-common.h | 2 +- > > include/exec/memory.h | 4 ++-- > > include/exec/ramblock.h | 2 +- > > include/migration/register.h | 8 ++++---- > > target/arm/internals.h | 4 ++-- > > accel/tcg/cputlb.c | 4 ++-- > > accel/tcg/tcg-accel-ops-icount.c | 2 +- > > hw/remote/mpqemu-link.c | 2 +- > > migration/block-dirty-bitmap.c | 10 +++++----- > > migration/block.c | 24 ++++++++++++------------ > > migration/colo.c | 2 +- > > migration/migration.c | 2 +- > > migration/ram.c | 4 ++-- > > system/physmem.c | 6 +++--- > > target/arm/helper.c | 2 +- > > target/arm/tcg/m_helper.c | 2 +- > > ui/spice-core.c | 2 +- > > util/rcu.c | 2 +- > > audio/coreaudio.m | 4 ++-- > > ui/cocoa.m | 6 +++--- > > 22 files changed, 49 insertions(+), 49 deletions(-) > > > > diff --git a/include/exec/ramblock.h b/include/exec/ramblock.h > > index 69c6a53902..a2bc0a345d 100644 > > --- a/include/exec/ramblock.h > > +++ b/include/exec/ramblock.h > > @@ -34,7 +34,7 @@ struct RAMBlock { > > ram_addr_t max_length; > > void (*resized)(const char*, uint64_t length, void *host); > > uint32_t flags; > > - /* Protected by iothread lock. */ > > + /* Protected by BQL. */ > > There is only one single BQL, so preferably: > > "by the BQL" > > > char idstr[256]; > > /* RCU-enabled, writes protected by the ramlist lock */ > > QLIST_ENTRY(RAMBlock) next; > > > > > > -/* Called with iothread lock taken. */ > > +/* Called with BQL taken. */ > > "with the BQL" (other uses) I will try to change these for v2. It's a pre-existing issue though because there was only ever one "iothread lock" too. Stefan [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 6/6] Rename "QEMU global mutex" to "BQL" in comments and docs 2023-11-29 21:26 [PATCH 0/6] Make Big QEMU Lock naming consistent Stefan Hajnoczi ` (4 preceding siblings ...) 2023-11-29 21:26 ` [PATCH 5/6] Replace "iothread lock" with "BQL" in comments Stefan Hajnoczi @ 2023-11-29 21:26 ` Stefan Hajnoczi 2023-11-30 7:17 ` Markus Armbruster 2023-11-30 13:49 ` Philippe Mathieu-Daudé 5 siblings, 2 replies; 34+ messages in thread From: Stefan Hajnoczi @ 2023-11-29 21:26 UTC (permalink / raw) To: qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, Stefan Hajnoczi, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang The term "QEMU global mutex" is identical to the more widely used Big QEMU Lock ("BQL"). Update the code comments and documentation to use "BQL" instead of "QEMU global mutex". Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- docs/devel/multi-thread-tcg.rst | 7 +++---- docs/devel/qapi-code-gen.rst | 2 +- docs/devel/replay.rst | 2 +- docs/devel/multiple-iothreads.txt | 16 ++++++++-------- include/block/blockjob.h | 6 +++--- include/io/task.h | 2 +- include/qemu/coroutine-core.h | 2 +- include/qemu/coroutine.h | 2 +- hw/block/dataplane/virtio-blk.c | 8 ++++---- hw/block/virtio-blk.c | 2 +- hw/scsi/virtio-scsi-dataplane.c | 6 +++--- net/tap.c | 2 +- 12 files changed, 28 insertions(+), 29 deletions(-) diff --git a/docs/devel/multi-thread-tcg.rst b/docs/devel/multi-thread-tcg.rst index c9541a7b20..7302c3bf53 100644 --- a/docs/devel/multi-thread-tcg.rst +++ b/docs/devel/multi-thread-tcg.rst @@ -226,10 +226,9 @@ instruction. This could be a future optimisation. Emulated hardware state ----------------------- -Currently thanks to KVM work any access to IO memory is automatically -protected by the global iothread mutex, also known as the BQL (Big -QEMU Lock). Any IO region that doesn't use global mutex is expected to -do its own locking. +Currently thanks to KVM work any access to IO memory is automatically protected +by the BQL (Big QEMU Lock). Any IO region that doesn't use the BQL is expected +to do its own locking. However IO memory isn't the only way emulated hardware state can be modified. Some architectures have model specific registers that diff --git a/docs/devel/qapi-code-gen.rst b/docs/devel/qapi-code-gen.rst index 7f78183cd4..ea8228518c 100644 --- a/docs/devel/qapi-code-gen.rst +++ b/docs/devel/qapi-code-gen.rst @@ -594,7 +594,7 @@ blocking the guest and other background operations. Coroutine safety can be hard to prove, similar to thread safety. Common pitfalls are: -- The global mutex isn't held across ``qemu_coroutine_yield()``, so +- The BQL isn't held across ``qemu_coroutine_yield()``, so operations that used to assume that they execute atomically may have to be more careful to protect against changes in the global state. diff --git a/docs/devel/replay.rst b/docs/devel/replay.rst index 0244be8b9c..effd856f0c 100644 --- a/docs/devel/replay.rst +++ b/docs/devel/replay.rst @@ -184,7 +184,7 @@ modes. Reading and writing requests are created by CPU thread of QEMU. Later these requests proceed to block layer which creates "bottom halves". Bottom halves consist of callback and its parameters. They are processed when -main loop locks the global mutex. These locks are not synchronized with +main loop locks the BQL. These locks are not synchronized with replaying process because main loop also processes the events that do not affect the virtual machine state (like user interaction with monitor). diff --git a/docs/devel/multiple-iothreads.txt b/docs/devel/multiple-iothreads.txt index a3e949f6b3..828e5527a3 100644 --- a/docs/devel/multiple-iothreads.txt +++ b/docs/devel/multiple-iothreads.txt @@ -5,7 +5,7 @@ the COPYING file in the top-level directory. This document explains the IOThread feature and how to write code that runs -outside the QEMU global mutex. +outside the BQL. The main loop and IOThreads --------------------------- @@ -29,13 +29,13 @@ scalability bottleneck on hosts with many CPUs. Work can be spread across several IOThreads instead of just one main loop. When set up correctly this can improve I/O latency and reduce jitter seen by the guest. -The main loop is also deeply associated with the QEMU global mutex, which is a -scalability bottleneck in itself. vCPU threads and the main loop use the QEMU -global mutex to serialize execution of QEMU code. This mutex is necessary -because a lot of QEMU's code historically was not thread-safe. +The main loop is also deeply associated with the BQL, which is a +scalability bottleneck in itself. vCPU threads and the main loop use the BQL +to serialize execution of QEMU code. This mutex is necessary because a lot of +QEMU's code historically was not thread-safe. The fact that all I/O processing is done in a single main loop and that the -QEMU global mutex is contended by all vCPU threads and the main loop explain +BQL is contended by all vCPU threads and the main loop explain why it is desirable to place work into IOThreads. The experimental virtio-blk data-plane implementation has been benchmarked and @@ -66,7 +66,7 @@ There are several old APIs that use the main loop AioContext: Since they implicitly work on the main loop they cannot be used in code that runs in an IOThread. They might cause a crash or deadlock if called from an -IOThread since the QEMU global mutex is not held. +IOThread since the BQL is not held. Instead, use the AioContext functions directly (see include/block/aio.h): * aio_set_fd_handler() - monitor a file descriptor @@ -105,7 +105,7 @@ used in the block layer and can lead to hangs. There is currently no lock ordering rule if a thread needs to acquire multiple AioContexts simultaneously. Therefore, it is only safe for code holding the -QEMU global mutex to acquire other AioContexts. +BQL to acquire other AioContexts. Side note: the best way to schedule a function call across threads is to call aio_bh_schedule_oneshot(). No acquire/release or locking is needed. diff --git a/include/block/blockjob.h b/include/block/blockjob.h index e594c10d23..b2bc7c04d6 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -54,7 +54,7 @@ typedef struct BlockJob { /** * Speed that was set with @block_job_set_speed. - * Always modified and read under QEMU global mutex (GLOBAL_STATE_CODE). + * Always modified and read under BQL (GLOBAL_STATE_CODE). */ int64_t speed; @@ -66,7 +66,7 @@ typedef struct BlockJob { /** * Block other operations when block job is running. - * Always modified and read under QEMU global mutex (GLOBAL_STATE_CODE). + * Always modified and read under BQL (GLOBAL_STATE_CODE). */ Error *blocker; @@ -89,7 +89,7 @@ typedef struct BlockJob { /** * BlockDriverStates that are involved in this block job. - * Always modified and read under QEMU global mutex (GLOBAL_STATE_CODE). + * Always modified and read under BQL (GLOBAL_STATE_CODE). */ GSList *nodes; } BlockJob; diff --git a/include/io/task.h b/include/io/task.h index dc7d32ebd0..0b5342ee84 100644 --- a/include/io/task.h +++ b/include/io/task.h @@ -149,7 +149,7 @@ typedef void (*QIOTaskWorker)(QIOTask *task, * lookups) to be easily run non-blocking. Reporting the * results in the main thread context means that the caller * typically does not need to be concerned about thread - * safety wrt the QEMU global mutex. + * safety wrt the BQL. * * For example, the socket_listen() method will block the caller * while DNS lookups take place if given a name, instead of IP diff --git a/include/qemu/coroutine-core.h b/include/qemu/coroutine-core.h index 230bb56517..503bad6e0e 100644 --- a/include/qemu/coroutine-core.h +++ b/include/qemu/coroutine-core.h @@ -22,7 +22,7 @@ * rather than callbacks, for operations that need to give up control while * waiting for events to complete. * - * These functions are re-entrant and may be used outside the global mutex. + * These functions are re-entrant and may be used outside the BQL. * * Functions that execute in coroutine context cannot be called * directly from normal functions. Use @coroutine_fn to mark such diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h index a65be6697f..e6aff45301 100644 --- a/include/qemu/coroutine.h +++ b/include/qemu/coroutine.h @@ -26,7 +26,7 @@ * rather than callbacks, for operations that need to give up control while * waiting for events to complete. * - * These functions are re-entrant and may be used outside the global mutex. + * These functions are re-entrant and may be used outside the BQL. * * Functions that execute in coroutine context cannot be called * directly from normal functions. Use @coroutine_fn to mark such diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index f83bb0f116..eafc573407 100644 --- a/hw/block/dataplane/virtio-blk.c +++ b/hw/block/dataplane/virtio-blk.c @@ -47,7 +47,7 @@ void virtio_blk_data_plane_notify(VirtIOBlockDataPlane *s, VirtQueue *vq) virtio_notify_irqfd(s->vdev, vq); } -/* Context: QEMU global mutex held */ +/* Context: BQL held */ bool virtio_blk_data_plane_create(VirtIODevice *vdev, VirtIOBlkConf *conf, VirtIOBlockDataPlane **dataplane, Error **errp) @@ -100,7 +100,7 @@ bool virtio_blk_data_plane_create(VirtIODevice *vdev, VirtIOBlkConf *conf, return true; } -/* Context: QEMU global mutex held */ +/* Context: BQL held */ void virtio_blk_data_plane_destroy(VirtIOBlockDataPlane *s) { VirtIOBlock *vblk; @@ -117,7 +117,7 @@ void virtio_blk_data_plane_destroy(VirtIOBlockDataPlane *s) g_free(s); } -/* Context: QEMU global mutex held */ +/* Context: BQL held */ int virtio_blk_data_plane_start(VirtIODevice *vdev) { VirtIOBlock *vblk = VIRTIO_BLK(vdev); @@ -261,7 +261,7 @@ static void virtio_blk_data_plane_stop_bh(void *opaque) } } -/* Context: QEMU global mutex held */ +/* Context: BQL held */ void virtio_blk_data_plane_stop(VirtIODevice *vdev) { VirtIOBlock *vblk = VIRTIO_BLK(vdev); diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index a1f8e15522..2a5f6544cc 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -1500,7 +1500,7 @@ static void virtio_blk_resize(void *opaque) VirtIODevice *vdev = VIRTIO_DEVICE(opaque); /* - * virtio_notify_config() needs to acquire the global mutex, + * virtio_notify_config() needs to acquire the BQL, * so it can't be called from an iothread. Instead, schedule * it to be run in the main context BH. */ diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c index 1e684beebe..56ecc5b12e 100644 --- a/hw/scsi/virtio-scsi-dataplane.c +++ b/hw/scsi/virtio-scsi-dataplane.c @@ -20,7 +20,7 @@ #include "scsi/constants.h" #include "hw/virtio/virtio-bus.h" -/* Context: QEMU global mutex held */ +/* Context: BQL held */ void virtio_scsi_dataplane_setup(VirtIOSCSI *s, Error **errp) { VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(s); @@ -93,7 +93,7 @@ static void virtio_scsi_dataplane_stop_bh(void *opaque) } } -/* Context: QEMU global mutex held */ +/* Context: BQL held */ int virtio_scsi_dataplane_start(VirtIODevice *vdev) { int i; @@ -191,7 +191,7 @@ fail_guest_notifiers: return -ENOSYS; } -/* Context: QEMU global mutex held */ +/* Context: BQL held */ void virtio_scsi_dataplane_stop(VirtIODevice *vdev) { BusState *qbus = qdev_get_parent_bus(DEVICE(vdev)); diff --git a/net/tap.c b/net/tap.c index c23d0323c2..c698b70475 100644 --- a/net/tap.c +++ b/net/tap.c @@ -219,7 +219,7 @@ static void tap_send(void *opaque) /* * When the host keeps receiving more packets while tap_send() is - * running we can hog the QEMU global mutex. Limit the number of + * running we can hog the BQL. Limit the number of * packets that are processed per tap_send() callback to prevent * stalling the guest. */ -- 2.42.0 ^ permalink raw reply related [flat|nested] 34+ messages in thread
* Re: [PATCH 6/6] Rename "QEMU global mutex" to "BQL" in comments and docs 2023-11-29 21:26 ` [PATCH 6/6] Rename "QEMU global mutex" to "BQL" in comments and docs Stefan Hajnoczi @ 2023-11-30 7:17 ` Markus Armbruster 2023-11-30 13:49 ` Philippe Mathieu-Daudé 1 sibling, 0 replies; 34+ messages in thread From: Markus Armbruster @ 2023-11-30 7:17 UTC (permalink / raw) To: Stefan Hajnoczi Cc: qemu-devel, Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Philippe Mathieu-Daudé, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang Stefan Hajnoczi <stefanha@redhat.com> writes: > The term "QEMU global mutex" is identical to the more widely used Big > QEMU Lock ("BQL"). Update the code comments and documentation to use > "BQL" instead of "QEMU global mutex". > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> For QAPI Acked-by: Markus Armbruster <armbru@redhat.com> ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 6/6] Rename "QEMU global mutex" to "BQL" in comments and docs 2023-11-29 21:26 ` [PATCH 6/6] Rename "QEMU global mutex" to "BQL" in comments and docs Stefan Hajnoczi 2023-11-30 7:17 ` Markus Armbruster @ 2023-11-30 13:49 ` Philippe Mathieu-Daudé 2023-11-30 20:37 ` Stefan Hajnoczi 1 sibling, 1 reply; 34+ messages in thread From: Philippe Mathieu-Daudé @ 2023-11-30 13:49 UTC (permalink / raw) To: Stefan Hajnoczi, qemu-devel Cc: Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang On 29/11/23 22:26, Stefan Hajnoczi wrote: > The term "QEMU global mutex" is identical to the more widely used Big > QEMU Lock ("BQL"). Update the code comments and documentation to use > "BQL" instead of "QEMU global mutex". > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > docs/devel/multi-thread-tcg.rst | 7 +++---- > docs/devel/qapi-code-gen.rst | 2 +- > docs/devel/replay.rst | 2 +- > docs/devel/multiple-iothreads.txt | 16 ++++++++-------- > include/block/blockjob.h | 6 +++--- > include/io/task.h | 2 +- > include/qemu/coroutine-core.h | 2 +- > include/qemu/coroutine.h | 2 +- > hw/block/dataplane/virtio-blk.c | 8 ++++---- > hw/block/virtio-blk.c | 2 +- > hw/scsi/virtio-scsi-dataplane.c | 6 +++--- > net/tap.c | 2 +- > 12 files changed, 28 insertions(+), 29 deletions(-) > diff --git a/include/block/blockjob.h b/include/block/blockjob.h > index e594c10d23..b2bc7c04d6 100644 > --- a/include/block/blockjob.h > +++ b/include/block/blockjob.h > @@ -54,7 +54,7 @@ typedef struct BlockJob { > > /** > * Speed that was set with @block_job_set_speed. > - * Always modified and read under QEMU global mutex (GLOBAL_STATE_CODE). > + * Always modified and read under BQL (GLOBAL_STATE_CODE). "under the BQL" > */ > int64_t speed; > > @@ -66,7 +66,7 @@ typedef struct BlockJob { > > /** > * Block other operations when block job is running. > - * Always modified and read under QEMU global mutex (GLOBAL_STATE_CODE). > + * Always modified and read under BQL (GLOBAL_STATE_CODE). Ditto, > */ > Error *blocker; > > @@ -89,7 +89,7 @@ typedef struct BlockJob { > > /** > * BlockDriverStates that are involved in this block job. > - * Always modified and read under QEMU global mutex (GLOBAL_STATE_CODE). > + * Always modified and read under BQL (GLOBAL_STATE_CODE). Ditto. > */ > GSList *nodes; > } BlockJob; Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> ^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 6/6] Rename "QEMU global mutex" to "BQL" in comments and docs 2023-11-30 13:49 ` Philippe Mathieu-Daudé @ 2023-11-30 20:37 ` Stefan Hajnoczi 0 siblings, 0 replies; 34+ messages in thread From: Stefan Hajnoczi @ 2023-11-30 20:37 UTC (permalink / raw) To: Philippe Mathieu-Daudé Cc: qemu-devel, Jean-Christophe Dubois, Fabiano Rosas, qemu-s390x, Song Gao, Marcel Apfelbaum, Thomas Huth, Hyman Huang, Marcelo Tosatti, David Woodhouse, Andrey Smirnov, Peter Maydell, Kevin Wolf, Ilya Leoshkevich, Artyom Tarasenko, Mark Cave-Ayland, Max Filippov, Alistair Francis, Paul Durrant, Jagannathan Raman, Juan Quintela, Daniel P. Berrangé, qemu-arm, Jason Wang, Gerd Hoffmann, Hanna Reitz, Marc-André Lureau, BALATON Zoltan, Daniel Henrique Barboza, Elena Ufimtseva, Aurelien Jarno, Hailiang Zhang, Roman Bolshakov, Huacai Chen, Fam Zheng, Eric Blake, Jiri Slaby, Alexander Graf, Liu Zhiwei, Weiwei Li, Eric Farman, Stafford Horne, David Hildenbrand, Markus Armbruster, Reinoud Zandijk, Palmer Dabbelt, Cameron Esfahani, xen-devel, Pavel Dovgalyuk, qemu-riscv, Aleksandar Rikalo, John Snow, Sunil Muthuswamy, Michael Roth, David Gibson, Michael S. Tsirkin, Richard Henderson, Bin Meng, Stefano Stabellini, kvm, qemu-block, Halil Pasic, Peter Xu, Anthony Perard, Harsh Prateek Bora, Alex Bennée, Eduardo Habkost, Paolo Bonzini, Vladimir Sementsov-Ogievskiy, Cédric Le Goater, qemu-ppc, Christian Borntraeger, Akihiko Odaki, Leonardo Bras, Nicholas Piggin, Jiaxun Yang [-- Attachment #1: Type: text/plain, Size: 2330 bytes --] On Thu, Nov 30, 2023 at 02:49:48PM +0100, Philippe Mathieu-Daudé wrote: > On 29/11/23 22:26, Stefan Hajnoczi wrote: > > The term "QEMU global mutex" is identical to the more widely used Big > > QEMU Lock ("BQL"). Update the code comments and documentation to use > > "BQL" instead of "QEMU global mutex". > > > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > > --- > > docs/devel/multi-thread-tcg.rst | 7 +++---- > > docs/devel/qapi-code-gen.rst | 2 +- > > docs/devel/replay.rst | 2 +- > > docs/devel/multiple-iothreads.txt | 16 ++++++++-------- > > include/block/blockjob.h | 6 +++--- > > include/io/task.h | 2 +- > > include/qemu/coroutine-core.h | 2 +- > > include/qemu/coroutine.h | 2 +- > > hw/block/dataplane/virtio-blk.c | 8 ++++---- > > hw/block/virtio-blk.c | 2 +- > > hw/scsi/virtio-scsi-dataplane.c | 6 +++--- > > net/tap.c | 2 +- > > 12 files changed, 28 insertions(+), 29 deletions(-) > > > > diff --git a/include/block/blockjob.h b/include/block/blockjob.h > > index e594c10d23..b2bc7c04d6 100644 > > --- a/include/block/blockjob.h > > +++ b/include/block/blockjob.h > > @@ -54,7 +54,7 @@ typedef struct BlockJob { > > /** > > * Speed that was set with @block_job_set_speed. > > - * Always modified and read under QEMU global mutex (GLOBAL_STATE_CODE). > > + * Always modified and read under BQL (GLOBAL_STATE_CODE). > > "under the BQL" > > > */ > > int64_t speed; > > @@ -66,7 +66,7 @@ typedef struct BlockJob { > > /** > > * Block other operations when block job is running. > > - * Always modified and read under QEMU global mutex (GLOBAL_STATE_CODE). > > + * Always modified and read under BQL (GLOBAL_STATE_CODE). > > Ditto, > > > */ > > Error *blocker; > > @@ -89,7 +89,7 @@ typedef struct BlockJob { > > /** > > * BlockDriverStates that are involved in this block job. > > - * Always modified and read under QEMU global mutex (GLOBAL_STATE_CODE). > > + * Always modified and read under BQL (GLOBAL_STATE_CODE). > > Ditto. > > > */ > > GSList *nodes; > > } BlockJob; Will fix in v2. Stefan [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 34+ messages in thread
end of thread, other threads:[~2023-12-07 11:45 UTC | newest] Thread overview: 34+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-11-29 21:26 [PATCH 0/6] Make Big QEMU Lock naming consistent Stefan Hajnoczi 2023-11-29 21:26 ` [PATCH 1/6] system/cpus: rename qemu_mutex_lock_iothread() to qemu_bql_lock() Stefan Hajnoczi 2023-11-30 9:02 ` Paul Durrant 2023-11-30 12:20 ` Fabiano Rosas 2023-11-30 12:25 ` David Woodhouse 2023-11-30 12:57 ` Cédric Le Goater 2023-11-30 20:08 ` Peter Xu 2023-11-30 20:43 ` Stefan Hajnoczi 2023-11-30 20:56 ` Peter Xu 2023-11-30 21:41 ` BALATON Zoltan 2023-11-30 21:48 ` Eric Farman 2023-12-01 5:12 ` Harsh Prateek Bora 2023-12-07 11:44 ` Stefan Hajnoczi 2023-11-29 21:26 ` [PATCH 2/6] qemu/main-loop: rename QEMU_IOTHREAD_LOCK_GUARD to QEMU_BQL_LOCK_GUARD Stefan Hajnoczi 2023-11-30 9:03 ` Paul Durrant 2023-11-30 9:14 ` Ilya Leoshkevich 2023-11-30 20:27 ` Stefan Hajnoczi 2023-12-01 7:10 ` Harsh Prateek Bora 2023-11-30 12:26 ` David Woodhouse 2023-11-30 12:58 ` Cédric Le Goater 2023-11-29 21:26 ` [PATCH 3/6] qemu/main-loop: rename qemu_cond_wait_iothread() to qemu_cond_wait_bql() Stefan Hajnoczi 2023-11-30 13:19 ` Cédric Le Goater 2023-11-30 13:36 ` Philippe Mathieu-Daudé 2023-11-29 21:26 ` [PATCH 4/6] system/cpus: rename qemu_global_mutex to qemu_bql Stefan Hajnoczi 2023-11-30 13:20 ` Cédric Le Goater 2023-11-30 13:44 ` Philippe Mathieu-Daudé 2023-11-30 20:31 ` Stefan Hajnoczi 2023-11-29 21:26 ` [PATCH 5/6] Replace "iothread lock" with "BQL" in comments Stefan Hajnoczi 2023-11-30 13:47 ` Philippe Mathieu-Daudé 2023-11-30 20:36 ` Stefan Hajnoczi 2023-11-29 21:26 ` [PATCH 6/6] Rename "QEMU global mutex" to "BQL" in comments and docs Stefan Hajnoczi 2023-11-30 7:17 ` Markus Armbruster 2023-11-30 13:49 ` Philippe Mathieu-Daudé 2023-11-30 20:37 ` Stefan Hajnoczi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).