From nobody Tue Feb 10 16:22:45 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=1648220583; cv=none; d=zohomail.com; s=zohoarc; b=PJjb8NPaLmNLQBgdt/VEDD6IGrZrYlodmyv4VQrH11IFe/XQZ/xVRdu5lEwCtV5Sx27bKZmHOUgAjg+zF3np0s+y5IA5IoGWd1DiSNBtMLdLGchd7fH2vkdKhLd6SfnOni2VzQocnGUpe7jUUUfOv1VD1xqxLbE1bkkPousXI5I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648220583; 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=lNGLh6tdw6AkoyDgyTSr4wg/opfHsJevgD2RgqpFJys=; b=Pyciu1Dk8x7Be4STtrmOk9rB2U9ERLxdH3NQlPGuHjRTYCdprXDDEr7nqGZigUUu7BeyfFPmy3Nr0g+Edasq+08x4cMHsQye0RaHRocXaMQTmTsmqO4CPD4iGSbVSe0JB/tDAEebKgmPnxXPw1bLNPxsT1HDympSGN4ELrBHZCg= 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 16482205835771003.4085099223599; Fri, 25 Mar 2022 08:03:03 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-625-e1y3eT4JN-SJkzLvIQaqkg-1; Fri, 25 Mar 2022 11:02:43 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A91163C11C88; Fri, 25 Mar 2022 15:02:27 +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 93AAD4087D60; Fri, 25 Mar 2022 15:02:27 +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 6D811194034E; Fri, 25 Mar 2022 15:02:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EE63E1940341 for ; Fri, 25 Mar 2022 15:02:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E1BC2C26EA0; Fri, 25 Mar 2022 15:02:26 +0000 (UTC) Received: from work.fritz.box (unknown [10.39.194.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B6F1C27D8A; Fri, 25 Mar 2022 15:02:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648220582; 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=lNGLh6tdw6AkoyDgyTSr4wg/opfHsJevgD2RgqpFJys=; b=Qr5qiatAWcvP5jFkMHvWQ1FaBOq/rHLmjVRDbyMEhNRfgqGqtg4jPIBHxkEJ/6+HFbWZ1H dgnqNePP1EZSZwm4iio+eer2HjRPwCR7XgDDSAm7C08qMTtacercgFFK0GQ6mM5G6Vr1VB 4mJnrXwZQQo+I06D7NCmHq2Jo577Wio= X-MC-Unique: e1y3eT4JN-SJkzLvIQaqkg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 04/10] interface_backend_netcf: Use automatic mutex management Date: Fri, 25 Mar 2022 16:02:16 +0100 Message-Id: <20220325150222.78919-5-twiederh@redhat.com> In-Reply-To: <20220325150222.78919-1-twiederh@redhat.com> References: <20220325150222.78919-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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.84 on 10.11.54.1 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: 1648220585060100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Tim Wiederhake --- src/interface/interface_backend_netcf.c | 192 +++++++++++------------- 1 file changed, 86 insertions(+), 106 deletions(-) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interf= ace_backend_netcf.c index 92698ee769..d625964421 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -155,31 +155,26 @@ netcfStateCleanup(void) static int netcfStateReload(void) { - int ret =3D -1; - if (!driver) return 0; =20 - virObjectLock(driver); - ncf_close(driver->netcf); - if (ncf_init(&driver->netcf, NULL) !=3D 0) { - /* this isn't a good situation, because we can't shut down the - * driver as there may still be connections to it. If we set - * the netcf handle to NULL, any subsequent calls to netcf - * will just fail rather than causing a crash. Not ideal, but - * livable (since this should never happen). - */ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to re-init netcf")); - driver->netcf =3D NULL; - goto cleanup; + VIR_WITH_OBJECT_LOCK_GUARD(driver) { + ncf_close(driver->netcf); + if (ncf_init(&driver->netcf, NULL) !=3D 0) { + /* this isn't a good situation, because we can't shut down the + * driver as there may still be connections to it. If we set + * the netcf handle to NULL, any subsequent calls to netcf + * will just fail rather than causing a crash. Not ideal, but + * livable (since this should never happen). + */ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to re-init netcf")); + driver->netcf =3D NULL; + return -1; + } } =20 - ret =3D 0; - cleanup: - virObjectUnlock(driver); - - return ret; + return 0; } =20 =20 @@ -528,66 +523,68 @@ static int netcfConnectListInterfacesImpl(virConnectP= tr conn, =20 static int netcfConnectNumOfInterfaces(virConnectPtr conn) { - int count; + int count =3D -1; =20 if (virConnectNumOfInterfacesEnsureACL(conn) < 0) return -1; =20 - virObjectLock(driver); - count =3D netcfConnectNumOfInterfacesImpl(conn, - NETCF_IFACE_ACTIVE, - virConnectNumOfInterfacesCheck= ACL); - virObjectUnlock(driver); + VIR_WITH_OBJECT_LOCK_GUARD(driver) { + count =3D netcfConnectNumOfInterfacesImpl(conn, + NETCF_IFACE_ACTIVE, + virConnectNumOfInterfacesC= heckACL); + } + return count; } =20 static int netcfConnectListInterfaces(virConnectPtr conn, char **const nam= es, int nnames) { - int count; + int count =3D -1; =20 if (virConnectListInterfacesEnsureACL(conn) < 0) return -1; =20 - virObjectLock(driver); - count =3D netcfConnectListInterfacesImpl(conn, - NETCF_IFACE_ACTIVE, - names, nnames, - virConnectListInterfacesCheckAC= L); - virObjectUnlock(driver); - return count; + VIR_WITH_OBJECT_LOCK_GUARD(driver) { + count =3D netcfConnectListInterfacesImpl(conn, + NETCF_IFACE_ACTIVE, + names, nnames, + virConnectListInterfacesChe= ckACL); + } =20 + return count; } =20 static int netcfConnectNumOfDefinedInterfaces(virConnectPtr conn) { - int count; + int count =3D -1; =20 if (virConnectNumOfDefinedInterfacesEnsureACL(conn) < 0) return -1; =20 - virObjectLock(driver); - count =3D netcfConnectNumOfInterfacesImpl(conn, - NETCF_IFACE_INACTIVE, - virConnectNumOfDefinedInterfac= esCheckACL); - virObjectUnlock(driver); + VIR_WITH_OBJECT_LOCK_GUARD(driver) { + count =3D netcfConnectNumOfInterfacesImpl(conn, + NETCF_IFACE_INACTIVE, + virConnectNumOfDefinedInte= rfacesCheckACL); + } + return count; } =20 static int netcfConnectListDefinedInterfaces(virConnectPtr conn, char **co= nst names, int nnames) { - int count; + int count =3D -1; =20 if (virConnectListDefinedInterfacesEnsureACL(conn) < 0) return -1; =20 - virObjectLock(driver); - count =3D netcfConnectListInterfacesImpl(conn, - NETCF_IFACE_INACTIVE, - names, nnames, - virConnectListDefinedInterfaces= CheckACL); - virObjectUnlock(driver); - return count; + VIR_WITH_OBJECT_LOCK_GUARD(driver) { + count =3D netcfConnectListInterfacesImpl(conn, + NETCF_IFACE_INACTIVE, + names, nnames, + virConnectListDefinedInterf= acesCheckACL); + } =20 + return count; } =20 #define MATCH(FLAG) (flags & (FLAG)) @@ -731,8 +728,8 @@ static virInterfacePtr netcfInterfaceLookupByName(virCo= nnectPtr conn, struct netcf_if *iface; virInterfacePtr ret =3D NULL; g_autoptr(virInterfaceDef) def =3D NULL; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(driver); =20 - virObjectLock(driver); iface =3D ncf_lookup_by_name(driver->netcf, name); if (!iface) { const char *errmsg, *details; @@ -759,7 +756,6 @@ static virInterfacePtr netcfInterfaceLookupByName(virCo= nnectPtr conn, =20 cleanup: ncf_if_free(iface); - virObjectUnlock(driver); return ret; } =20 @@ -770,8 +766,8 @@ static virInterfacePtr netcfInterfaceLookupByMACString(= virConnectPtr conn, int niface; virInterfacePtr ret =3D NULL; g_autoptr(virInterfaceDef) def =3D NULL; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(driver); =20 - virObjectLock(driver); niface =3D ncf_lookup_by_mac_string(driver->netcf, macstr, 1, &iface); =20 if (niface < 0) { @@ -806,7 +802,6 @@ static virInterfacePtr netcfInterfaceLookupByMACString(= virConnectPtr conn, =20 cleanup: ncf_if_free(iface); - virObjectUnlock(driver); return ret; } =20 @@ -818,11 +813,10 @@ static char *netcfInterfaceGetXMLDesc(virInterfacePtr= ifinfo, g_autoptr(virInterfaceDef) ifacedef =3D NULL; char *ret =3D NULL; bool active; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(driver); =20 virCheckFlags(VIR_INTERFACE_XML_INACTIVE, NULL); =20 - virObjectLock(driver); - iface =3D interfaceDriverGetNetcfIF(driver->netcf, ifinfo); if (!iface) { /* helper already reported error */ @@ -865,7 +859,6 @@ static char *netcfInterfaceGetXMLDesc(virInterfacePtr i= finfo, cleanup: ncf_if_free(iface); VIR_FREE(xmlstr); - virObjectUnlock(driver); return ret; } =20 @@ -877,11 +870,10 @@ static virInterfacePtr netcfInterfaceDefineXML(virCon= nectPtr conn, char *xmlstr =3D NULL; g_autoptr(virInterfaceDef) ifacedef =3D NULL; virInterfacePtr ret =3D NULL; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(driver); =20 virCheckFlags(VIR_INTERFACE_DEFINE_VALIDATE, NULL); =20 - virObjectLock(driver); - ifacedef =3D virInterfaceDefParseString(xml, flags); if (!ifacedef) { /* error was already reported */ @@ -913,7 +905,6 @@ static virInterfacePtr netcfInterfaceDefineXML(virConne= ctPtr conn, cleanup: ncf_if_free(iface); VIR_FREE(xmlstr); - virObjectUnlock(driver); return ret; } =20 @@ -922,8 +913,7 @@ static int netcfInterfaceUndefine(virInterfacePtr ifinf= o) struct netcf_if *iface =3D NULL; g_autoptr(virInterfaceDef) def =3D NULL; int ret =3D -1; - - virObjectLock(driver); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(driver); =20 iface =3D interfaceDriverGetNetcfIF(driver->netcf, ifinfo); if (!iface) { @@ -951,7 +941,6 @@ static int netcfInterfaceUndefine(virInterfacePtr ifinf= o) =20 cleanup: ncf_if_free(iface); - virObjectUnlock(driver); return ret; } =20 @@ -962,11 +951,10 @@ static int netcfInterfaceCreate(virInterfacePtr ifinf= o, g_autoptr(virInterfaceDef) def =3D NULL; int ret =3D -1; bool active; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(driver); =20 virCheckFlags(0, -1); =20 - virObjectLock(driver); - iface =3D interfaceDriverGetNetcfIF(driver->netcf, ifinfo); if (!iface) { /* helper already reported error */ @@ -1002,7 +990,6 @@ static int netcfInterfaceCreate(virInterfacePtr ifinfo, =20 cleanup: ncf_if_free(iface); - virObjectUnlock(driver); return ret; } =20 @@ -1013,11 +1000,10 @@ static int netcfInterfaceDestroy(virInterfacePtr if= info, g_autoptr(virInterfaceDef) def =3D NULL; int ret =3D -1; bool active; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(driver); =20 virCheckFlags(0, -1); =20 - virObjectLock(driver); - iface =3D interfaceDriverGetNetcfIF(driver->netcf, ifinfo); if (!iface) { /* helper already reported error */ @@ -1053,7 +1039,6 @@ static int netcfInterfaceDestroy(virInterfacePtr ifin= fo, =20 cleanup: ncf_if_free(iface); - virObjectUnlock(driver); return ret; } =20 @@ -1063,8 +1048,7 @@ static int netcfInterfaceIsActive(virInterfacePtr ifi= nfo) g_autoptr(virInterfaceDef) def =3D NULL; int ret =3D -1; bool active; - - virObjectLock(driver); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(driver); =20 iface =3D interfaceDriverGetNetcfIF(driver->netcf, ifinfo); if (!iface) { @@ -1085,82 +1069,78 @@ static int netcfInterfaceIsActive(virInterfacePtr i= finfo) =20 cleanup: ncf_if_free(iface); - virObjectUnlock(driver); return ret; } =20 static int netcfInterfaceChangeBegin(virConnectPtr conn, unsigned int flag= s) { - int ret; + int ret =3D -1; =20 virCheckFlags(0, -1); /* currently flags must be 0 */ =20 if (virInterfaceChangeBeginEnsureACL(conn) < 0) return -1; =20 - virObjectLock(driver); - - ret =3D ncf_change_begin(driver->netcf, 0); - if (ret < 0) { - const char *errmsg, *details; - int errcode =3D ncf_error(driver->netcf, &errmsg, &details); - virReportError(netcf_to_vir_err(errcode), - _("failed to begin transaction: %s%s%s"), - errmsg, details ? " - " : "", - NULLSTR_EMPTY(details)); + VIR_WITH_OBJECT_LOCK_GUARD(driver) { + ret =3D ncf_change_begin(driver->netcf, 0); + if (ret < 0) { + const char *errmsg, *details; + int errcode =3D ncf_error(driver->netcf, &errmsg, &details); + virReportError(netcf_to_vir_err(errcode), + _("failed to begin transaction: %s%s%s"), + errmsg, details ? " - " : "", + NULLSTR_EMPTY(details)); + } } =20 - virObjectUnlock(driver); return ret; } =20 static int netcfInterfaceChangeCommit(virConnectPtr conn, unsigned int fla= gs) { - int ret; + int ret =3D -1; =20 virCheckFlags(0, -1); /* currently flags must be 0 */ =20 if (virInterfaceChangeCommitEnsureACL(conn) < 0) return -1; =20 - virObjectLock(driver); - - ret =3D ncf_change_commit(driver->netcf, 0); - if (ret < 0) { - const char *errmsg, *details; - int errcode =3D ncf_error(driver->netcf, &errmsg, &details); - virReportError(netcf_to_vir_err(errcode), - _("failed to commit transaction: %s%s%s"), - errmsg, details ? " - " : "", - NULLSTR_EMPTY(details)); + VIR_WITH_OBJECT_LOCK_GUARD(driver) { + ret =3D ncf_change_commit(driver->netcf, 0); + if (ret < 0) { + const char *errmsg, *details; + int errcode =3D ncf_error(driver->netcf, &errmsg, &details); + virReportError(netcf_to_vir_err(errcode), + _("failed to commit transaction: %s%s%s"), + errmsg, details ? " - " : "", + NULLSTR_EMPTY(details)); + } } =20 - virObjectUnlock(driver); return ret; } =20 static int netcfInterfaceChangeRollback(virConnectPtr conn, unsigned int f= lags) { - int ret; + int ret =3D -1; =20 virCheckFlags(0, -1); /* currently flags must be 0 */ =20 if (virInterfaceChangeRollbackEnsureACL(conn) < 0) return -1; =20 - virObjectLock(driver); - - ret =3D ncf_change_rollback(driver->netcf, 0); - if (ret < 0) { - const char *errmsg, *details; - int errcode =3D ncf_error(driver->netcf, &errmsg, &details); - virReportError(netcf_to_vir_err(errcode), - _("failed to rollback transaction: %s%s%s"), - errmsg, details ? " - " : "", - NULLSTR_EMPTY(details)); + VIR_WITH_OBJECT_LOCK_GUARD(driver) { + ret =3D ncf_change_rollback(driver->netcf, 0); + if (ret < 0) { + const char *errmsg, *details; + int errcode =3D ncf_error(driver->netcf, &errmsg, &details); + virReportError(netcf_to_vir_err(errcode), + _("failed to rollback transaction: %s%s%s"), + errmsg, details ? " - " : "", + NULLSTR_EMPTY(details)); + } } =20 - virObjectUnlock(driver); return ret; } =20 --=20 2.31.1