From nobody Tue Nov 26 22:36:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1704209763; cv=none; d=zohomail.com; s=zohoarc; b=DRNmR75oRGKn5yqaaPjB7g3+97RKzah2uMnavzpn1Nkcj6VruuqYV4HCTjCKdrdUBPOZbBAgRf10qRfiFHa2dUb6PY0ryn+EAYvYlwWy1+T6UTh2XO0eau3GbbNyOCSUkrGYCAmCd+9jCQn3Xdy5tPUheqHd/BosS3Mz03MwSws= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704209763; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=C6keNf8ENMxa5hxSNThwu7kx0Y76THaDxXwlioY2QjA=; b=CRY9hYlwHFtVxfK4aqNB5/ueHB3ChZ//spsLBHKyPBxC2G62GEWtolpj/crc+/O4SdvRYz3lY6FaLdmO1AYv1qdLK+A8Ra9muHlVDqJAJhot2Is7632m7ZYEIhd2gPRQ6koMmGRKvvqUKPMDY4PZwAkjxXjfAZUNjvsVesscAcQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1704209763167552.4011940398755; Tue, 2 Jan 2024 07:36:03 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.660741.1030324 (Exim 4.92) (envelope-from ) id 1rKgo2-00083v-N1; Tue, 02 Jan 2024 15:35:50 +0000 Received: by outflank-mailman (output) from mailman id 660741.1030324; Tue, 02 Jan 2024 15:35:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rKgo2-00083i-Jx; Tue, 02 Jan 2024 15:35:50 +0000 Received: by outflank-mailman (input) for mailman id 660741; Tue, 02 Jan 2024 15:35:48 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rKgo0-00082L-QX for xen-devel@lists.xenproject.org; Tue, 02 Jan 2024 15:35:48 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 988df774-a984-11ee-9b0f-b553b5be7939; Tue, 02 Jan 2024 16:35:46 +0100 (CET) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-596-i1Sg-AuUNZ-LM4Nzo0jp8A-1; Tue, 02 Jan 2024 10:35:41 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 68CAE185A786; Tue, 2 Jan 2024 15:35:38 +0000 (UTC) Received: from localhost (unknown [10.39.193.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BFAE2027042; Tue, 2 Jan 2024 15:35:37 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 988df774-a984-11ee-9b0f-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704209745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C6keNf8ENMxa5hxSNThwu7kx0Y76THaDxXwlioY2QjA=; b=B1MSeSoJdrOPhoxx1hAh0vZhAiSON8HaGHikBNVHBIDHpjd9WyXYuXIutIWDoEmjZd2eqR W+FPxQDDjd7w+zAy6UfndI/UykihTfujXUyoR+V7Uqcn9ceJaJWrQ0Dz6lVSaNNysrm2Uh I1mGY5Hilo/rQp3REfTDhtwDUFJY78I= X-MC-Unique: i1Sg-AuUNZ-LM4Nzo0jp8A-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: Hanna Reitz , qemu-riscv@nongnu.org, Roman Bolshakov , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Elena Ufimtseva , Eduardo Habkost , Thomas Huth , Stefan Hajnoczi , qemu-block@nongnu.org, Andrey Smirnov , Peter Maydell , Huacai Chen , Fam Zheng , Gerd Hoffmann , David Gibson , John Snow , Stafford Horne , Weiwei Li , Jean-Christophe Dubois , Cameron Esfahani , Alexander Graf , David Hildenbrand , Juan Quintela , Nicholas Piggin , Max Filippov , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini , Daniel Henrique Barboza , Markus Armbruster , Peter Xu , Vladimir Sementsov-Ogievskiy , Richard Henderson , qemu-s390x@nongnu.org, Jiri Slaby , Pavel Dovgalyuk , Eric Blake , Akihiko Odaki , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Aleksandar Rikalo , "Michael S. Tsirkin" , Jason Wang , Jiaxun Yang , Sunil Muthuswamy , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fabiano Rosas , Michael Roth , Paul Durrant , Jagannathan Raman , Mark Cave-Ayland , Stefano Stabellini , Hyman Huang , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , xen-devel@lists.xenproject.org, Halil Pasic , Christian Borntraeger , Song Gao , Kevin Wolf , Ilya Leoshkevich , Artyom Tarasenko , Marcel Apfelbaum , Reinoud Zandijk , qemu-ppc@nongnu.org, Marcelo Tosatti , David Woodhouse , Aurelien Jarno , Bin Meng , qemu-arm@nongnu.org, Anthony Perard , Leonardo Bras , Hailiang Zhang , Harsh Prateek Bora , kvm@vger.kernel.org, Palmer Dabbelt , Eric Farman , BALATON Zoltan , Liu Zhiwei , David Woodhouse Subject: [PATCH v3 2/5] qemu/main-loop: rename QEMU_IOTHREAD_LOCK_GUARD to BQL_LOCK_GUARD Date: Tue, 2 Jan 2024 10:35:26 -0500 Message-ID: <20240102153529.486531-3-stefanha@redhat.com> In-Reply-To: <20240102153529.486531-1-stefanha@redhat.com> References: <20240102153529.486531-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1704209764965100001 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 Reviewed-by: Paul Durrant Acked-by: David Woodhouse Reviewed-by: C=C3=A9dric Le Goater Acked-by: Ilya Leoshkevich --- include/qemu/main-loop.h | 19 +++++++++---------- 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, 24 insertions(+), 25 deletions(-) diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h index 72ebc0cb3a..c26ad2a029 100644 --- a/include/qemu/main-loop.h +++ b/include/qemu/main-loop.h @@ -343,33 +343,32 @@ void bql_lock_impl(const char *file, int line); void bql_unlock(void); =20 /** - * QEMU_IOTHREAD_LOCK_GUARD + * BQL_LOCK_GUARD * * Wrap a block of code in a conditional bql_{lock,unlock}. */ -typedef struct IOThreadLockAuto IOThreadLockAuto; +typedef struct BQLLockAuto BQLLockAuto; =20 -static inline IOThreadLockAuto *qemu_iothread_auto_lock(const char *file, - int line) +static inline BQLLockAuto *bql_auto_lock(const char *file, int line) { if (bql_locked()) { return NULL; } 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; } =20 -static inline void qemu_iothread_auto_unlock(IOThreadLockAuto *l) +static inline void bql_auto_unlock(BQLLockAuto *l) { bql_unlock(); } =20 -G_DEFINE_AUTOPTR_CLEANUP_FUNC(IOThreadLockAuto, qemu_iothread_auto_unlock) +G_DEFINE_AUTOPTR_CLEANUP_FUNC(BQLLockAuto, bql_auto_unlock) =20 -#define QEMU_IOTHREAD_LOCK_GUARD() \ - g_autoptr(IOThreadLockAuto) _iothread_lock_auto __attribute__((unused)= ) \ - =3D qemu_iothread_auto_lock(__FILE__, __LINE__) +#define BQL_LOCK_GUARD() \ + g_autoptr(BQLLockAuto) _bql_lock_auto __attribute__((unused)) \ + =3D bql_auto_lock(__FILE__, __LINE__) =20 /* * 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 d7d15cfaf7..bd077eda6d 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; } =20 - QEMU_IOTHREAD_LOCK_GUARD(); + BQL_LOCK_GUARD(); return xen_evtchn_soft_reset(); } =20 @@ -1145,7 +1145,7 @@ int xen_evtchn_close_op(struct evtchn_close *close) return -EINVAL; } =20 - QEMU_IOTHREAD_LOCK_GUARD(); + BQL_LOCK_GUARD(); qemu_mutex_lock(&s->port_lock); =20 ret =3D 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; } =20 - QEMU_IOTHREAD_LOCK_GUARD(); + BQL_LOCK_GUARD(); =20 if (s->pirq[pirq->pirq].port) { return -EBUSY; @@ -1824,7 +1824,7 @@ int xen_physdev_map_pirq(struct physdev_map_pirq *map) return -ENOTSUP; } =20 - QEMU_IOTHREAD_LOCK_GUARD(); + BQL_LOCK_GUARD(); QEMU_LOCK_GUARD(&s->port_lock); =20 if (map->domid !=3D DOMID_SELF && map->domid !=3D xen_domid) { @@ -1884,7 +1884,7 @@ int xen_physdev_unmap_pirq(struct physdev_unmap_pirq = *unmap) return -EINVAL; } =20 - QEMU_IOTHREAD_LOCK_GUARD(); + BQL_LOCK_GUARD(); qemu_mutex_lock(&s->port_lock); =20 if (!pirq_inuse(s, pirq)) { @@ -1924,7 +1924,7 @@ int xen_physdev_eoi_pirq(struct physdev_eoi *eoi) return -ENOTSUP; } =20 - QEMU_IOTHREAD_LOCK_GUARD(); + BQL_LOCK_GUARD(); QEMU_LOCK_GUARD(&s->port_lock); =20 if (!pirq_inuse(s, pirq)) { @@ -1956,7 +1956,7 @@ int xen_physdev_query_pirq(struct physdev_irq_status_= query *query) return -ENOTSUP; } =20 - QEMU_IOTHREAD_LOCK_GUARD(); + BQL_LOCK_GUARD(); QEMU_LOCK_GUARD(&s->port_lock); =20 if (!pirq_inuse(s, pirq)) { diff --git a/hw/i386/kvm/xen_gnttab.c b/hw/i386/kvm/xen_gnttab.c index 0a24f53f20..d9477ae927 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; } =20 - QEMU_IOTHREAD_LOCK_GUARD(); + BQL_LOCK_GUARD(); QEMU_LOCK_GUARD(&s->gnt_lock); =20 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..eef2fd2cd1 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, i= nt level) return; } =20 - QEMU_IOTHREAD_LOCK_GUARD(); + BQL_LOCK_GUARD(); =20 if (level) { env->CP0_Cause |=3D 1 << (irq + CP0Ca_IP); diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index b6581c16fc..7387b5b677 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; =20 /* We may already have the BQL if coming from the reset path */ - QEMU_IOTHREAD_LOCK_GUARD(); + BQL_LOCK_GUARD(); =20 old_pending =3D env->pending_interrupts; =20 diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c index b0ed2e6aeb..fc2c2321ac 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 =3D gfn << TARGET_PAGE_BITS; int i, err; =20 - QEMU_IOTHREAD_LOCK_GUARD(); + BQL_LOCK_GUARD(); =20 /* * 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 8a2bfb5aa2..2ec6429e36 100644 --- a/target/ppc/excp_helper.c +++ b/target/ppc/excp_helper.c @@ -2222,7 +2222,7 @@ static int ppc_next_unmasked_interrupt(CPUPPCState *e= nv) void ppc_maybe_interrupt(CPUPPCState *env) { CPUState *cs =3D env_cpu(env); - QEMU_IOTHREAD_LOCK_GUARD(); + BQL_LOCK_GUARD(); =20 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..e0b2dcd02e 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(); + 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..99d1275729 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 =3D 0, vstip =3D 0, irqf =3D 0; CPUState *cs =3D env_cpu(env); =20 - QEMU_IOTHREAD_LOCK_GUARD(); + BQL_LOCK_GUARD(); =20 if (env->virt_enabled) { gein =3D get_field(env->hstatus, HSTATUS_VGEIN); @@ -681,7 +681,7 @@ uint64_t riscv_cpu_update_mip(CPURISCVState *env, uint6= 4_t mask, uint64_t value) /* No need to update mip for VSTIP */ mask =3D ((mask =3D=3D MIP_VSTIP) && env->vstime_irq) ? 0 : mask; =20 - QEMU_IOTHREAD_LOCK_GUARD(); + BQL_LOCK_GUARD(); =20 env->mip =3D (env->mip & ~mask) | (value & mask); =20 --=20 2.43.0