From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Jean-Christophe Dubois" <jcd@tribudubois.net>,
"Fabiano Rosas" <farosas@suse.de>,
qemu-s390x@nongnu.org, "Song Gao" <gaosong@loongson.cn>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Thomas Huth" <thuth@redhat.com>,
"Hyman Huang" <yong.huang@smartx.com>,
"Marcelo Tosatti" <mtosatti@redhat.com>,
"David Woodhouse" <dwmw2@infradead.org>,
"Andrey Smirnov" <andrew.smirnov@gmail.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Kevin Wolf" <kwolf@redhat.com>,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
"Artyom Tarasenko" <atar4qemu@gmail.com>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Max Filippov" <jcmvbkbc@gmail.com>,
"Alistair Francis" <alistair.francis@wdc.com>,
"Paul Durrant" <paul@xen.org>,
"Jagannathan Raman" <jag.raman@oracle.com>,
"Juan Quintela" <quintela@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
qemu-arm@nongnu.org, "Jason Wang" <jasowang@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"BALATON Zoltan" <balaton@eik.bme.hu>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Elena Ufimtseva" <elena.ufimtseva@oracle.com>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Hailiang Zhang" <zhanghailiang@xfusion.com>,
"Roman Bolshakov" <rbolshakov@ddn.com>,
"Huacai Chen" <chenhuacai@kernel.org>,
"Fam Zheng" <fam@euphon.net>, "Eric Blake" <eblake@redhat.com>,
"Jiri Slaby" <jslaby@suse.cz>, "Alexander Graf" <agraf@csgraf.de>,
"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>,
"Weiwei Li" <liwei1518@gmail.com>,
"Eric Farman" <farman@linux.ibm.com>,
"Stafford Horne" <shorne@gmail.com>,
"David Hildenbrand" <david@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Reinoud Zandijk" <reinoud@netbsd.org>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Cameron Esfahani" <dirty@apple.com>,
xen-devel@lists.xenproject.org,
"Pavel Dovgalyuk" <pavel.dovgaluk@ispras.ru>,
qemu-riscv@nongnu.org,
"Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
"John Snow" <jsnow@redhat.com>,
"Sunil Muthuswamy" <sunilmut@microsoft.com>,
"Michael Roth" <michael.roth@amd.com>,
"David Gibson" <david@gibson.dropbear.id.au>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Bin Meng" <bin.meng@windriver.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
kvm@vger.kernel.org, "Stefan Hajnoczi" <stefanha@redhat.com>,
qemu-block@nongnu.org, "Halil Pasic" <pasic@linux.ibm.com>,
"Peter Xu" <peterx@redhat.com>,
"Anthony Perard" <anthony.perard@citrix.com>,
"Harsh Prateek Bora" <harshpb@linux.ibm.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
"Cédric Le Goater" <clg@kaod.org>,
qemu-ppc@nongnu.org, "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Christian Borntraeger" <borntraeger@linux.ibm.com>,
"Akihiko Odaki" <akihiko.odaki@daynix.com>,
"Leonardo Bras" <leobras@redhat.com>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Jiaxun Yang" <jiaxun.yang@flygoat.com>
Subject: [PATCH 4/6] system/cpus: rename qemu_global_mutex to qemu_bql
Date: Wed, 29 Nov 2023 16:26:23 -0500 [thread overview]
Message-ID: <20231129212625.1051502-5-stefanha@redhat.com> (raw)
In-Reply-To: <20231129212625.1051502-1-stefanha@redhat.com>
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
next prev parent reply other threads:[~2023-11-29 21:29 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Stefan Hajnoczi [this message]
2023-11-30 13:20 ` [PATCH 4/6] system/cpus: rename qemu_global_mutex to qemu_bql 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231129212625.1051502-5-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=agraf@csgraf.de \
--cc=akihiko.odaki@daynix.com \
--cc=aleksandar.rikalo@syrmia.com \
--cc=alex.bennee@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=andrew.smirnov@gmail.com \
--cc=anthony.perard@citrix.com \
--cc=armbru@redhat.com \
--cc=atar4qemu@gmail.com \
--cc=aurelien@aurel32.net \
--cc=balaton@eik.bme.hu \
--cc=berrange@redhat.com \
--cc=bin.meng@windriver.com \
--cc=borntraeger@linux.ibm.com \
--cc=chenhuacai@kernel.org \
--cc=clg@kaod.org \
--cc=danielhb413@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=david@redhat.com \
--cc=dirty@apple.com \
--cc=dwmw2@infradead.org \
--cc=eblake@redhat.com \
--cc=eduardo@habkost.net \
--cc=elena.ufimtseva@oracle.com \
--cc=fam@euphon.net \
--cc=farman@linux.ibm.com \
--cc=farosas@suse.de \
--cc=gaosong@loongson.cn \
--cc=harshpb@linux.ibm.com \
--cc=hreitz@redhat.com \
--cc=iii@linux.ibm.com \
--cc=jag.raman@oracle.com \
--cc=jasowang@redhat.com \
--cc=jcd@tribudubois.net \
--cc=jcmvbkbc@gmail.com \
--cc=jiaxun.yang@flygoat.com \
--cc=jslaby@suse.cz \
--cc=jsnow@redhat.com \
--cc=kraxel@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=kwolf@redhat.com \
--cc=leobras@redhat.com \
--cc=liwei1518@gmail.com \
--cc=marcandre.lureau@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=michael.roth@amd.com \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=npiggin@gmail.com \
--cc=palmer@dabbelt.com \
--cc=pasic@linux.ibm.com \
--cc=paul@xen.org \
--cc=pavel.dovgaluk@ispras.ru \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=quintela@redhat.com \
--cc=rbolshakov@ddn.com \
--cc=reinoud@netbsd.org \
--cc=richard.henderson@linaro.org \
--cc=shorne@gmail.com \
--cc=sstabellini@kernel.org \
--cc=sunilmut@microsoft.com \
--cc=thuth@redhat.com \
--cc=vsementsov@yandex-team.ru \
--cc=xen-devel@lists.xenproject.org \
--cc=yong.huang@smartx.com \
--cc=zhanghailiang@xfusion.com \
--cc=zhiwei_liu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).