From nobody Tue Feb 10 02:49:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1649775552; cv=none; d=zohomail.com; s=zohoarc; b=HRyJv/eKSI6ynzoEIdZDP6nw+I3C9oy35N1+pfkVTPSl2CLuLlOSgC4n1bAPK/ZuVLCDWNjhkORk+DYmqiP2KmtaFXWMKDE3WiyZ72Aqdhaaq6RDCULOxnqnlT4jVSmeF2GUsU60cNd3YwvFwVFHS2SKZ37Uxqrbg3SSL8MYFR4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1649775552; h=Content-Type: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=3LGq/wbQYloVDnNXFimW3kQvED0+v9+vx0s4ndl9rZk=; b=Zkr5+CAknORAMq7QcueSEbDOhdK5qX1ECaaA2zzrPxbNU/3awZFloxOJ1+SxZ4rVn8yKZxJKKRbZjQ+mJP19Hvm/rjr1/41IHXsPHUEDmjryeG5XwliK3C6/gB6ibV3LrGGv+pYoXriMdGktkk50EmTj3/ourxDnW7odFrqAObo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1649775552351257.7064054471367; Tue, 12 Apr 2022 07:59:12 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-561-RZAaiiGWNIez7QCEJwCQHw-1; Tue, 12 Apr 2022 10:58:07 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7DEA4102FCA8; Tue, 12 Apr 2022 14:57:35 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 62666C44CFA; Tue, 12 Apr 2022 14:57:35 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B71FE193F6E0; Tue, 12 Apr 2022 14:57:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 37983193F6EA for ; Tue, 12 Apr 2022 14:57:33 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1BFE0406793; Tue, 12 Apr 2022 14:57:33 +0000 (UTC) Received: from work.redhat.com (unknown [10.39.194.239]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F74B43204E; Tue, 12 Apr 2022 14:57:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649775551; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=3LGq/wbQYloVDnNXFimW3kQvED0+v9+vx0s4ndl9rZk=; b=jGRG0nQMPHQ6mJ3omYSKT/Kvo9twLl9uou2MTcnlgkVaE0q6A1GR8t7ol4cWDKM1tkJWls X9xaE2YJjaUUfAq/H6V50gVTOQCAGngsvmc2szfsuhJfsSxEXr64PtP5PC/DbfU+dZ+3uA Gq11nBJ0lCP3RiT5870F4ehzhtKTSR0= X-MC-Unique: RZAaiiGWNIez7QCEJwCQHw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 05/10] virstorageobject: Use automatic mutex management Date: Tue, 12 Apr 2022 16:57:22 +0200 Message-Id: <20220412145727.69564-6-twiederh@redhat.com> In-Reply-To: <20220412145727.69564-1-twiederh@redhat.com> References: <20220412145727.69564-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tim Wiederhake Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1649775553535100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Tim Wiederhake --- src/conf/virstorageobj.c | 116 ++++++++++++++------------------------- 1 file changed, 42 insertions(+), 74 deletions(-) diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index c837f96ae6..fe868d25fa 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -455,11 +455,11 @@ virStoragePoolObjListSearchCb(const void *payload, virStoragePoolObj *obj =3D (virStoragePoolObj *) payload; struct _virStoragePoolObjListSearchData *data =3D (struct _virStoragePoolObjListSearchData *)opaque; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(obj); =20 - virObjectLock(obj); if (data->searcher(obj, data->opaque)) return 1; - virObjectUnlock(obj); + return 0; } =20 @@ -632,20 +632,19 @@ virStoragePoolObjAddVol(virStoragePoolObj *obj, return -1; } =20 - virObjectLock(volobj); + VIR_WITH_OBJECT_LOCK_GUARD(volobj) { + g_hash_table_insert(volumes->objsKey, g_strdup(voldef->key), volob= j); + virObjectRef(volobj); =20 - g_hash_table_insert(volumes->objsKey, g_strdup(voldef->key), volobj); - virObjectRef(volobj); + g_hash_table_insert(volumes->objsName, g_strdup(voldef->name), vol= obj); + virObjectRef(volobj); =20 - g_hash_table_insert(volumes->objsName, g_strdup(voldef->name), volobj); - virObjectRef(volobj); - - g_hash_table_insert(volumes->objsPath, g_strdup(voldef->target.path), = volobj); - virObjectRef(volobj); + g_hash_table_insert(volumes->objsPath, g_strdup(voldef->target.pat= h), volobj); + virObjectRef(volobj); =20 - volobj->voldef =3D voldef; + volobj->voldef =3D voldef; + } =20 - virObjectUnlock(volobj); virObjectUnref(volobj); virObjectRWUnlock(volumes); return 0; @@ -671,11 +670,11 @@ virStoragePoolObjRemoveVol(virStoragePoolObj *obj, voldef->name, obj->def->name); =20 virObjectRef(volobj); - virObjectLock(volobj); - g_hash_table_remove(volumes->objsKey, voldef->key); - g_hash_table_remove(volumes->objsName, voldef->name); - g_hash_table_remove(volumes->objsPath, voldef->target.path); - virObjectUnlock(volobj); + VIR_WITH_OBJECT_LOCK_GUARD(volobj) { + g_hash_table_remove(volumes->objsKey, voldef->key); + g_hash_table_remove(volumes->objsName, voldef->name); + g_hash_table_remove(volumes->objsPath, voldef->target.path); + } virObjectUnref(volobj); virObjectRWUnlock(volumes); } @@ -704,16 +703,14 @@ virStoragePoolObjForEachVolumeCb(void *payload, const char *name G_GNUC_UNUSED, void *opaque) { - int ret =3D 0; virStorageVolObj *volobj =3D payload; struct _virStoragePoolObjForEachVolData *data =3D opaque; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(volobj); =20 - virObjectLock(volobj); if (data->iter(volobj->voldef, data->opaque) < 0) - ret =3D -1; - virObjectUnlock(volobj); + return -1; =20 - return ret; + return 0; } =20 =20 @@ -746,14 +743,12 @@ virStoragePoolObjSearchVolumeCb(const void *payload, virStorageVolObj *volobj =3D (virStorageVolObj *) payload; struct _virStoragePoolObjSearchVolData *data =3D (struct _virStoragePoolObjSearchVolData *) opaque; - int found =3D 0; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(volobj); =20 - virObjectLock(volobj); if (data->iter(volobj->voldef, data->opaque)) - found =3D 1; - virObjectUnlock(volobj); + return 1; =20 - return found; + return 0; } =20 =20 @@ -842,17 +837,12 @@ virStoragePoolObjNumOfVolumesCb(void *payload, { virStorageVolObj *volobj =3D payload; struct _virStorageVolObjCountData *data =3D opaque; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(volobj); =20 - virObjectLock(volobj); - - if (data->filter && - !data->filter(data->conn, data->pooldef, volobj->voldef)) - goto cleanup; + if (data->filter && !data->filter(data->conn, data->pooldef, volobj->v= oldef)) + return 0; =20 data->count++; - - cleanup: - virObjectUnlock(volobj); return 0; } =20 @@ -891,6 +881,7 @@ virStoragePoolObjVolumeGetNamesCb(void *payload, { virStorageVolObj *volobj =3D payload; struct _virStorageVolObjNameData *data =3D opaque; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(volobj); =20 if (data->error) return 0; @@ -898,19 +889,13 @@ virStoragePoolObjVolumeGetNamesCb(void *payload, if (data->maxnames >=3D 0 && data->nnames =3D=3D data->maxnames) return 0; =20 - virObjectLock(volobj); - - if (data->filter && - !data->filter(data->conn, data->pooldef, volobj->voldef)) - goto cleanup; + if (data->filter && !data->filter(data->conn, data->pooldef, volobj->v= oldef)) + return 0; =20 if (data->names) data->names[data->nnames] =3D g_strdup(volobj->voldef->name); =20 data->nnames++; - - cleanup: - virObjectUnlock(volobj); return 0; } =20 @@ -961,30 +946,25 @@ virStoragePoolObjVolumeListExportCallback(void *paylo= ad, virStorageVolObj *volobj =3D payload; virStoragePoolObjVolumeListExportData *data =3D opaque; virStorageVolPtr vol =3D NULL; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(volobj); =20 if (data->error) return 0; =20 - virObjectLock(volobj); - - if (data->filter && - !data->filter(data->conn, data->pooldef, volobj->voldef)) - goto cleanup; + if (data->filter && !data->filter(data->conn, data->pooldef, volobj->v= oldef)) + return 0; =20 if (data->vols) { if (!(vol =3D virGetStorageVol(data->conn, data->pooldef->name, volobj->voldef->name, volobj->voldef-= >key, NULL, NULL))) { data->error =3D true; - goto cleanup; + return 0; } data->vols[data->nvols] =3D vol; } =20 data->nvols++; - - cleanup: - virObjectUnlock(volobj); return 0; } =20 @@ -1799,19 +1779,15 @@ virStoragePoolObjNumOfStoragePoolsCb(void *payload, { virStoragePoolObj *obj =3D payload; struct _virStoragePoolCountData *data =3D opaque; - - virObjectLock(obj); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(obj); =20 if (data->filter && !data->filter(data->conn, obj->def)) - goto cleanup; + return 0; =20 if (data->wantActive !=3D virStoragePoolObjIsActive(obj)) - goto cleanup; + return 0; =20 data->count++; - - cleanup: - virObjectUnlock(obj); return 0; } =20 @@ -1851,6 +1827,7 @@ virStoragePoolObjGetNamesCb(void *payload, { virStoragePoolObj *obj =3D payload; struct _virStoragePoolNameData *data =3D opaque; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(obj); =20 if (data->error) return 0; @@ -1858,21 +1835,16 @@ virStoragePoolObjGetNamesCb(void *payload, if (data->maxnames >=3D 0 && data->nnames =3D=3D data->maxnames) return 0; =20 - virObjectLock(obj); - if (data->filter && !data->filter(data->conn, obj->def)) - goto cleanup; + return 0; =20 if (data->wantActive !=3D virStoragePoolObjIsActive(obj)) - goto cleanup; + return 0; =20 if (data->names) data->names[data->nnames] =3D g_strdup(obj->def->name); =20 data->nnames++; - - cleanup: - virObjectUnlock(obj); return 0; } =20 @@ -1994,31 +1966,27 @@ virStoragePoolObjListExportCallback(void *payload, virStoragePoolObj *obj =3D payload; virStoragePoolObjListExportData *data =3D opaque; virStoragePoolPtr pool =3D NULL; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(obj); =20 if (data->error) return 0; =20 - virObjectLock(obj); - if (data->filter && !data->filter(data->conn, obj->def)) - goto cleanup; + return 0; =20 if (!virStoragePoolObjMatch(obj, data->flags)) - goto cleanup; + return 0; =20 if (data->pools) { if (!(pool =3D virGetStoragePool(data->conn, obj->def->name, obj->def->uuid, NULL, NULL))) { data->error =3D true; - goto cleanup; + return 0; } data->pools[data->nPools] =3D pool; } =20 data->nPools++; - - cleanup: - virObjectUnlock(obj); return 0; } =20 --=20 2.31.1