From nobody Sat May 4 20:21:55 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1584707631; cv=none; d=zohomail.com; s=zohoarc; b=Ygxse/3IP2olC8ubGRCq25Sw+4BUZJmF2uX0/0IzjWycnkl/o8XamUXYfX2IX6M6dIkmW4TZf5ltr/GI0fZy0Sul15+Xok15JyLV99Kw647cDB41/qko4JJnTxZxdOi6i9Qm4ajYaaEu8KjsNPZKH1L6ozEK5UcifTSdxkZZm00= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584707631; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DFZU6y1FUNjWETl8iut0I7iFRsUd4Hl2jMI8hhwl6Dk=; b=g6i+jndlUDDCbw3jJ2XFSaaQWrrbkvfSWGoBIWjpFrJtn2v2j9RWSa/Iz2J095kUsx6NcCgwcqZWNVdsSqHyGuYnZ+zkrIM/qbC5uxhTs/nyqkviDtO8pM57dOlIK3ZRnI6qmmV5uDMPzOH3OgMFn/lRP1EIWaorwlm7YOWJJM8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584707631021146.80390392523964; Fri, 20 Mar 2020 05:33:51 -0700 (PDT) Received: from localhost ([::1]:52298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFGqR-00042Q-4D for importer@patchew.org; Fri, 20 Mar 2020 08:33:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59545) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFGoh-0002Wo-8W for qemu-devel@nongnu.org; Fri, 20 Mar 2020 08:32:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jFGog-0000cg-9x for qemu-devel@nongnu.org; Fri, 20 Mar 2020 08:31:59 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:37340) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jFGog-0000cO-4c for qemu-devel@nongnu.org; Fri, 20 Mar 2020 08:31:58 -0400 Received: by mail-pf1-x434.google.com with SMTP id h72so940481pfe.4 for ; Fri, 20 Mar 2020 05:31:58 -0700 (PDT) Received: from esc.telus (node-1w7jr9qmilj27lake3duljaz9.ipv6.telus.net. [2001:569:75e3:4100:12ba:ab1b:8ad3:bb55]) by smtp.gmail.com with ESMTPSA id 1sm4766550pjo.10.2020.03.20.05.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 05:31:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DFZU6y1FUNjWETl8iut0I7iFRsUd4Hl2jMI8hhwl6Dk=; b=BF0QR8BNJf7jCMvjwD2Hb75duT2OBpKxIE03GwIVDIe9dU/Vhvq0iayysCCNXKWOun NjQq0NaP/EsyWwJxTJ3FMem2wxJwdxqRziSI/a8Rku0Ciauqw4wWo4RSlYRwgU7VNvTC ESYP15AIzwhc23TI23FCBDCG7dymakibVqcZCG9GbFLWuN0X/QBCpizFHJBOxGhyLIT/ 6dFIrCDBat7Y5APtX6QevIGcAH/NO+E3Q+xn/yn7IZQ5gZUzmS9vt7QVRBsk71y/Tt35 fL21IwCAWxu1YvqAWbRuJxKi70bXKzd0zNW2nmrnpHEaLCan8oU9E0a1W6qBTZQxodDV 2baw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DFZU6y1FUNjWETl8iut0I7iFRsUd4Hl2jMI8hhwl6Dk=; b=prD/oEUAmcvwJQmz0UkND9SEGoftorOQ31U0OuXzTBZPKvvCyK2Dhmna4accBnQyb/ HUucOAzMMmWckg42PaTnQiUnODRIpMM7n/HvfPsqyhqPh/X1pwLIS4Fsci/PcaAs0yMd n17Y0FMnK5r+85iHWKIUFCAF8y6Ly2UgrEDbX7VEb0z3ZQvqpWQhdFXF8pj68Gte7CQj CbcXt3OItO68t0oqqp2N2cbeLrPGTWr/UIp06i2VLo4bZfBTMhy5H3O4LuBa1j2jX2U+ yrNhVvg+2aWnv2KZVAxNBl4haw9CynwC42Yee0l3AxUJcoe+GOIpa/kBvePLf4e3gWNT Meag== X-Gm-Message-State: ANhLgQ35DT3zqbXlsNN59dLLudqLuaMVjrYHTcQUtNimQaJiCj+l6FvJ NaWUGlN6VFEgWFhpmOYL3gjU1PzlmSPZfw== X-Google-Smtp-Source: ADFU+vs+69zZJRKphVeb4MDXoIl+XNoC0Q5QxOT3IEUjBs4XCa6pFJHpnhQTnqJjxD1quHWgpMW/cg== X-Received: by 2002:aa7:87ca:: with SMTP id i10mr9452119pfo.169.1584707517179; Fri, 20 Mar 2020 05:31:57 -0700 (PDT) From: dnbrdsky@gmail.com To: dnbrdsky@gmail.com Subject: [PATCH v4 1/2] lockable: fix __COUNTER__ macro to be referenced properly Date: Fri, 20 Mar 2020 05:31:36 -0700 Message-Id: <20200320123137.1937091-2-dnbrdsky@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200320123137.1937091-1-dnbrdsky@gmail.com> References: <20200320123137.1937091-1-dnbrdsky@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::434 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stefanha@gmail.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Daniel Brodsky - __COUNTER__ doesn't work with ## concat - replaced ## with glue() macro so __COUNTER__ is evaluated Fixes: 3284c3ddc4 Signed-off-by: Daniel Brodsky --- include/qemu/lockable.h | 4 ++-- include/qemu/rcu.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/qemu/lockable.h b/include/qemu/lockable.h index 1aeb2cb1a6..71cda060e4 100644 --- a/include/qemu/lockable.h +++ b/include/qemu/lockable.h @@ -152,7 +152,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuLockable, qemu_lockab= le_auto_unlock) * } */ #define WITH_QEMU_LOCK_GUARD(x) \ - WITH_QEMU_LOCK_GUARD_((x), qemu_lockable_auto##__COUNTER__) + WITH_QEMU_LOCK_GUARD_((x), glue(qemu_lockable_auto, __COUNTER__)) =20 /** * QEMU_LOCK_GUARD - Lock an object until the end of the scope @@ -170,7 +170,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuLockable, qemu_lockab= le_auto_unlock) * } */ #define QEMU_LOCK_GUARD(x) \ - g_autoptr(QemuLockable) qemu_lockable_auto##__COUNTER__ =3D \ + g_autoptr(QemuLockable) glue(qemu_lockable_auto, __COUNTER__) =3D \ qemu_lockable_auto_lock(QEMU_MAKE_LOCKABLE((x))) =20 #endif diff --git a/include/qemu/rcu.h b/include/qemu/rcu.h index 9c82683e37..570aa603eb 100644 --- a/include/qemu/rcu.h +++ b/include/qemu/rcu.h @@ -170,7 +170,7 @@ static inline void rcu_read_auto_unlock(RCUReadAuto *r) G_DEFINE_AUTOPTR_CLEANUP_FUNC(RCUReadAuto, rcu_read_auto_unlock) =20 #define WITH_RCU_READ_LOCK_GUARD() \ - WITH_RCU_READ_LOCK_GUARD_(_rcu_read_auto##__COUNTER__) + WITH_RCU_READ_LOCK_GUARD_(glue(_rcu_read_auto, __COUNTER__)) =20 #define WITH_RCU_READ_LOCK_GUARD_(var) \ for (g_autoptr(RCUReadAuto) var =3D rcu_read_auto_lock(); \ --=20 2.25.1 From nobody Sat May 4 20:21:55 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1584707715; cv=none; d=zohomail.com; s=zohoarc; b=DUNVuPTvMyGrk7b2u9GmvRqkJ8XyUEeYQ0qQPlYfeVFUM3ERbeypmikiZ2mtPcjdFqc+DQ3QDNkLh23nP/6Q2laAGpyq/SWhjBrpdGIf0iffvJGr8/CC2Ft1g7QZP8eKg6axdhllmJf6UZN1/pkzBxeF+cqtJr5LJ/DjAa7exNo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584707715; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KA0SdVVnzFKpzTOzE9vNBWK1NGi8Mmsdox27NvJ+mB0=; b=Or2PYs/3fNiSfqYOUM2QUsiK7CkGlOlZMCODkUlrHaVpQUJe5qbZyKhlB4b1YkYZqU1ATjYAZcs/zGaEd98exa+Cv98hve5MUZF3HN8lKcOCCPoEUGQyQr0U4RDxQIcLPf41byYjyc70TeeI7p9OSMpaQz+PmKATuTY51Bgzjr0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584707715443231.004659775685; Fri, 20 Mar 2020 05:35:15 -0700 (PDT) Received: from localhost ([::1]:52302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFGql-00046o-Dx for importer@patchew.org; Fri, 20 Mar 2020 08:34:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59559) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFGol-0002XC-0j for qemu-devel@nongnu.org; Fri, 20 Mar 2020 08:32:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jFGoi-0000dV-5p for qemu-devel@nongnu.org; Fri, 20 Mar 2020 08:32:02 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]:44554) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jFGoh-0000dF-TV; Fri, 20 Mar 2020 08:32:00 -0400 Received: by mail-pf1-x429.google.com with SMTP id b72so3142051pfb.11; Fri, 20 Mar 2020 05:31:59 -0700 (PDT) Received: from esc.telus (node-1w7jr9qmilj27lake3duljaz9.ipv6.telus.net. [2001:569:75e3:4100:12ba:ab1b:8ad3:bb55]) by smtp.gmail.com with ESMTPSA id 1sm4766550pjo.10.2020.03.20.05.31.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 05:31:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KA0SdVVnzFKpzTOzE9vNBWK1NGi8Mmsdox27NvJ+mB0=; b=nuJwrvmp4rHArzjZVUeSc4gCgrSlzjsygbtLR0YsQgJ1QWlMtSedlmUL0ngAsJRwiT kOyRal1NjdVsHKV9z1Ltu0uCVakaTJzXgIHVwSIByU+bG8j8VEZ1aOOGhUHwkdf2HRA+ FYsmuEjdn8epAb0UdnE/fodr6PbuiFjch1VFhiwPQQ3cWi5up0/RG+x0ZMPhiJb85Nwl q7HUI7fRD0QkqKlZ6UCfhPOpm+adN8csnS0GLqZ6T8DiA4fTPqBs9mmeqluqKMr5uDW3 VgCGBLW6dzFlRoMoslrc84dl/agfjOTiXy58DCe1ZMMDsHv4U1o/z0TKwqm363dKi8FA i4NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KA0SdVVnzFKpzTOzE9vNBWK1NGi8Mmsdox27NvJ+mB0=; b=VV+Km2uTCf6Y+3uGaVC03amYneo3pDfBalB7Z+D8tL7Mz3rqNEMBL3eD32Z73cm6vk p6GHpgO1tn5FjvyNpdV06I/eVD7QyE+d8LUpq+XvaljhC68P+qT0ay40VJLDX/CvQvsZ ZLUmYmWzX1j6GACH0aXDLUy1mJ7VnrztdTH3jECNChg8VKtgT5mReXOqgHaEVq5iXuD+ hNnlwsATo4EEhoAsWcsN8ITHQFbArXgsQdispGnQ0hDCdFwLyLHxHeW9oEbqZh788E50 EhyOEEssf0xBi/6KZVBJBDHhUYV8xiA0SR48+wQXyVImNkRVYdikZK/gumgp9pktOoY5 qkFg== X-Gm-Message-State: ANhLgQ2PVygJ1vnRl69xSV4OXnyRzXnRH1xEs7XhuwZaHVB0b6jqaRGQ ynFI6en+EJSC7QQlRIiiRKk= X-Google-Smtp-Source: ADFU+vvQwyWG/XxE7TSSTlPiacQb7hvExB1iH+MbLIYWtEX7vKMqOm/E47Fhidl7xv3rlKjvwdQ1ig== X-Received: by 2002:a65:5383:: with SMTP id x3mr8309260pgq.279.1584707518695; Fri, 20 Mar 2020 05:31:58 -0700 (PDT) From: dnbrdsky@gmail.com To: dnbrdsky@gmail.com Subject: [PATCH v4 2/2] lockable: replaced locks with lock guard macros where appropriate Date: Fri, 20 Mar 2020 05:31:37 -0700 Message-Id: <20200320123137.1937091-3-dnbrdsky@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200320123137.1937091-1-dnbrdsky@gmail.com> References: <20200320123137.1937091-1-dnbrdsky@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::429 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Markus Armbruster , "open list:iSCSI" , Juan Quintela , stefanha@gmail.com, Peter Lieven , qemu-devel@nongnu.org, Max Reitz , Alex Williamson , Gerd Hoffmann , Ronnie Sahlberg , Paolo Bonzini , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Daniel Brodsky - ran regexp "qemu_mutex_lock\(.*\).*\n.*if" to find targets - replaced result with QEMU_LOCK_GUARD if all unlocks at function end - replaced result with WITH_QEMU_LOCK_GUARD if unlock not at end Signed-off-by: Daniel Brodsky Reviewed-by: Stefan Hajnoczi --- block/iscsi.c | 7 ++---- block/nfs.c | 51 ++++++++++++++++++++----------------------- cpus-common.c | 14 +++++------- hw/display/qxl.c | 43 +++++++++++++++++------------------- hw/vfio/platform.c | 5 ++--- migration/migration.c | 3 +-- migration/multifd.c | 8 +++---- migration/ram.c | 3 +-- monitor/misc.c | 4 +--- ui/spice-display.c | 14 ++++++------ util/log.c | 4 ++-- util/qemu-timer.c | 17 +++++++-------- util/rcu.c | 8 +++---- util/thread-pool.c | 3 +-- util/vfio-helpers.c | 5 ++--- 15 files changed, 83 insertions(+), 106 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index 682abd8e09..f86a53c096 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1395,20 +1395,17 @@ static void iscsi_nop_timed_event(void *opaque) { IscsiLun *iscsilun =3D opaque; =20 - qemu_mutex_lock(&iscsilun->mutex); + QEMU_LOCK_GUARD(&iscsilun->mutex); if (iscsi_get_nops_in_flight(iscsilun->iscsi) >=3D MAX_NOP_FAILURES) { error_report("iSCSI: NOP timeout. Reconnecting..."); iscsilun->request_timed_out =3D true; } else if (iscsi_nop_out_async(iscsilun->iscsi, NULL, NULL, 0, NULL) != =3D 0) { error_report("iSCSI: failed to sent NOP-Out. Disabling NOP message= s."); - goto out; + return; } =20 timer_mod(iscsilun->nop_timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME) = + NOP_INTERVAL); iscsi_set_events(iscsilun); - -out: - qemu_mutex_unlock(&iscsilun->mutex); } =20 static void iscsi_readcapacity_sync(IscsiLun *iscsilun, Error **errp) diff --git a/block/nfs.c b/block/nfs.c index 9a6311e270..09a78aede8 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -273,15 +273,14 @@ static int coroutine_fn nfs_co_preadv(BlockDriverStat= e *bs, uint64_t offset, nfs_co_init_task(bs, &task); task.iov =3D iov; =20 - qemu_mutex_lock(&client->mutex); - if (nfs_pread_async(client->context, client->fh, - offset, bytes, nfs_co_generic_cb, &task) !=3D 0) { - qemu_mutex_unlock(&client->mutex); - return -ENOMEM; - } + WITH_QEMU_LOCK_GUARD(&client->mutex) { + if (nfs_pread_async(client->context, client->fh, + offset, bytes, nfs_co_generic_cb, &task) !=3D = 0) { + return -ENOMEM; + } =20 - nfs_set_events(client); - qemu_mutex_unlock(&client->mutex); + nfs_set_events(client); + } while (!task.complete) { qemu_coroutine_yield(); } @@ -320,19 +319,18 @@ static int coroutine_fn nfs_co_pwritev(BlockDriverSta= te *bs, uint64_t offset, buf =3D iov->iov[0].iov_base; } =20 - qemu_mutex_lock(&client->mutex); - if (nfs_pwrite_async(client->context, client->fh, - offset, bytes, buf, - nfs_co_generic_cb, &task) !=3D 0) { - qemu_mutex_unlock(&client->mutex); - if (my_buffer) { - g_free(buf); + WITH_QEMU_LOCK_GUARD(&client->mutex) { + if (nfs_pwrite_async(client->context, client->fh, + offset, bytes, buf, + nfs_co_generic_cb, &task) !=3D 0) { + if (my_buffer) { + g_free(buf); + } + return -ENOMEM; } - return -ENOMEM; - } =20 - nfs_set_events(client); - qemu_mutex_unlock(&client->mutex); + nfs_set_events(client); + } while (!task.complete) { qemu_coroutine_yield(); } @@ -355,15 +353,14 @@ static int coroutine_fn nfs_co_flush(BlockDriverState= *bs) =20 nfs_co_init_task(bs, &task); =20 - qemu_mutex_lock(&client->mutex); - if (nfs_fsync_async(client->context, client->fh, nfs_co_generic_cb, - &task) !=3D 0) { - qemu_mutex_unlock(&client->mutex); - return -ENOMEM; - } + WITH_QEMU_LOCK_GUARD(&client->mutex) { + if (nfs_fsync_async(client->context, client->fh, nfs_co_generic_cb, + &task) !=3D 0) { + return -ENOMEM; + } =20 - nfs_set_events(client); - qemu_mutex_unlock(&client->mutex); + nfs_set_events(client); + } while (!task.complete) { qemu_coroutine_yield(); } diff --git a/cpus-common.c b/cpus-common.c index eaf590cb38..55d5df8923 100644 --- a/cpus-common.c +++ b/cpus-common.c @@ -22,6 +22,7 @@ #include "exec/cpu-common.h" #include "hw/core/cpu.h" #include "sysemu/cpus.h" +#include "qemu/lockable.h" =20 static QemuMutex qemu_cpu_list_lock; static QemuCond exclusive_cond; @@ -71,7 +72,7 @@ static int cpu_get_free_index(void) =20 void cpu_list_add(CPUState *cpu) { - qemu_mutex_lock(&qemu_cpu_list_lock); + QEMU_LOCK_GUARD(&qemu_cpu_list_lock); if (cpu->cpu_index =3D=3D UNASSIGNED_CPU_INDEX) { cpu->cpu_index =3D cpu_get_free_index(); assert(cpu->cpu_index !=3D UNASSIGNED_CPU_INDEX); @@ -79,15 +80,13 @@ void cpu_list_add(CPUState *cpu) assert(!cpu_index_auto_assigned); } QTAILQ_INSERT_TAIL_RCU(&cpus, cpu, node); - qemu_mutex_unlock(&qemu_cpu_list_lock); } =20 void cpu_list_remove(CPUState *cpu) { - qemu_mutex_lock(&qemu_cpu_list_lock); + QEMU_LOCK_GUARD(&qemu_cpu_list_lock); if (!QTAILQ_IN_USE(cpu, node)) { /* there is nothing to undo since cpu_exec_init() hasn't been call= ed */ - qemu_mutex_unlock(&qemu_cpu_list_lock); return; } =20 @@ -95,7 +94,6 @@ void cpu_list_remove(CPUState *cpu) =20 QTAILQ_REMOVE_RCU(&cpus, cpu, node); cpu->cpu_index =3D UNASSIGNED_CPU_INDEX; - qemu_mutex_unlock(&qemu_cpu_list_lock); } =20 struct qemu_work_item { @@ -237,7 +235,7 @@ void cpu_exec_start(CPUState *cpu) * see cpu->running =3D=3D true, and it will kick the CPU. */ if (unlikely(atomic_read(&pending_cpus))) { - qemu_mutex_lock(&qemu_cpu_list_lock); + QEMU_LOCK_GUARD(&qemu_cpu_list_lock); if (!cpu->has_waiter) { /* Not counted in pending_cpus, let the exclusive item * run. Since we have the lock, just set cpu->running to true @@ -252,7 +250,6 @@ void cpu_exec_start(CPUState *cpu) * waiter at cpu_exec_end. */ } - qemu_mutex_unlock(&qemu_cpu_list_lock); } } =20 @@ -280,7 +277,7 @@ void cpu_exec_end(CPUState *cpu) * next cpu_exec_start. */ if (unlikely(atomic_read(&pending_cpus))) { - qemu_mutex_lock(&qemu_cpu_list_lock); + QEMU_LOCK_GUARD(&qemu_cpu_list_lock); if (cpu->has_waiter) { cpu->has_waiter =3D false; atomic_set(&pending_cpus, pending_cpus - 1); @@ -288,7 +285,6 @@ void cpu_exec_end(CPUState *cpu) qemu_cond_signal(&exclusive_cond); } } - qemu_mutex_unlock(&qemu_cpu_list_lock); } } =20 diff --git a/hw/display/qxl.c b/hw/display/qxl.c index 227da69a50..d5627119ec 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -478,18 +478,19 @@ static int qxl_track_command(PCIQXLDevice *qxl, struc= t QXLCommandExt *ext) cmd->u.surface_create.stride); return 1; } - qemu_mutex_lock(&qxl->track_lock); - if (cmd->type =3D=3D QXL_SURFACE_CMD_CREATE) { - qxl->guest_surfaces.cmds[id] =3D ext->cmd.data; - qxl->guest_surfaces.count++; - if (qxl->guest_surfaces.max < qxl->guest_surfaces.count) - qxl->guest_surfaces.max =3D qxl->guest_surfaces.count; + WITH_QEMU_LOCK_GUARD(&qxl->track_lock) { + if (cmd->type =3D=3D QXL_SURFACE_CMD_CREATE) { + qxl->guest_surfaces.cmds[id] =3D ext->cmd.data; + qxl->guest_surfaces.count++; + if (qxl->guest_surfaces.max < qxl->guest_surfaces.count) { + qxl->guest_surfaces.max =3D qxl->guest_surfaces.count; + } + } + if (cmd->type =3D=3D QXL_SURFACE_CMD_DESTROY) { + qxl->guest_surfaces.cmds[id] =3D 0; + qxl->guest_surfaces.count--; + } } - if (cmd->type =3D=3D QXL_SURFACE_CMD_DESTROY) { - qxl->guest_surfaces.cmds[id] =3D 0; - qxl->guest_surfaces.count--; - } - qemu_mutex_unlock(&qxl->track_lock); break; } case QXL_CMD_CURSOR: @@ -958,10 +959,9 @@ static void interface_update_area_complete(QXLInstance= *sin, int i; int qxl_i; =20 - qemu_mutex_lock(&qxl->ssd.lock); + QEMU_LOCK_GUARD(&qxl->ssd.lock); if (surface_id !=3D 0 || !num_updated_rects || !qxl->render_update_cookie_num) { - qemu_mutex_unlock(&qxl->ssd.lock); return; } trace_qxl_interface_update_area_complete(qxl->id, surface_id, dirty->l= eft, @@ -980,7 +980,6 @@ static void interface_update_area_complete(QXLInstance = *sin, * Don't bother copying or scheduling the bh since we will flip * the whole area anyway on completion of the update_area async ca= ll */ - qemu_mutex_unlock(&qxl->ssd.lock); return; } qxl_i =3D qxl->num_dirty_rects; @@ -991,7 +990,6 @@ static void interface_update_area_complete(QXLInstance = *sin, trace_qxl_interface_update_area_complete_schedule_bh(qxl->id, qxl->num_dirty_re= cts); qemu_bh_schedule(qxl->update_area_bh); - qemu_mutex_unlock(&qxl->ssd.lock); } =20 /* called from spice server thread context only */ @@ -1694,15 +1692,14 @@ static void ioport_write(void *opaque, hwaddr addr, case QXL_IO_MONITORS_CONFIG_ASYNC: async_common: async =3D QXL_ASYNC; - qemu_mutex_lock(&d->async_lock); - if (d->current_async !=3D QXL_UNDEFINED_IO) { - qxl_set_guest_bug(d, "%d async started before last (%d) comple= te", - io_port, d->current_async); - qemu_mutex_unlock(&d->async_lock); - return; + WITH_QEMU_LOCK_GUARD(&d->async_lock) { + if (d->current_async !=3D QXL_UNDEFINED_IO) { + qxl_set_guest_bug(d, "%d async started before last (%d) co= mplete", + io_port, d->current_async); + return; + } + d->current_async =3D orig_io_port; } - d->current_async =3D orig_io_port; - qemu_mutex_unlock(&d->async_lock); break; default: break; diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index 6b2952c034..ac2cefc9b1 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -22,6 +22,7 @@ #include "hw/vfio/vfio-platform.h" #include "migration/vmstate.h" #include "qemu/error-report.h" +#include "qemu/lockable.h" #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/range.h" @@ -216,7 +217,7 @@ static void vfio_intp_interrupt(VFIOINTp *intp) VFIOPlatformDevice *vdev =3D intp->vdev; bool delay_handling =3D false; =20 - qemu_mutex_lock(&vdev->intp_mutex); + QEMU_LOCK_GUARD(&vdev->intp_mutex); if (intp->state =3D=3D VFIO_IRQ_INACTIVE) { QLIST_FOREACH(tmp, &vdev->intp_list, next) { if (tmp->state =3D=3D VFIO_IRQ_ACTIVE || @@ -236,7 +237,6 @@ static void vfio_intp_interrupt(VFIOINTp *intp) QSIMPLEQ_INSERT_TAIL(&vdev->pending_intp_queue, intp, pqnext); ret =3D event_notifier_test_and_clear(intp->interrupt); - qemu_mutex_unlock(&vdev->intp_mutex); return; } =20 @@ -266,7 +266,6 @@ static void vfio_intp_interrupt(VFIOINTp *intp) qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + vdev->mmap_timeout); } - qemu_mutex_unlock(&vdev->intp_mutex); } =20 /** diff --git a/migration/migration.c b/migration/migration.c index c1d88ace7f..2f0bd6d8b4 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1652,11 +1652,10 @@ static void migrate_fd_cleanup_bh(void *opaque) =20 void migrate_set_error(MigrationState *s, const Error *error) { - qemu_mutex_lock(&s->error_mutex); + QEMU_LOCK_GUARD(&s->error_mutex); if (!s->error) { s->error =3D error_copy(error); } - qemu_mutex_unlock(&s->error_mutex); } =20 void migrate_fd_error(MigrationState *s, const Error *error) diff --git a/migration/multifd.c b/migration/multifd.c index cb6a4a3ab8..9123c111a3 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -894,11 +894,11 @@ void multifd_recv_sync_main(void) for (i =3D 0; i < migrate_multifd_channels(); i++) { MultiFDRecvParams *p =3D &multifd_recv_state->params[i]; =20 - qemu_mutex_lock(&p->mutex); - if (multifd_recv_state->packet_num < p->packet_num) { - multifd_recv_state->packet_num =3D p->packet_num; + WITH_QEMU_LOCK_GUARD(&p->mutex) { + if (multifd_recv_state->packet_num < p->packet_num) { + multifd_recv_state->packet_num =3D p->packet_num; + } } - qemu_mutex_unlock(&p->mutex); trace_multifd_recv_sync_main_signal(p->id); qemu_sem_post(&p->sem_sync); } diff --git a/migration/ram.c b/migration/ram.c index c12cfdbe26..87a670cfbf 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1368,7 +1368,7 @@ static RAMBlock *unqueue_page(RAMState *rs, ram_addr_= t *offset) return NULL; } =20 - qemu_mutex_lock(&rs->src_page_req_mutex); + QEMU_LOCK_GUARD(&rs->src_page_req_mutex); if (!QSIMPLEQ_EMPTY(&rs->src_page_requests)) { struct RAMSrcPageRequest *entry =3D QSIMPLEQ_FIRST(&rs->src_page_requests); @@ -1385,7 +1385,6 @@ static RAMBlock *unqueue_page(RAMState *rs, ram_addr_= t *offset) migration_consume_urgent_request(); } } - qemu_mutex_unlock(&rs->src_page_req_mutex); =20 return block; } diff --git a/monitor/misc.c b/monitor/misc.c index 6c45fa490f..9723b466cd 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -1473,7 +1473,7 @@ AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdse= t_id, int64_t fdset_id, MonFdsetFd *mon_fdset_fd; AddfdInfo *fdinfo; =20 - qemu_mutex_lock(&mon_fdsets_lock); + QEMU_LOCK_GUARD(&mon_fdsets_lock); if (has_fdset_id) { QLIST_FOREACH(mon_fdset, &mon_fdsets, next) { /* Break if match found or match impossible due to ordering by= ID */ @@ -1494,7 +1494,6 @@ AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdse= t_id, int64_t fdset_id, if (fdset_id < 0) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "fdset-id", "a non-negative value"); - qemu_mutex_unlock(&mon_fdsets_lock); return NULL; } /* Use specified fdset ID */ @@ -1545,7 +1544,6 @@ AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdse= t_id, int64_t fdset_id, fdinfo->fdset_id =3D mon_fdset->id; fdinfo->fd =3D mon_fdset_fd->fd; =20 - qemu_mutex_unlock(&mon_fdsets_lock); return fdinfo; } =20 diff --git a/ui/spice-display.c b/ui/spice-display.c index 6babe24909..19632fdf6c 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -18,6 +18,7 @@ #include "qemu/osdep.h" #include "ui/qemu-spice.h" #include "qemu/timer.h" +#include "qemu/lockable.h" #include "qemu/main-loop.h" #include "qemu/option.h" #include "qemu/queue.h" @@ -483,12 +484,12 @@ void qemu_spice_display_refresh(SimpleSpiceDisplay *s= sd) { graphic_hw_update(ssd->dcl.con); =20 - qemu_mutex_lock(&ssd->lock); - if (QTAILQ_EMPTY(&ssd->updates) && ssd->ds) { - qemu_spice_create_update(ssd); - ssd->notify++; + WITH_QEMU_LOCK_GUARD(&ssd->lock) { + if (QTAILQ_EMPTY(&ssd->updates) && ssd->ds) { + qemu_spice_create_update(ssd); + ssd->notify++; + } } - qemu_mutex_unlock(&ssd->lock); =20 trace_qemu_spice_display_refresh(ssd->qxl.id, ssd->notify); if (ssd->notify) { @@ -580,7 +581,7 @@ static int interface_get_cursor_command(QXLInstance *si= n, QXLCommandExt *ext) SimpleSpiceDisplay *ssd =3D container_of(sin, SimpleSpiceDisplay, qxl); int ret; =20 - qemu_mutex_lock(&ssd->lock); + QEMU_LOCK_GUARD(&ssd->lock); if (ssd->ptr_define) { *ext =3D ssd->ptr_define->ext; ssd->ptr_define =3D NULL; @@ -592,7 +593,6 @@ static int interface_get_cursor_command(QXLInstance *si= n, QXLCommandExt *ext) } else { ret =3D false; } - qemu_mutex_unlock(&ssd->lock); return ret; } =20 diff --git a/util/log.c b/util/log.c index 2da6cb31dc..bdb3d712e8 100644 --- a/util/log.c +++ b/util/log.c @@ -25,6 +25,7 @@ #include "qemu/cutils.h" #include "trace/control.h" #include "qemu/thread.h" +#include "qemu/lockable.h" =20 static char *logfilename; static QemuMutex qemu_logfile_mutex; @@ -94,7 +95,7 @@ void qemu_set_log(int log_flags) if (qemu_loglevel && (!is_daemonized() || logfilename)) { need_to_open_file =3D true; } - qemu_mutex_lock(&qemu_logfile_mutex); + QEMU_LOCK_GUARD(&qemu_logfile_mutex); if (qemu_logfile && !need_to_open_file) { logfile =3D qemu_logfile; atomic_rcu_set(&qemu_logfile, NULL); @@ -136,7 +137,6 @@ void qemu_set_log(int log_flags) } atomic_rcu_set(&qemu_logfile, logfile); } - qemu_mutex_unlock(&qemu_logfile_mutex); } =20 void qemu_log_needs_buffers(void) diff --git a/util/qemu-timer.c b/util/qemu-timer.c index d548d3c1ad..b6575a2cd5 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -459,17 +459,16 @@ void timer_mod_anticipate_ns(QEMUTimer *ts, int64_t e= xpire_time) QEMUTimerList *timer_list =3D ts->timer_list; bool rearm; =20 - qemu_mutex_lock(&timer_list->active_timers_lock); - if (ts->expire_time =3D=3D -1 || ts->expire_time > expire_time) { - if (ts->expire_time !=3D -1) { - timer_del_locked(timer_list, ts); + WITH_QEMU_LOCK_GUARD(&timer_list->active_timers_lock) { + if (ts->expire_time =3D=3D -1 || ts->expire_time > expire_time) { + if (ts->expire_time !=3D -1) { + timer_del_locked(timer_list, ts); + } + rearm =3D timer_mod_ns_locked(timer_list, ts, expire_time); + } else { + rearm =3D false; } - rearm =3D timer_mod_ns_locked(timer_list, ts, expire_time); - } else { - rearm =3D false; } - qemu_mutex_unlock(&timer_list->active_timers_lock); - if (rearm) { timerlist_rearm(timer_list); } diff --git a/util/rcu.c b/util/rcu.c index 177a675619..60a37f72c3 100644 --- a/util/rcu.c +++ b/util/rcu.c @@ -31,6 +31,7 @@ #include "qemu/atomic.h" #include "qemu/thread.h" #include "qemu/main-loop.h" +#include "qemu/lockable.h" #if defined(CONFIG_MALLOC_TRIM) #include #endif @@ -141,14 +142,14 @@ static void wait_for_readers(void) =20 void synchronize_rcu(void) { - qemu_mutex_lock(&rcu_sync_lock); + QEMU_LOCK_GUARD(&rcu_sync_lock); =20 /* Write RCU-protected pointers before reading p_rcu_reader->ctr. * Pairs with smp_mb_placeholder() in rcu_read_lock(). */ smp_mb_global(); =20 - qemu_mutex_lock(&rcu_registry_lock); + QEMU_LOCK_GUARD(&rcu_registry_lock); if (!QLIST_EMPTY(®istry)) { /* In either case, the atomic_mb_set below blocks stores that free * old RCU-protected pointers. @@ -169,9 +170,6 @@ void synchronize_rcu(void) =20 wait_for_readers(); } - - qemu_mutex_unlock(&rcu_registry_lock); - qemu_mutex_unlock(&rcu_sync_lock); } =20 =20 diff --git a/util/thread-pool.c b/util/thread-pool.c index 4ed9b89ab2..d763cea505 100644 --- a/util/thread-pool.c +++ b/util/thread-pool.c @@ -210,7 +210,7 @@ static void thread_pool_cancel(BlockAIOCB *acb) =20 trace_thread_pool_cancel(elem, elem->common.opaque); =20 - qemu_mutex_lock(&pool->lock); + QEMU_LOCK_GUARD(&pool->lock); if (elem->state =3D=3D THREAD_QUEUED && /* No thread has yet started working on elem. we can try to "steal" * the item from the worker if we can get a signal from the @@ -225,7 +225,6 @@ static void thread_pool_cancel(BlockAIOCB *acb) elem->ret =3D -ECANCELED; } =20 - qemu_mutex_unlock(&pool->lock); } =20 static AioContext *thread_pool_get_aio_context(BlockAIOCB *acb) diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c index ddd9a96e76..e399e330e2 100644 --- a/util/vfio-helpers.c +++ b/util/vfio-helpers.c @@ -21,6 +21,7 @@ #include "standard-headers/linux/pci_regs.h" #include "qemu/event_notifier.h" #include "qemu/vfio-helpers.h" +#include "qemu/lockable.h" #include "trace.h" =20 #define QEMU_VFIO_DEBUG 0 @@ -667,14 +668,12 @@ int qemu_vfio_dma_reset_temporary(QEMUVFIOState *s) .size =3D QEMU_VFIO_IOVA_MAX - s->high_water_mark, }; trace_qemu_vfio_dma_reset_temporary(s); - qemu_mutex_lock(&s->lock); + QEMU_LOCK_GUARD(&s->lock); if (ioctl(s->container, VFIO_IOMMU_UNMAP_DMA, &unmap)) { error_report("VFIO_UNMAP_DMA failed: %s", strerror(errno)); - qemu_mutex_unlock(&s->lock); return -errno; } s->high_water_mark =3D QEMU_VFIO_IOVA_MAX; - qemu_mutex_unlock(&s->lock); return 0; } =20 --=20 2.25.1