From nobody Mon Feb 9 10:47:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1586526990; cv=none; d=zohomail.com; s=zohoarc; b=n/JZTrPDs+WPVpgPQv6VY9KL9XbgoZOnXuKpyCDnlkt+sAF9M2MNUwSlWeOT1EEDjIhytA7U+N+Sve2YMWrHyPNCnzQAIr9XLkeHWQtB+p9EPpkSCOGQq0FqXYUPyz8QzK6AHXZIj8HbZIH4tPMNM6WuPlTNBfOu2LGhT7Eqh8c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586526990; 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=zDff4L9bgEiLO9IDFQFSFB/PemVTxYeOr5/jaXn2wGE=; b=HkZc3NjDUbgdczzbuhRXk84ob9Ec5uG/QKTv5j1o0EX1hsAhpWLY4udgLKt8l1czlEee7/4SXHZuFRtHnw/vfc3KvYZMLF8Ch6cKxlWzHlQZH3qztAdrOvxOknwzbRgDRD24NPpAjXtwdW+ZgofYcoU1vksZDRo1VCWpwARpgqQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1586526990102279.000057085103; Fri, 10 Apr 2020 06:56:30 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-103-sfBAH4-PNdCOD5TMuCavGw-1; Fri, 10 Apr 2020 09:56:24 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 761951137844; Fri, 10 Apr 2020 13:56:17 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4B6E29B92E; Fri, 10 Apr 2020 13:56:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id F01661803C43; Fri, 10 Apr 2020 13:56:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03ADtq7L023052 for ; Fri, 10 Apr 2020 09:55:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2891A127512; Fri, 10 Apr 2020 13:55:52 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2448E12750F for ; Fri, 10 Apr 2020 13:55:52 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 06A84800297 for ; Fri, 10 Apr 2020 13:55:52 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-4-SVOfSzvlOX2RDPSLXYWopQ-1; Fri, 10 Apr 2020 09:55:46 -0400 Received: by mail-wr1-f67.google.com with SMTP id h9so2370670wrc.8 for ; Fri, 10 Apr 2020 06:55:46 -0700 (PDT) Received: from localhost.localdomain (public-gprs377075.centertel.pl. [37.47.104.52]) by smtp.gmail.com with ESMTPSA id c11sm3066319wrt.24.2020.04.10.06.55.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Apr 2020 06:55:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586526988; 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=zDff4L9bgEiLO9IDFQFSFB/PemVTxYeOr5/jaXn2wGE=; b=HSZHLw6ksj1WZiTLwWlGesFgXC8PLgHYOaOzlbu13iXi3UonHuQcHPUY4KBCbueL/TPNWd yaMk2RYHSWXAXupukmvPydQf8yJc/WeOA2M88Mlfn6dL9Tb4HnY0IeWEtx1KZp6+5KOyoI e/UBYYhfyI7wy6voz6+G5faTUlrpNRI= X-MC-Unique: sfBAH4-PNdCOD5TMuCavGw-1 X-MC-Unique: SVOfSzvlOX2RDPSLXYWopQ-1 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=KRnuvEIxRrl6p8jETHhmFKmM8GPD6clatYZAA+nQBPA=; b=WS9d5RjnmqmqLS7NRocW4VP+DyjHn+PQqu1MuRHN40AggAnvHL3QDsGyvjEaggqJWt C8RTKuKpMeUlQlIuqHLTgdYkTB4EbbOolcF5Vxz4NqmEk2eU0grY6aonXHxiCMsNc6J9 FdlSBP94NtQZXDYmicqlbcjguTZg4yyYtis2vqfQKGeseORGqjNygYQYhChuITr+gyVx r+19g3yiwPB3c1jGhBp0lQPWDaAHGh8D7m4zo0pXhLaV1d6SFkk0SIUBrdCNh/Q+W33q xZbCPHn4pdm9M7oJbvHAb7qqCGbUwbCpvRxCwM4ZQ8mVcMxFwWFqtFhLy+cpHaZfssvc 1LJg== X-Gm-Message-State: AGi0PuaE+d9aqAYKTlVEMUDri+W+sIDATXauzF4xq34KfxTVjmu9ptR8 I1gl0gHiTjW5XvooyXJc6HtD5W8QBPQ= X-Google-Smtp-Source: APiQypLI05RkHW9TlqJ+ZSbIbqOzAEWxyyuu9/5J1PQDIsgLJDCoxkjqzx/KEbI7ZCNfW55m7JMWWw== X-Received: by 2002:adf:ecc2:: with SMTP id s2mr5066493wro.73.1586526944995; Fri, 10 Apr 2020 06:55:44 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH 13/43] conf: nwfilter_conf: convert virRWLock to GRWLock Date: Fri, 10 Apr 2020 15:54:40 +0200 Message-Id: <20200410135510.2148319-14-r4f4rfs@gmail.com> In-Reply-To: <20200410135510.2148319-1-r4f4rfs@gmail.com> References: <20200410135510.2148319-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 03ADtq7L023052 X-loop: libvir-list@redhat.com Cc: Rafael Fonseca X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Rafael Fonseca --- src/conf/nwfilter_conf.c | 21 +++++++++++---------- src/conf/nwfilter_conf.h | 5 ++++- src/libvirt_private.syms | 3 ++- src/lxc/lxc_driver.c | 4 ++-- src/nwfilter/nwfilter_driver.c | 6 +++--- src/nwfilter/nwfilter_gentech_driver.c | 2 +- src/qemu/qemu_driver.c | 12 ++++++------ src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_process.c | 4 ++-- 9 files changed, 32 insertions(+), 27 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 680f4184c3..405cedd002 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -154,27 +154,33 @@ static const struct int_map chain_priorities[] =3D { /* * only one filter update allowed */ -static virRWLock updateLock; +static GRWLock updateLock; static bool initialized; =20 void virNWFilterReadLockFilterUpdates(void) { - virRWLockRead(&updateLock); + g_rw_lock_reader_lock(&updateLock); } =20 =20 void virNWFilterWriteLockFilterUpdates(void) { - virRWLockWrite(&updateLock); + g_rw_lock_writer_lock(&updateLock); } =20 =20 void -virNWFilterUnlockFilterUpdates(void) +virNWFilterReadUnlockFilterUpdates(void) { - virRWLockUnlock(&updateLock); + g_rw_lock_reader_unlock(&updateLock); +} + +void +virNWFilterWriteUnlockFilterUpdates(void) +{ + g_rw_lock_writer_unlock(&updateLock); } =20 =20 @@ -3090,9 +3096,6 @@ virNWFilterConfLayerInit(virNWFilterTriggerRebuildCal= lback cb, =20 initialized =3D true; =20 - if (virRWLockInit(&updateLock) < 0) - return -1; - return 0; } =20 @@ -3103,8 +3106,6 @@ virNWFilterConfLayerShutdown(void) if (!initialized) return; =20 - virRWLockDestroy(&updateLock); - initialized =3D false; rebuildCallback =3D NULL; rebuildOpaque =3D NULL; diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 13db58e380..875c3a1e0d 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -582,7 +582,10 @@ void virNWFilterReadLockFilterUpdates(void); =20 void -virNWFilterUnlockFilterUpdates(void); +virNWFilterWriteUnlockFilterUpdates(void); + +void +virNWFilterReadUnlockFilterUpdates(void); =20 typedef int (*virNWFilterTriggerRebuildCallback)(void *opaque); =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ec367653d5..c95c1a078c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -874,6 +874,7 @@ virNWFilterJumpTargetTypeToString; virNWFilterPrintStateMatchFlags; virNWFilterPrintTCPFlags; virNWFilterReadLockFilterUpdates; +virNWFilterReadUnlockFilterUpdates; virNWFilterRuleActionTypeToString; virNWFilterRuleDirectionTypeToString; virNWFilterRuleIsProtocolEthernet; @@ -882,8 +883,8 @@ virNWFilterRuleIsProtocolIPv6; virNWFilterRuleProtocolTypeToString; virNWFilterSaveConfig; virNWFilterTriggerRebuild; -virNWFilterUnlockFilterUpdates; virNWFilterWriteLockFilterUpdates; +virNWFilterWriteUnlockFilterUpdates; =20 =20 # conf/nwfilter_ipaddrmap.h diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 851894c459..7b232b4bac 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1030,7 +1030,7 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); - virNWFilterUnlockFilterUpdates(); + virNWFilterReadUnlockFilterUpdates(); return ret; } =20 @@ -1158,7 +1158,7 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(caps); virObjectUnref(cfg); - virNWFilterUnlockFilterUpdates(); + virNWFilterReadUnlockFilterUpdates(); return dom; } =20 diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 1c407727db..650ef19746 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -333,7 +333,7 @@ nwfilterStateReload(void) =20 virNWFilterObjListLoadAllConfigs(driver->nwfilters, driver->configDir); =20 - virNWFilterUnlockFilterUpdates(); + virNWFilterWriteUnlockFilterUpdates(); =20 virNWFilterBuildAll(driver, false); =20 @@ -602,7 +602,7 @@ nwfilterDefineXML(virConnectPtr conn, if (obj) virNWFilterObjUnlock(obj); =20 - virNWFilterUnlockFilterUpdates(); + virNWFilterWriteUnlockFilterUpdates(); nwfilterDriverUnlock(); return nwfilter; } @@ -643,7 +643,7 @@ nwfilterUndefine(virNWFilterPtr nwfilter) if (obj) virNWFilterObjUnlock(obj); =20 - virNWFilterUnlockFilterUpdates(); + virNWFilterWriteUnlockFilterUpdates(); nwfilterDriverUnlock(); return ret; } diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter= _gentech_driver.c index 6789a4a3fa..4b369e5b1a 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -807,7 +807,7 @@ virNWFilterInstantiateFilterLate(virNWFilterDriverState= Ptr driver, } } =20 - virNWFilterUnlockFilterUpdates(); + virNWFilterReadUnlockFilterUpdates(); virMutexUnlock(&updateMutex); =20 return rc; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 31f199fdef..d6ed6d3b3f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1796,7 +1796,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event2); - virNWFilterUnlockFilterUpdates(); + virNWFilterReadUnlockFilterUpdates(); return dom; } =20 @@ -7053,7 +7053,7 @@ qemuDomainRestoreFlags(virConnectPtr conn, if (vm && ret < 0) qemuDomainRemoveInactiveJob(driver, vm); virDomainObjEndAPI(&vm); - virNWFilterUnlockFilterUpdates(); + virNWFilterReadUnlockFilterUpdates(); return ret; } =20 @@ -7590,7 +7590,7 @@ qemuDomainCreateWithFlags(virDomainPtr dom, unsigned = int flags) =20 cleanup: virDomainObjEndAPI(&vm); - virNWFilterUnlockFilterUpdates(); + virNWFilterReadUnlockFilterUpdates(); return ret; } =20 @@ -8802,7 +8802,7 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, =20 cleanup: virDomainObjEndAPI(&vm); - virNWFilterUnlockFilterUpdates(); + virNWFilterReadUnlockFilterUpdates(); return ret; } =20 @@ -8920,7 +8920,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, virDomainDeviceDefFree(dev_copy); virDomainDeviceDefFree(dev); virDomainObjEndAPI(&vm); - virNWFilterUnlockFilterUpdates(); + virNWFilterReadUnlockFilterUpdates(); return ret; } =20 @@ -16695,7 +16695,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr sna= pshot, virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event2); virDomainObjEndAPI(&vm); - virNWFilterUnlockFilterUpdates(); + virNWFilterReadUnlockFilterUpdates(); virCPUDefFree(origCPU); virDomainDefFree(config); virDomainDefFree(inactiveConfig); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index bc280e856a..5057aa2528 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2716,7 +2716,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); qemuMigrationCookieFree(mig); - virNWFilterUnlockFilterUpdates(); + virNWFilterReadUnlockFilterUpdates(); virErrorRestore(&origErr); return ret; =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8ea470f75f..803994afe8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8196,7 +8196,7 @@ qemuProcessReconnect(void *opaque) qemuDomainRemoveInactiveJob(driver, obj); } virDomainObjEndAPI(&obj); - virNWFilterUnlockFilterUpdates(); + virNWFilterReadUnlockFilterUpdates(); virIdentitySetCurrent(NULL); return; =20 @@ -8272,7 +8272,7 @@ qemuProcessReconnectHelper(virDomainObjPtr obj, qemuDomainRemoveInactiveJobLocked(src->driver, obj); =20 virDomainObjEndAPI(&obj); - virNWFilterUnlockFilterUpdates(); + virNWFilterReadUnlockFilterUpdates(); g_clear_object(&data->identity); VIR_FREE(data); return -1; --=20 2.25.2