From nobody Tue May 14 20:33:30 2024 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=1648220554; cv=none; d=zohomail.com; s=zohoarc; b=dylhGD9uXCjPxMpoVNEmuJqul/Q6MWVhvWVnVW5VYs7p3v4SFb+0N1nGxF7sJXFmtPa7VTyS3oZvKA/8R8rrp5uMZlH/exM6e/XzgdVpVuVJgOsO3PH2L9M+vFvIac37ZyQU9RjlDgpuSeaBqls9R63/Px29G1N8vLc2k+XP7Js= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648220554; 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=mmVXG+dLPngW4VVy8ECo241eje3wUkTLQQ2DZPMWfuw=; b=S0tZMb5t092yRwnBoGmLStdnU02n+0ibmnG4AUr8KwjbG0Pyb+ZQnedUzJfW3lTLh68ILRi2iPc4jTgTJdRSYJmuzhTX4yY7AAp3+kW7t28CelsUW+wNPlsVes2kVG2ZSZTZFea4gm4YpZxbcCbWbMULZ5CyBu4oNchbSYHBcCw= 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 1648220554439609.5161319578169; Fri, 25 Mar 2022 08:02:34 -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-329-zTCeYMfrNjmyq1sclKFf_g-1; Fri, 25 Mar 2022 11:02:31 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 387558038E3; Fri, 25 Mar 2022 15:02:26 +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 2213C145455C; Fri, 25 Mar 2022 15:02:26 +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 C6E00194034E; Fri, 25 Mar 2022 15:02:25 +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 A95781940341 for ; Fri, 25 Mar 2022 15:02:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9B208C27D91; Fri, 25 Mar 2022 15:02:24 +0000 (UTC) Received: from work.fritz.box (unknown [10.39.194.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 29F06C27D8A; Fri, 25 Mar 2022 15:02:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648220553; 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=mmVXG+dLPngW4VVy8ECo241eje3wUkTLQQ2DZPMWfuw=; b=Mctqc0FJup7uytI4kS+/2og0w1nLvMdolWlvWnp1fBnd8i6kgVNqXeEY4Oa5/l2qY/p1iR fEdMOiFeei1lWyt/DRiJtUc6fNeDYXsFissi4P6OyuJcDmn8RZMTZLXvbrDkcp6Ul5VEC/ xiWzUzGV+3My/NZJlZJAvaORF6GSC7s= X-MC-Unique: zTCeYMfrNjmyq1sclKFf_g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 01/10] virnetdaemon: Use automatic mutex management Date: Fri, 25 Mar 2022 16:02:13 +0100 Message-Id: <20220325150222.78919-2-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.85 on 10.11.54.7 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: 1648220554807100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/rpc/virnetdaemon.c | 144 +++++++++++++---------------------------- 1 file changed, 45 insertions(+), 99 deletions(-) diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index c946e4a92a..1f32bae35f 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -171,20 +171,14 @@ int virNetDaemonAddServer(virNetDaemon *dmn, virNetServer *srv) { - int ret =3D -1; const char *serverName =3D virNetServerGetName(srv); - - virObjectLock(dmn); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); =20 if (virHashAddEntry(dmn->servers, serverName, srv) < 0) - goto cleanup; + return -1; =20 virObjectRef(srv); - - ret =3D 0; - cleanup: - virObjectUnlock(dmn); - return ret; + return 0; } =20 =20 @@ -192,11 +186,8 @@ virNetServer * virNetDaemonGetServer(virNetDaemon *dmn, const char *serverName) { - virNetServer *srv =3D NULL; - - virObjectLock(dmn); - srv =3D virObjectRef(virHashLookup(dmn->servers, serverName)); - virObjectUnlock(dmn); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); + virNetServer *srv =3D virObjectRef(virHashLookup(dmn->servers, serverN= ame)); =20 if (!srv) { virReportError(VIR_ERR_NO_SERVER, @@ -210,13 +201,9 @@ bool virNetDaemonHasServer(virNetDaemon *dmn, const char *serverName) { - void *ent; - - virObjectLock(dmn); - ent =3D virHashLookup(dmn->servers, serverName); - virObjectUnlock(dmn); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); =20 - return ent !=3D NULL; + return virHashLookup(dmn->servers, serverName) !=3D NULL; } =20 =20 @@ -252,26 +239,19 @@ ssize_t virNetDaemonGetServers(virNetDaemon *dmn, virNetServer ***servers) { + VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); struct collectData data =3D { servers, 0 }; - ssize_t ret =3D -1; =20 *servers =3D NULL; =20 - virObjectLock(dmn); - if (virHashForEach(dmn->servers, collectServers, &data) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot get all servers from daemon")); - goto cleanup; + virObjectListFreeCount(*servers, data.nservers); + return -1; } =20 - ret =3D data.nservers; - - cleanup: - if (ret < 0) - virObjectListFreeCount(*servers, data.nservers); - virObjectUnlock(dmn); - return ret; + return data.nservers; } =20 =20 @@ -387,48 +367,39 @@ virNetDaemonPreExecRestart(virNetDaemon *dmn) g_autoptr(virJSONValue) object =3D virJSONValueNewObject(); g_autoptr(virJSONValue) srvObj =3D virJSONValueNewObject(); g_autofree virHashKeyValuePair *srvArray =3D NULL; - - virObjectLock(dmn); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); =20 if (!(srvArray =3D virHashGetItems(dmn->servers, NULL, true))) - goto error; + return NULL; =20 for (i =3D 0; srvArray[i].key; i++) { virNetServer *server =3D virHashLookup(dmn->servers, srvArray[i].k= ey); g_autoptr(virJSONValue) srvJSON =3D NULL; =20 if (!server) - goto error; + return NULL; =20 srvJSON =3D virNetServerPreExecRestart(server); if (!srvJSON) - goto error; + return NULL; =20 if (virJSONValueObjectAppend(srvObj, srvArray[i].key, &srvJSON) < = 0) - goto error; + return NULL; } =20 - virObjectUnlock(dmn); - if (virJSONValueObjectAppend(object, "servers", &srvObj) < 0) return NULL; =20 return g_steal_pointer(&object); - - error: - virObjectUnlock(dmn); - return NULL; } =20 =20 bool virNetDaemonIsPrivileged(virNetDaemon *dmn) { - bool priv; - virObjectLock(dmn); - priv =3D dmn->privileged; - virObjectUnlock(dmn); - return priv; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); + + return dmn->privileged; } =20 =20 @@ -436,11 +407,9 @@ void virNetDaemonAutoShutdown(virNetDaemon *dmn, unsigned int timeout) { - virObjectLock(dmn); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); =20 dmn->autoShutdownTimeout =3D timeout; - - virObjectUnlock(dmn); } =20 =20 @@ -507,7 +476,8 @@ virNetDaemonCallInhibit(virNetDaemon *dmn, void virNetDaemonAddShutdownInhibition(virNetDaemon *dmn) { - virObjectLock(dmn); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); + dmn->autoShutdownInhibitions++; =20 VIR_DEBUG("dmn=3D%p inhibitions=3D%zu", dmn, dmn->autoShutdownInhibiti= ons); @@ -520,15 +490,14 @@ virNetDaemonAddShutdownInhibition(virNetDaemon *dmn) _("Virtual machines need to be saved"), "delay"); #endif - - virObjectUnlock(dmn); } =20 =20 void virNetDaemonRemoveShutdownInhibition(virNetDaemon *dmn) { - virObjectLock(dmn); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); + dmn->autoShutdownInhibitions--; =20 VIR_DEBUG("dmn=3D%p inhibitions=3D%zu", dmn, dmn->autoShutdownInhibiti= ons); @@ -537,8 +506,6 @@ virNetDaemonRemoveShutdownInhibition(virNetDaemon *dmn) VIR_DEBUG("Closing inhibit FD %d", dmn->autoShutdownInhibitFd); VIR_FORCE_CLOSE(dmn->autoShutdownInhibitFd); } - - virObjectUnlock(dmn); } =20 =20 @@ -648,13 +615,12 @@ virNetDaemonAddSignalHandler(virNetDaemon *dmn, virNetDaemonSignalFunc func, void *opaque) { - virNetDaemonSignal *sigdata =3D NULL; + g_autofree virNetDaemonSignal *sigdata =3D NULL; struct sigaction sig_action; - - virObjectLock(dmn); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); =20 if (virNetDaemonSignalSetup(dmn) < 0) - goto error; + return -1; =20 VIR_EXPAND_N(dmn->signals, dmn->nsignals, 1); =20 @@ -671,15 +637,8 @@ virNetDaemonAddSignalHandler(virNetDaemon *dmn, =20 sigaction(signum, &sig_action, &sigdata->oldaction); =20 - dmn->signals[dmn->nsignals-1] =3D sigdata; - - virObjectUnlock(dmn); + dmn->signals[dmn->nsignals-1] =3D g_steal_pointer(&sigdata); return 0; - - error: - VIR_FREE(sigdata); - virObjectUnlock(dmn); - return -1; } =20 #else /* WIN32 */ @@ -703,15 +662,12 @@ virNetDaemonAutoShutdownTimer(int timerid G_GNUC_UNUS= ED, void *opaque) { virNetDaemon *dmn =3D opaque; - - virObjectLock(dmn); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); =20 if (!dmn->autoShutdownInhibitions) { VIR_DEBUG("Automatic shutdown triggered"); dmn->quit =3D true; } - - virObjectUnlock(dmn); } =20 static int @@ -730,9 +686,9 @@ void virNetDaemonUpdateServices(virNetDaemon *dmn, bool enabled) { - virObjectLock(dmn); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); + virHashForEach(dmn->servers, daemonServerUpdateServices, &enabled); - virObjectUnlock(dmn); } =20 static int @@ -764,19 +720,17 @@ daemonShutdownWait(void *opaque) bool graceful =3D false; =20 virHashForEach(dmn->servers, daemonServerShutdownWait, NULL); - if (dmn->shutdownWaitCb && dmn->shutdownWaitCb() < 0) - goto finish; + if (!dmn->shutdownWaitCb || dmn->shutdownWaitCb() >=3D 0) { + if (dmn->stateStopThread) + virThreadJoin(dmn->stateStopThread); =20 - if (dmn->stateStopThread) - virThreadJoin(dmn->stateStopThread); - - graceful =3D true; + graceful =3D true; + } =20 - finish: - virObjectLock(dmn); - dmn->graceful =3D graceful; - virEventUpdateTimeout(dmn->finishTimer, 0); - virObjectUnlock(dmn); + VIR_WITH_OBJECT_LOCK_GUARD(dmn) { + dmn->graceful =3D graceful; + virEventUpdateTimeout(dmn->finishTimer, 0); + } } =20 static void @@ -784,10 +738,9 @@ virNetDaemonFinishTimer(int timerid G_GNUC_UNUSED, void *opaque) { virNetDaemon *dmn =3D opaque; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); =20 - virObjectLock(dmn); dmn->finished =3D true; - virObjectUnlock(dmn); } =20 void @@ -896,36 +849,31 @@ void virNetDaemonSetStateStopWorkerThread(virNetDaemon *dmn, virThread **thr) { - virObjectLock(dmn); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); =20 VIR_DEBUG("Setting state stop worker thread on dmn=3D%p to thr=3D%p", = dmn, thr); dmn->stateStopThread =3D g_steal_pointer(thr); - virObjectUnlock(dmn); } =20 =20 void virNetDaemonQuit(virNetDaemon *dmn) { - virObjectLock(dmn); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); =20 VIR_DEBUG("Quit requested %p", dmn); dmn->quit =3D true; - - virObjectUnlock(dmn); } =20 =20 void virNetDaemonQuitExecRestart(virNetDaemon *dmn) { - virObjectLock(dmn); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); =20 VIR_DEBUG("Exec-restart requested %p", dmn); dmn->quit =3D true; dmn->execRestart =3D true; - - virObjectUnlock(dmn); } =20 =20 @@ -969,10 +917,8 @@ virNetDaemonSetShutdownCallbacks(virNetDaemon *dmn, virNetDaemonShutdownCallback prepareCb, virNetDaemonShutdownCallback waitCb) { - virObjectLock(dmn); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(dmn); =20 dmn->shutdownPrepareCb =3D prepareCb; dmn->shutdownWaitCb =3D waitCb; - - virObjectUnlock(dmn); } --=20 2.31.1 From nobody Tue May 14 20:33:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1648220556; cv=none; d=zohomail.com; s=zohoarc; b=mMgy0LAnhAjbcSsqx4mpMV4kSyGQ1OOiYb0xE0/NOwxMdGfEZ/44nX0z7EX/ILSGUVQtX5s3Sl+fYtF86hbnssoyyY0ppX1avFAB/6hkpiYpOz2rXFCNdBeEq2wuJBZwQc40ovl7wuD5DcsZcSQLvcTuGmj4E/X37fwznkqx8UY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648220556; 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=QlGXTzxmVcMEFY2DHpLTJ0YSTT4+bLD5Yc2QVFHIphw=; b=S1u39aJ6uizl9PvofeCnkMhKJoVmA/KhLFk9ojlfZIJ90lz0DaA9hXCLlZBAUwNZVrRYH7xibCpUHwspArfwRS7JigIN82YmCaDhW6f+GLRYyqziR9DbJkycj4EQJKNZtU1A/wfGQKPzpICOWHX2sd/HvzMuTLgW2yhgprQl8sE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1648220556101563.2123766503095; Fri, 25 Mar 2022 08:02:36 -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-280-0zxp-R5XPhKqHO5ZfhXRSA-1; Fri, 25 Mar 2022 11:02:31 -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 A3B8729ABA3A; Fri, 25 Mar 2022 15:02:26 +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 850CA4087D67; Fri, 25 Mar 2022 15:02:26 +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 15A83194036B; Fri, 25 Mar 2022 15:02:26 +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 5BBEC1940341 for ; Fri, 25 Mar 2022 15:02:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4E706C1D3AD; Fri, 25 Mar 2022 15:02:25 +0000 (UTC) Received: from work.fritz.box (unknown [10.39.194.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id D29B9C27D91; Fri, 25 Mar 2022 15:02:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648220555; 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=QlGXTzxmVcMEFY2DHpLTJ0YSTT4+bLD5Yc2QVFHIphw=; b=Kev4ooc0QfhMk25DuPv3ytrvfGjwAVhbTC/hgu1QCevsXg3yTQn0/noSNbRFdTHCfKcpMG T9UXpMUr9KYVT6iOfK9C/hxG4dOyOhHmH+1pyqE/W8XYoZg9YKK885bo5nyhRtLMbhLmU9 G2YgbrvppXAxyztnWdoaTGNPNe82exU= X-MC-Unique: 0zxp-R5XPhKqHO5ZfhXRSA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 02/10] bridge_driver: Use automatic mutex management Date: Fri, 25 Mar 2022 16:02:14 +0100 Message-Id: <20220325150222.78919-3-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: 1648220556850100004 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/network/bridge_driver.c | 59 +++++++++++++------------------ src/network/bridge_driver_linux.c | 4 +-- 2 files changed, 25 insertions(+), 38 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 67c5a111b3..6113b67248 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -457,13 +457,11 @@ networkUpdateState(virNetworkObj *obj, g_autoptr(dnsmasqCaps) dnsmasq_caps =3D networkGetDnsmasqCaps(driver); virMacMap *macmap; g_autofree char *macMapFile =3D NULL; - int ret =3D -1; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(obj); + + if (!virNetworkObjIsActive(obj)) + return 0; =20 - virObjectLock(obj); - if (!virNetworkObjIsActive(obj)) { - ret =3D 0; - goto cleanup; - } def =3D virNetworkObjGetDef(obj); =20 switch ((virNetworkForwardType) def->forward.type) { @@ -477,10 +475,10 @@ networkUpdateState(virNetworkObj *obj, =20 if (!(macMapFile =3D virMacMapFileName(driver->dnsmasqStateDir, def->bridge))) - goto cleanup; + return -1; =20 if (!(macmap =3D virMacMapNew(macMapFile))) - goto cleanup; + return -1; =20 virNetworkObjSetMacMap(obj, macmap); =20 @@ -509,7 +507,7 @@ networkUpdateState(virNetworkObj *obj, case VIR_NETWORK_FORWARD_LAST: default: virReportEnumRangeError(virNetworkForwardType, def->forward.type); - goto cleanup; + return -1; } =20 virNetworkObjPortForEach(obj, networkUpdatePort, obj); @@ -525,10 +523,7 @@ networkUpdateState(virNetworkObj *obj, virNetworkObjSetDnsmasqPid(obj, dnsmasqPid); } =20 - ret =3D 0; - cleanup: - virObjectUnlock(obj); - return ret; + return 0; } =20 =20 @@ -536,19 +531,19 @@ static int networkAutostartConfig(virNetworkObj *obj, void *opaque) { + VIR_LOCK_GUARD lock =3D virObjectLockGuard(obj); virNetworkDriverState *driver =3D opaque; - int ret =3D -1; =20 - virObjectLock(obj); - if (virNetworkObjIsAutostart(obj) && - !virNetworkObjIsActive(obj) && - networkStartNetwork(driver, obj) < 0) - goto cleanup; + if (!virNetworkObjIsAutostart(obj)) + return 0; =20 - ret =3D 0; - cleanup: - virObjectUnlock(obj); - return ret; + if (virNetworkObjIsActive(obj)) + return 0; + + if (networkStartNetwork(driver, obj) >=3D 0) + return 0; + + return -1; } =20 =20 @@ -1650,11 +1645,10 @@ static int networkRefreshDaemonsHelper(virNetworkObj *obj, void *opaque) { - virNetworkDef *def; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(obj); virNetworkDriverState *driver =3D opaque; + virNetworkDef *def =3D virNetworkObjGetDef(obj); =20 - virObjectLock(obj); - def =3D virNetworkObjGetDef(obj); if (virNetworkObjIsActive(obj)) { switch ((virNetworkForwardType) def->forward.type) { case VIR_NETWORK_FORWARD_NONE: @@ -1679,12 +1673,10 @@ networkRefreshDaemonsHelper(virNetworkObj *obj, case VIR_NETWORK_FORWARD_LAST: default: virReportEnumRangeError(virNetworkForwardType, def->forward.ty= pe); - goto cleanup; + return 0; } } =20 - cleanup: - virObjectUnlock(obj); return 0; } =20 @@ -1706,10 +1698,9 @@ static int networkReloadFirewallRulesHelper(virNetworkObj *obj, void *opaque G_GNUC_UNUSED) { - virNetworkDef *def; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(obj); + virNetworkDef *def =3D virNetworkObjGetDef(obj); =20 - virObjectLock(obj); - def =3D virNetworkObjGetDef(obj); if (virNetworkObjIsActive(obj)) { switch ((virNetworkForwardType) def->forward.type) { case VIR_NETWORK_FORWARD_NONE: @@ -1735,12 +1726,10 @@ networkReloadFirewallRulesHelper(virNetworkObj *obj, case VIR_NETWORK_FORWARD_LAST: default: virReportEnumRangeError(virNetworkForwardType, def->forward.ty= pe); - goto cleanup; + return 0; } } =20 - cleanup: - virObjectUnlock(obj); return 0; } =20 diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_= linux.c index 34982706be..98d2a33a1d 100644 --- a/src/network/bridge_driver_linux.c +++ b/src/network/bridge_driver_linux.c @@ -87,9 +87,9 @@ static int networkHasRunningNetworksWithFWHelper(virNetworkObj *obj, void *opaque) { + VIR_LOCK_GUARD lock =3D virObjectLockGuard(obj); bool *activeWithFW =3D opaque; =20 - virObjectLock(obj); if (virNetworkObjIsActive(obj)) { virNetworkDef *def =3D virNetworkObjGetDef(obj); =20 @@ -111,8 +111,6 @@ networkHasRunningNetworksWithFWHelper(virNetworkObj *ob= j, } } =20 - virObjectUnlock(obj); - /* * terminate ForEach early once we find an active network that * adds Firewall rules (return status is ignored) --=20 2.31.1 From nobody Tue May 14 20:33:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1648220588; cv=none; d=zohomail.com; s=zohoarc; b=Grs3POeIBzInqjoxi9bL5A/ZZeNH9RZBw/pUpkYKIac/Ucb+YDE0KnWcKFrjvmne0Gzoey/Rq4HXVh5qk6+AGJ6Qu1T9ze6DhcI7K7WCOcIRpbsMJpzDVBckyJSs5OPE7lMd72ZdApzSHVFDd6CikAoJgu412CqCIDDtWzuaMMk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648220588; 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=SuKTBnWXcPFJSG+lrq/Pxb59cBNvz/DdGmDynj+wIIo=; b=Z9gUC17cYc10SREYEWgk3CC+srmwFwijCFZ2ooNkB+SI9LFW2RPmPhDAOe6UNphTZo7t9uau4EATcG6E4Q6yuoICYBbWJb+lIcCYpNmO/q16qEQpBf3Dl2illsQpZSjhCiThh187kbVH3J3IcxyeUe4R9hVtrmwhMvrtS3Pat2o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1648220588835178.2855746881604; Fri, 25 Mar 2022 08:03:08 -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-616-Dc87qAZAM9WU9XgEGkZAwQ-1; Fri, 25 Mar 2022 11:02:33 -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 BE3C9106668B; Fri, 25 Mar 2022 15:02:28 +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 AAD67C1D3AD; Fri, 25 Mar 2022 15:02:28 +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 7D8F1194034F; Fri, 25 Mar 2022 15:02:28 +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 21260194036E for ; Fri, 25 Mar 2022 15:02:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 039BFC27D8A; 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 86581C26EA0; Fri, 25 Mar 2022 15:02:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648220584; 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=SuKTBnWXcPFJSG+lrq/Pxb59cBNvz/DdGmDynj+wIIo=; b=HXPn0LWQFCvMcCGIBbEzu6cNz9MN9hDLNrQ4KB1cwSEvzQwGKPMsPLcYrSB0R/66CQZSui NKSowykYhFKnniNPJ4JuyenJEq8rJ46aS4/r+VW1hbIHRHcAznhQH4uTxlCDyiFh1bjDlO TPBZfR4avncY+83g9uMTldm6ggep2xk= X-MC-Unique: Dc87qAZAM9WU9XgEGkZAwQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 03/10] node_device_driver: Use automatic mutex management Date: Fri, 25 Mar 2022 16:02:15 +0100 Message-Id: <20220325150222.78919-4-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.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: 1648220591063100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/node_device/node_device_driver.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index 130c1d4023..1eb452b989 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1072,14 +1072,10 @@ static bool matchDeviceAddress(virNodeDeviceObj *obj, const void *opaque) { - g_autofree char *addr =3D NULL; - bool want =3D false; - - virObjectLock(obj); - addr =3D nodeDeviceObjFormatAddress(obj); - want =3D STREQ_NULLABLE(addr, opaque); - virObjectUnlock(obj); - return want; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(obj); + g_autofree char *addr =3D nodeDeviceObjFormatAddress(obj); + + return STREQ_NULLABLE(addr, opaque); } =20 =20 --=20 2.31.1 From nobody Tue May 14 20:33:30 2024 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 Reviewed-by: Michal Privoznik --- 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 From nobody Tue May 14 20:33:30 2024 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=1648220588; cv=none; d=zohomail.com; s=zohoarc; b=l6L/Bib8Nk3qoGmSdt4cmpcoczGKW+yhLYHBnwcgYZ2eF1C9GxNxLZdrYxxuZbqPIS4SDSVhAo7lkCrY+kHERsvZ1wt+u1Ni2JCpqUfWFOun32vj79ds7FipOAv7wR0fkOb2uDUa25VsIt3AyH6Tm8fbzR4bDX08GEHYICKBGXU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648220588; 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=XZDUXLe5RgNPJpOPaLi3AnPHna9Lod6aEKRllBvzo90=; b=BI0/hFtxxOac4TAYnZB7L6T8LQ1HMObKtnrxXXJef/dUsp1O8YrBnA6y120SmTIilWaSzgkbaHnt+oT512s8hhrOQDFj42B3Vp4s/KWzv2uPYqNIZ4napsfB2WasXsBM13Rj7Yvx0PSwYTmU8BOGQ5X4CaGf8YSbT973Xk945O4= 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 1648220588840957.6147474102017; Fri, 25 Mar 2022 08:03:08 -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-393-YE6h-du6OsiDMLHgPZe5qw-1; Fri, 25 Mar 2022 11:02:38 -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 36AEE3C11C73; Fri, 25 Mar 2022 15:02:31 +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 1F60B4087D61; Fri, 25 Mar 2022 15:02:31 +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 D7F8C194034E; Fri, 25 Mar 2022 15:02:30 +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 A46AE1940363 for ; Fri, 25 Mar 2022 15:02:27 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 99D69C27D8A; Fri, 25 Mar 2022 15:02:27 +0000 (UTC) Received: from work.fritz.box (unknown [10.39.194.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2535FC1D3AD; Fri, 25 Mar 2022 15:02:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648220587; 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=XZDUXLe5RgNPJpOPaLi3AnPHna9Lod6aEKRllBvzo90=; b=YE9BOclav9Uujy3PTMCUmovCj/shhko4bx9n/Ox4Rpr2WUiN3v8iUkWAgYceocrk6IwEjk zydDZGQhnO3gjf9qjXRIODS32bY5LQSgPmLrv/p6l9diwRaflqrR8/055ks4v1gcFAqyUo ApDe83suvO+7KTcNk82qmPeXaLD41KM= X-MC-Unique: YE6h-du6OsiDMLHgPZe5qw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 05/10] node_device_udev: Use automatic mutex management Date: Fri, 25 Mar 2022 16:02:17 +0100 Message-Id: <20220325150222.78919-6-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: 1648220591087100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/node_device/node_device_udev.c | 76 ++++++++++++++---------------- 1 file changed, 35 insertions(+), 41 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index b3e8103dae..b68dc12158 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1688,10 +1688,10 @@ nodeStateCleanup(void) =20 priv =3D driver->privateData; if (priv) { - virObjectLock(priv); - priv->threadQuit =3D true; - virCondSignal(&priv->threadCond); - virObjectUnlock(priv); + VIR_WITH_OBJECT_LOCK_GUARD(priv) { + priv->threadQuit =3D true; + virCondSignal(&priv->threadCond); + } if (priv->initThread) { virThreadJoin(priv->initThread); g_clear_pointer(&priv->initThread, g_free); @@ -1807,24 +1807,21 @@ udevEventHandleThread(void *opaque G_GNUC_UNUSED) =20 /* continue rather than break from the loop on non-fatal errors */ while (1) { - virObjectLock(priv); - while (!priv->dataReady && !priv->threadQuit) { - if (virCondWait(&priv->threadCond, &priv->parent.lock)) { - virReportSystemError(errno, "%s", - _("handler failed to wait on conditio= n")); - virObjectUnlock(priv); - return; + VIR_WITH_OBJECT_LOCK_GUARD(priv) { + while (!priv->dataReady && !priv->threadQuit) { + if (virCondWait(&priv->threadCond, &priv->parent.lock)) { + virReportSystemError(errno, "%s", + _("handler failed to wait on cond= ition")); + return; + } } - } =20 - if (priv->threadQuit) { - virObjectUnlock(priv); - return; - } + if (priv->threadQuit) + return; =20 - errno =3D 0; - device =3D udev_monitor_receive_device(priv->udev_monitor); - virObjectUnlock(priv); + errno =3D 0; + device =3D udev_monitor_receive_device(priv->udev_monitor); + } =20 if (!device) { if (errno =3D=3D 0) { @@ -1848,9 +1845,9 @@ udevEventHandleThread(void *opaque G_GNUC_UNUSED) /* Trying to move the reset of the @priv->dataReady flag to * after the udev_monitor_receive_device wouldn't help much * due to event mgmt and scheduler timing. */ - virObjectLock(priv); - priv->dataReady =3D false; - virObjectUnlock(priv); + VIR_WITH_OBJECT_LOCK_GUARD(priv) { + priv->dataReady =3D false; + } =20 continue; } @@ -1873,8 +1870,7 @@ udevEventHandleCallback(int watch G_GNUC_UNUSED, void *data G_GNUC_UNUSED) { udevEventData *priv =3D driver->privateData; - - virObjectLock(priv); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(priv); =20 if (!udevEventMonitorSanityCheck(priv, fd)) priv->threadQuit =3D true; @@ -1882,7 +1878,6 @@ udevEventHandleCallback(int watch G_GNUC_UNUSED, priv->dataReady =3D true; =20 virCondSignal(&priv->threadCond); - virObjectUnlock(priv); } =20 =20 @@ -1897,18 +1892,17 @@ udevGetDMIData(virNodeDevCapSystem *syscap) virNodeDevCapSystemHardware *hardware =3D &syscap->hardware; virNodeDevCapSystemFirmware *firmware =3D &syscap->firmware; =20 - virObjectLock(priv); - udev =3D udev_monitor_get_udev(priv->udev_monitor); + VIR_WITH_OBJECT_LOCK_GUARD(priv) { + udev =3D udev_monitor_get_udev(priv->udev_monitor); =20 - device =3D udev_device_new_from_syspath(udev, DMI_DEVPATH); - if (device =3D=3D NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to get udev device for syspath '%s'"), - DMI_DEVPATH); - virObjectUnlock(priv); - return; + device =3D udev_device_new_from_syspath(udev, DMI_DEVPATH); + if (device =3D=3D NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to get udev device for syspath '%s'"), + DMI_DEVPATH); + return; + } } - virObjectUnlock(priv); =20 if (udevGetStringSysfsAttr(device, "product_name", &syscap->product_name) < 0) @@ -2002,12 +1996,12 @@ nodeStateInitializeEnumerate(void *opaque) return; =20 error: - virObjectLock(priv); - ignore_value(virEventRemoveHandle(priv->watch)); - priv->watch =3D -1; - priv->threadQuit =3D true; - virCondSignal(&priv->threadCond); - virObjectUnlock(priv); + VIR_WITH_OBJECT_LOCK_GUARD(priv) { + ignore_value(virEventRemoveHandle(priv->watch)); + priv->watch =3D -1; + priv->threadQuit =3D true; + virCondSignal(&priv->threadCond); + } =20 goto cleanup; } --=20 2.31.1 From nobody Tue May 14 20:33:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1648220594; cv=none; d=zohomail.com; s=zohoarc; b=LsU6PhcJgny5FFFb9TiuluAl/vW4LLG4ibUzySD/bnfUX8elOmP2f0U6KEA3My207lQcM3ckH3B7e+HiESYLpj0rB1xGloSPyGDQlyd/WIIDr5VWuVCDoqscqlWJfMvDW2wlrDi1BFChGdIH+8ijzVQDMSSGoDSVPALpoI21OHY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648220594; 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=sAmIpV2IkCOh95ZIGhd374Q92dnXUXCKCjm/bmoXPeQ=; b=F1h2SzYZ0hjhP69jlRTOCaVScpnjR/JT+q6Ke9rX9uC9YfLSvMx2Hav0HKCZKDwDVXaFwoqUZHhw7Reb8X1LyTmiNwIX7G07yd2vSKPVvnfFo9XFRctqDhKw66lqq7OeBpwuVw14xVfPK2hpqm6eXJXuEak5u6mixRkJXAXRHww= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1648220594491123.40746148622986; Fri, 25 Mar 2022 08:03:14 -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-10-30Oc7FYdMpOkODuTPZjMbA-1; Fri, 25 Mar 2022 11:02:41 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8BCDC899EC4; Fri, 25 Mar 2022 15:02: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 7855D1457F12; Fri, 25 Mar 2022 15:02:34 +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 50A06194034E; Fri, 25 Mar 2022 15:02:34 +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 7428C1940341 for ; Fri, 25 Mar 2022 15:02:28 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 55B0DC27E83; Fri, 25 Mar 2022 15:02:28 +0000 (UTC) Received: from work.fritz.box (unknown [10.39.194.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id D927FC1D3AD; Fri, 25 Mar 2022 15:02:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648220593; 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=sAmIpV2IkCOh95ZIGhd374Q92dnXUXCKCjm/bmoXPeQ=; b=Opr3tiUNidBGFcg50s5dBrvwbLb/IxKts/z2szFCNvjf84u55xjSnBvb9OHKl5nA9BL1pi nOX+b52iDuM87jh514ebcPvxAcnfCR1XBufJ12ht4k2KiXyb4EiQXmL6cJBqc5itOB4cTT 0SGsKHabPny/lSGLRKmH/kI4xS/Tue0= X-MC-Unique: 30Oc7FYdMpOkODuTPZjMbA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 06/10] qemu_agent: Use automatic mutex management Date: Fri, 25 Mar 2022 16:02:18 +0100 Message-Id: <20220325150222.78919-7-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.85 on 10.11.54.7 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: 1648220595038100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/qemu/qemu_agent.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 4909fb336f..4156cb0dca 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -679,9 +679,9 @@ qemuAgentNotifyClose(qemuAgent *agent) =20 VIR_DEBUG("agent=3D%p", agent); =20 - virObjectLock(agent); - qemuAgentNotifyCloseLocked(agent); - virObjectUnlock(agent); + VIR_WITH_OBJECT_LOCK_GUARD(agent) { + qemuAgentNotifyCloseLocked(agent); + } } =20 =20 @@ -692,17 +692,16 @@ void qemuAgentClose(qemuAgent *agent) =20 VIR_DEBUG("agent=3D%p", agent); =20 - virObjectLock(agent); + VIR_WITH_OBJECT_LOCK_GUARD(agent) { + if (agent->socket) { + qemuAgentUnregister(agent); + g_clear_pointer(&agent->socket, g_object_unref); + agent->fd =3D -1; + } =20 - if (agent->socket) { - qemuAgentUnregister(agent); - g_clear_pointer(&agent->socket, g_object_unref); - agent->fd =3D -1; + qemuAgentNotifyCloseLocked(agent); } =20 - qemuAgentNotifyCloseLocked(agent); - virObjectUnlock(agent); - virObjectUnref(agent); } =20 @@ -1125,7 +1124,7 @@ qemuAgentMakeStringsArray(const char **strings, unsig= ned int len) void qemuAgentNotifyEvent(qemuAgent *agent, qemuAgentEvent event) { - virObjectLock(agent); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(agent); =20 VIR_DEBUG("agent=3D%p event=3D%d await_event=3D%d", agent, event, agen= t->await_event); if (agent->await_event =3D=3D event) { @@ -1136,8 +1135,6 @@ void qemuAgentNotifyEvent(qemuAgent *agent, virCondSignal(&agent->notify); } } - - virObjectUnlock(agent); } =20 VIR_ENUM_DECL(qemuAgentShutdownMode); --=20 2.31.1 From nobody Tue May 14 20:33:30 2024 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=1648220601; cv=none; d=zohomail.com; s=zohoarc; b=Q9hkyiuvTAeZbp+JAt6wv0B3qYCDugUbKiKdcFfU+AeWkId8UXODM5FU8U2XRiCGp8ZlS4mU7SqewcgXgCtPr/3J9Jz67mA6Y1sVzut5aFR1PJkOHpKf730WgxSU4GgHjBIb3X/zUk5o1tWs3+rnbFWM13mHyZReFsVvCWAHfZA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648220601; 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=HdWyuwdl8wbfwE7GOXIcJiJEGNVJgHwBEC3ekYTs4Ow=; b=PQRkZKJjGfheSaEn75wgEutjhi+p+tpyPclWlcF7cyCXmGdtjEpMLqCd79UlWY4vZaylbcxtyUezkVYog6CksHRX4ogmXfsajW6zMke4TVI8ynE6UU5NuwF4GpnZ9C7V1pSsAcgJQO7VC2cFy5Jc419lLmbb3lYwlYDAuH0f9u4= 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 1648220601438267.9237859564016; Fri, 25 Mar 2022 08:03:21 -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-609-Z14Pq7dDM8eNubItXvVWXA-1; Fri, 25 Mar 2022 11:02:39 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 356CE899EE7; Fri, 25 Mar 2022 15:02:32 +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 207261457F15; Fri, 25 Mar 2022 15:02:32 +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 563CD194036C; Fri, 25 Mar 2022 15:02:31 +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 245051940341 for ; Fri, 25 Mar 2022 15:02:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0C2F6C1D3AD; Fri, 25 Mar 2022 15:02:29 +0000 (UTC) Received: from work.fritz.box (unknown [10.39.194.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8EB44C27D96; Fri, 25 Mar 2022 15:02:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648220599; 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=HdWyuwdl8wbfwE7GOXIcJiJEGNVJgHwBEC3ekYTs4Ow=; b=ClZkBDs2X/9WVX2NwTxLRrTlD6+5g58JFAvOcOTJmLzB305x2tsfUrBIZqR9OQqWFgEAq6 JLwRrl9PiTLXCSGmHh8RszblGhf671hXjw9KZ8ACdTL7x0h9pevbOf768wjj/JJVKJ/pHF GCHjDtdAyHRl0OovFqe9CtZ9qTmYmqc= X-MC-Unique: Z14Pq7dDM8eNubItXvVWXA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 07/10] vbox_common: Use automatic mutex management Date: Fri, 25 Mar 2022 16:02:19 +0100 Message-Id: <20220325150222.78919-8-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.85 on 10.11.54.7 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: 1648220603376100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/vbox/vbox_common.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index acd18494d3..03f55f2f1e 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -602,11 +602,10 @@ vboxDomainSave(virDomainPtr dom, const char *path G_G= NUC_UNUSED) static int vboxConnectGetVersion(virConnectPtr conn, unsigned long *versio= n) { struct _vboxDriver *data =3D conn->privateData; - VIR_DEBUG("%s: in vboxGetVersion", conn->driver->name); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(data); =20 - virObjectLock(data); + VIR_DEBUG("%s: in vboxGetVersion", conn->driver->name); *version =3D data->version; - virObjectUnlock(data); =20 return 0; } @@ -664,16 +663,12 @@ vboxConnectGetMaxVcpus(virConnectPtr conn, const char= *type G_GNUC_UNUSED) static char *vboxConnectGetCapabilities(virConnectPtr conn) { struct _vboxDriver *data =3D conn->privateData; - char *ret =3D NULL; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(data); =20 if (!data->vboxObj) - return ret; - - virObjectLock(data); - ret =3D virCapabilitiesFormatXML(data->caps); - virObjectUnlock(data); + return NULL; =20 - return ret; + return virCapabilitiesFormatXML(data->caps); } =20 static int vboxConnectListDomains(virConnectPtr conn, int *ids, int nids) @@ -7568,13 +7563,13 @@ vboxNodeGetFreePages(virConnectPtr conn, unsigned int flags) { struct _vboxDriver *driver =3D conn->privateData; - int lastCell; + int lastCell =3D -1; =20 virCheckFlags(0, -1); =20 - virObjectLock(driver); - lastCell =3D virCapabilitiesHostNUMAGetMaxNode(driver->caps->host.numa= ); - virObjectUnlock(driver); + VIR_WITH_OBJECT_LOCK_GUARD(driver) { + lastCell =3D virCapabilitiesHostNUMAGetMaxNode(driver->caps->host.= numa); + } =20 return virHostMemGetFreePages(npages, pages, startCell, cellCount, lastCell, counts); @@ -7590,14 +7585,14 @@ vboxNodeAllocPages(virConnectPtr conn G_GNUC_UNUSED, unsigned int flags) { struct _vboxDriver *driver =3D conn->privateData; - int lastCell; + int lastCell =3D -1; bool add =3D !(flags & VIR_NODE_ALLOC_PAGES_SET); =20 virCheckFlags(VIR_NODE_ALLOC_PAGES_SET, -1); =20 - virObjectLock(driver); - lastCell =3D virCapabilitiesHostNUMAGetMaxNode(driver->caps->host.numa= ); - virObjectUnlock(driver); + VIR_WITH_OBJECT_LOCK_GUARD(driver) { + lastCell =3D virCapabilitiesHostNUMAGetMaxNode(driver->caps->host.= numa); + } =20 return virHostMemAllocPages(npages, pageSizes, pageCounts, startCell, cellCount, lastCell, add); --=20 2.31.1 From nobody Tue May 14 20:33:30 2024 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=1648220642; cv=none; d=zohomail.com; s=zohoarc; b=dVeztY7m1Tbkrmh8Jfp9CEL6cf6IMOe4eESTqgnz3+WXLUPeghTFA4GB/mOHnKdXJxEumon3GO34iFB2ZYynOQvoDnwNDQ9L43aEW/esloW2GzoItLJySJd5f0B0Dt75/SJ+LG60oAiPoTwYoeFBC/r3G3VA51YEJAdZs49/mrc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648220642; 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=B8HZ4BftDMWb8W8Q2/THcp+4EgPmBtgq9CJ+WfxiHyA=; b=Vd0ZB6e7Lz+UbnbdGZmR1H1AeHLVv+1BxM+0FSjynU7ml6q6esmKlUoMH+0C4BJw5pu0yp9kjbYChttKkxRl8PbaRAMDK0TGOWcHbycmulp1mYqq2T8iYDTtd+E9ZsuYUj0oGOSpyYGBLWA8cJC1L3gRusJ8QKoJZ26GYpWtMp8= 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 1648220642983852.0720504915234; Fri, 25 Mar 2022 08:04:02 -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-393-gf2euUSfPhGEMSja4ERKsQ-1; Fri, 25 Mar 2022 11:02:39 -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 31E1F866DF4; Fri, 25 Mar 2022 15:02:31 +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 1E89CC27D8A; Fri, 25 Mar 2022 15:02:31 +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 DE0651940358; Fri, 25 Mar 2022 15:02:30 +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 C17911940341 for ; Fri, 25 Mar 2022 15:02:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id AFCBFC26EA0; Fri, 25 Mar 2022 15:02:29 +0000 (UTC) Received: from work.fritz.box (unknown [10.39.194.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41BE2C27D8A; Fri, 25 Mar 2022 15:02:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648220641; 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=B8HZ4BftDMWb8W8Q2/THcp+4EgPmBtgq9CJ+WfxiHyA=; b=MIAaJQuPcf8NOtpr9OcODhGXNsb+ZdZwuy4sUDQTXu7lvP0/z7Tel3pw/A8HozrB3j/aQu fcMw66zRU4eMR01XXx7dU9K/zBzaWM/y2aF1T1D++H1tQRu7k6XwgLcag/oqCibJVUrThs GIhdGYr/Zekz4ebRS1+1/RN8J1af0w4= X-MC-Unique: gf2euUSfPhGEMSja4ERKsQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 08/10] datatypes: Use automatic mutex management Date: Fri, 25 Mar 2022 16:02:20 +0100 Message-Id: <20220325150222.78919-9-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.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: 1648220643459100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/datatypes.c | 63 +++++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 44 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index aa614612f9..da8a9970f1 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -217,71 +217,56 @@ void virConnectCloseCallbackDataRegister(virConnectCl= oseCallbackData *closeData, void *opaque, virFreeCallback freecb) { - virObjectLock(closeData); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(closeData); =20 if (closeData->callback !=3D NULL) { - VIR_WARN("Attempt to register callback on armed" - " close callback object %p", closeData); - goto cleanup; + VIR_WARN("Attempt to register callback on armed close callback obj= ect %p", + closeData); + return; } =20 closeData->conn =3D virObjectRef(conn); closeData->callback =3D cb; closeData->opaque =3D opaque; closeData->freeCallback =3D freecb; - - cleanup: - - virObjectUnlock(closeData); } =20 void virConnectCloseCallbackDataUnregister(virConnectCloseCallbackData *cl= oseData, virConnectCloseFunc cb) { - virObjectLock(closeData); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(closeData); =20 if (closeData->callback !=3D cb) { - VIR_WARN("Attempt to unregister different callback on " - " close callback object %p", closeData); - goto cleanup; + VIR_WARN("Attempt to unregister different callback on close callb= ack object %p", + closeData); + return; } =20 virConnectCloseCallbackDataReset(closeData); closeData->callback =3D NULL; - - cleanup: - - virObjectUnlock(closeData); } =20 void virConnectCloseCallbackDataCall(virConnectCloseCallbackData *closeDat= a, int reason) { - virObjectLock(closeData); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(closeData); =20 if (!closeData->conn) - goto exit; + return; =20 VIR_DEBUG("Triggering connection close callback %p reason=3D%d, opaque= =3D%p", closeData->callback, reason, closeData->opaque); closeData->callback(closeData->conn, reason, closeData->opaque); =20 virConnectCloseCallbackDataReset(closeData); - - exit: - virObjectUnlock(closeData); } =20 virConnectCloseFunc virConnectCloseCallbackDataGetCallback(virConnectCloseCallbackData *closeD= ata) { - virConnectCloseFunc cb; - - virObjectLock(closeData); - cb =3D closeData->callback; - virObjectUnlock(closeData); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(closeData); =20 - return cb; + return closeData->callback; } =20 /** @@ -1128,10 +1113,9 @@ static void virAdmConnectCloseCallbackDataDispose(void *obj) { virAdmConnectCloseCallbackData *cb_data =3D obj; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(cb_data); =20 - virObjectLock(cb_data); virAdmConnectCloseCallbackDataReset(cb_data); - virObjectUnlock(cb_data); } =20 void @@ -1150,20 +1134,16 @@ int virAdmConnectCloseCallbackDataUnregister(virAdmConnectCloseCallbackData *c= bdata, virAdmConnectCloseFunc cb) { - int ret =3D -1; + VIR_LOCK_GUARD lock =3D virObjectLockGuard(cbdata); =20 - virObjectLock(cbdata); if (cbdata->callback !=3D cb) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("A different callback was requested")); - goto cleanup; + return -1; } =20 virAdmConnectCloseCallbackDataReset(cbdata); - ret =3D 0; - cleanup: - virObjectUnlock(cbdata); - return ret; + return 0; } =20 int @@ -1173,14 +1153,12 @@ virAdmConnectCloseCallbackDataRegister(virAdmConnec= tCloseCallbackData *cbdata, void *opaque, virFreeCallback freecb) { - int ret =3D -1; - - virObjectLock(cbdata); + VIR_LOCK_GUARD lock =3D virObjectLockGuard(cbdata); =20 if (cbdata->callback) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("A close callback is already registered")); - goto cleanup; + return -1; } =20 cbdata->conn =3D virObjectRef(conn); @@ -1188,10 +1166,7 @@ virAdmConnectCloseCallbackDataRegister(virAdmConnect= CloseCallbackData *cbdata, cbdata->opaque =3D opaque; cbdata->freeCallback =3D freecb; =20 - ret =3D 0; - cleanup: - virObjectUnlock(conn->closeCallback); - return ret; + return 0; } =20 virAdmServerPtr --=20 2.31.1 From nobody Tue May 14 20:33:30 2024 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=1648220565; cv=none; d=zohomail.com; s=zohoarc; b=GfH5D3VNznDpCs+4zMOuyAspDG9eUVXu0mlhak7DX4QRgBCcxl+0Huz7XQyCCDKzZPehCLL5cmTpWf/Md78DbW4hYLp0+AxaODffZp8HiP+QovoUa1nhu84pK/5CKZkd1iSg5Zy0SBzN7prEqSR9v50RfYU50Zqs9zRrhlqFJ+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648220565; 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=TEdgQnHpcfsV/mDdUX2hx3flyKMXx6HrjKUdfhtkW2c=; b=fhoa09t+oxiYYMDLr5+Ta7Y23LSxuAEGPKd0Em8en8rbNRCdZ9TOyX2Oe0TdfLxfYhfjvqB0jaXC5yWpZZQXEpI/MuaBYTW1Sgu8FwW4G5S8oK3jCnZq5TNzbeZDJPDyrEgLuiREdVicR2bj9fOgGeFzIRaxLX4AALx06pEAHcc= 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 1648220565917534.5014767477323; Fri, 25 Mar 2022 08:02:45 -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-177-yuU8eUgHMQaNgnuoXNqQIg-1; Fri, 25 Mar 2022 11:02:40 -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 E8B2B101AA42; Fri, 25 Mar 2022 15:02:32 +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 CF4604087D60; Fri, 25 Mar 2022 15:02:32 +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 AB114194034F; Fri, 25 Mar 2022 15:02:32 +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 867741940341 for ; Fri, 25 Mar 2022 15:02:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 64286C27D92; Fri, 25 Mar 2022 15:02:30 +0000 (UTC) Received: from work.fritz.box (unknown [10.39.194.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id E989EC1D3AD; Fri, 25 Mar 2022 15:02:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648220564; 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=TEdgQnHpcfsV/mDdUX2hx3flyKMXx6HrjKUdfhtkW2c=; b=Kf6DXfQYOoUlzHHOeIppv7J1MSgygai6wmBW8vif8dNwgbGxK2av/pKT53kdYDxFaoYpTJ teL/nROkuSqukJySz5iwnWd1iKeriQHh5BwJY51y9fzlJ/mj49nkcra1t02AQ4xHwp3bit KwWLhLGUqELG+v1PWjfM5YHuM8CyPgo= X-MC-Unique: yuU8eUgHMQaNgnuoXNqQIg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 09/10] ch_monitor: Use automatic mutex management Date: Fri, 25 Mar 2022 16:02:21 +0100 Message-Id: <20220325150222.78919-10-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: 1648220566947100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/ch/ch_monitor.c | 55 ++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/src/ch/ch_monitor.c b/src/ch/ch_monitor.c index 84085b7991..2c6b83a1b5 100644 --- a/src/ch/ch_monitor.c +++ b/src/ch/ch_monitor.c @@ -648,14 +648,13 @@ virCHMonitorCurlPerform(CURL *handle) int virCHMonitorPutNoContent(virCHMonitor *mon, const char *endpoint) { + VIR_LOCK_GUARD lock =3D virObjectLockGuard(mon); g_autofree char *url =3D NULL; int responseCode =3D 0; int ret =3D -1; =20 url =3D g_strdup_printf("%s/%s", URL_ROOT, endpoint); =20 - virObjectLock(mon); - /* reset all options of a libcurl session handle at first */ curl_easy_reset(mon->handle); =20 @@ -666,8 +665,6 @@ virCHMonitorPutNoContent(virCHMonitor *mon, const char = *endpoint) =20 responseCode =3D virCHMonitorCurlPerform(mon->handle); =20 - virObjectUnlock(mon); - if (responseCode =3D=3D 200 || responseCode =3D=3D 204) ret =3D 0; =20 @@ -707,26 +704,24 @@ virCHMonitorGet(virCHMonitor *mon, const char *endpoi= nt, virJSONValue **response =20 url =3D g_strdup_printf("%s/%s", URL_ROOT, endpoint); =20 - virObjectLock(mon); + VIR_WITH_OBJECT_LOCK_GUARD(mon) { + /* reset all options of a libcurl session handle at first */ + curl_easy_reset(mon->handle); =20 - /* reset all options of a libcurl session handle at first */ - curl_easy_reset(mon->handle); + curl_easy_setopt(mon->handle, CURLOPT_UNIX_SOCKET_PATH, mon->socke= tpath); + curl_easy_setopt(mon->handle, CURLOPT_URL, url); =20 - curl_easy_setopt(mon->handle, CURLOPT_UNIX_SOCKET_PATH, mon->socketpat= h); - curl_easy_setopt(mon->handle, CURLOPT_URL, url); + if (response) { + headers =3D curl_slist_append(headers, "Accept: application/js= on"); + headers =3D curl_slist_append(headers, "Content-Type: applicat= ion/json"); + curl_easy_setopt(mon->handle, CURLOPT_HTTPHEADER, headers); + curl_easy_setopt(mon->handle, CURLOPT_WRITEFUNCTION, curl_call= back); + curl_easy_setopt(mon->handle, CURLOPT_WRITEDATA, (void *)&data= ); + } =20 - if (response) { - headers =3D curl_slist_append(headers, "Accept: application/json"); - headers =3D curl_slist_append(headers, "Content-Type: application/= json"); - curl_easy_setopt(mon->handle, CURLOPT_HTTPHEADER, headers); - curl_easy_setopt(mon->handle, CURLOPT_WRITEFUNCTION, curl_callback= ); - curl_easy_setopt(mon->handle, CURLOPT_WRITEDATA, (void *)&data); + responseCode =3D virCHMonitorCurlPerform(mon->handle); } =20 - responseCode =3D virCHMonitorCurlPerform(mon->handle); - - virObjectUnlock(mon); - if (responseCode =3D=3D 200 || responseCode =3D=3D 204) { if (response) { data.content =3D g_realloc(data.content, data.size + 1); @@ -863,20 +858,18 @@ virCHMonitorCreateVM(virCHMonitor *mon, nnicindexes, nicindexes) !=3D 0) return -1; =20 - virObjectLock(mon); - - /* reset all options of a libcurl session handle at first */ - curl_easy_reset(mon->handle); - - curl_easy_setopt(mon->handle, CURLOPT_UNIX_SOCKET_PATH, mon->socketpat= h); - curl_easy_setopt(mon->handle, CURLOPT_URL, url); - curl_easy_setopt(mon->handle, CURLOPT_CUSTOMREQUEST, "PUT"); - curl_easy_setopt(mon->handle, CURLOPT_HTTPHEADER, headers); - curl_easy_setopt(mon->handle, CURLOPT_POSTFIELDS, payload); + VIR_WITH_OBJECT_LOCK_GUARD(mon) { + /* reset all options of a libcurl session handle at first */ + curl_easy_reset(mon->handle); =20 - responseCode =3D virCHMonitorCurlPerform(mon->handle); + curl_easy_setopt(mon->handle, CURLOPT_UNIX_SOCKET_PATH, mon->socke= tpath); + curl_easy_setopt(mon->handle, CURLOPT_URL, url); + curl_easy_setopt(mon->handle, CURLOPT_CUSTOMREQUEST, "PUT"); + curl_easy_setopt(mon->handle, CURLOPT_HTTPHEADER, headers); + curl_easy_setopt(mon->handle, CURLOPT_POSTFIELDS, payload); =20 - virObjectUnlock(mon); + responseCode =3D virCHMonitorCurlPerform(mon->handle); + } =20 if (responseCode =3D=3D 200 || responseCode =3D=3D 204) ret =3D 0; --=20 2.31.1 From nobody Tue May 14 20:33:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1648220565; cv=none; d=zohomail.com; s=zohoarc; b=FrqGkgTDarRUa29RSLgoClwIFkFm7cnvlrg8cPDwNd0ajC4IwbowgFU5Jew3/CX98M8pghe1827o7hPV/RBPntJA9tHPaTyaPafpVgeY7Qc+R3GjiGhI8O2b1kNUVtZDZH6P2UwMyjv6mYDN/o59JeB4du4dEJk769CPtURUNaY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648220565; 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=jCHGHWDo4iHkJFiMxr//e46vR9910fSgqSKP1kDczxk=; b=kcLDk3DTsUlnj8QfWePLBFDaQ/FJ/Kw/qhzVcJeZjl9aJnPSkwJw1Q1cRlZebANA1GpV1kskTyKc5o7Ltk6HAfqb94DbL9pD9gpbGWAQz6UTIqzUihcZlG9KYgjSEGSEeQDoRXA5wh3xdLW5jrfze1gssqaX1gXUqJu39GAM7Sc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1648220565562751.1646527657; Fri, 25 Mar 2022 08:02:45 -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-664-2MjXjCQZO-qcGc1qK-re0g-1; Fri, 25 Mar 2022 11:02:41 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6C3AD3C14847; Fri, 25 Mar 2022 15:02:33 +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 5864214582E2; Fri, 25 Mar 2022 15:02:33 +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 08D4F1940361; Fri, 25 Mar 2022 15:02:33 +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 24C7B194036C for ; Fri, 25 Mar 2022 15:02:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 17697C27D91; Fri, 25 Mar 2022 15:02:31 +0000 (UTC) Received: from work.fritz.box (unknown [10.39.194.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C8D2C1D3AD; Fri, 25 Mar 2022 15:02:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648220564; 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=jCHGHWDo4iHkJFiMxr//e46vR9910fSgqSKP1kDczxk=; b=jMX+FAIEVfxr7v3p5hw+xr4kozbklAbAIcO7kYg3W9+vSzRG3gkZSePgwYJmbv2mCm3m4n GcYyC0UhHaIRHYUidLChhl645PmBQnt+eH4tP/v6GQ9A14+tZFwlZGVZhGrIPDYKa12YVv 0gEKX7IYGdyRHNp7TGWekiwVrQGCTXo= X-MC-Unique: 2MjXjCQZO-qcGc1qK-re0g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 10/10] virportallocator: Use automatic mutex management Date: Fri, 25 Mar 2022 16:02:22 +0100 Message-Id: <20220325150222.78919-11-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.85 on 10.11.54.7 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: 1648220566890100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/util/virportallocator.c | 93 ++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 53 deletions(-) diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index 5e63470848..44edd8f99a 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -204,7 +204,6 @@ int virPortAllocatorAcquire(const virPortAllocatorRange *range, unsigned short *port) { - int ret =3D -1; size_t i; virPortAllocator *pa =3D virPortAllocatorGet(); =20 @@ -213,44 +212,39 @@ virPortAllocatorAcquire(const virPortAllocatorRange *= range, if (!pa) return -1; =20 - virObjectLock(pa); - - for (i =3D range->start; i <=3D range->end && !*port; i++) { - bool used =3D false, v6used =3D false; - - if (virBitmapIsBitSet(pa->bitmap, i)) - continue; - - if (virPortAllocatorBindToPort(&v6used, i, AF_INET6) < 0 || - virPortAllocatorBindToPort(&used, i, AF_INET) < 0) - goto cleanup; - - if (!used && !v6used) { - /* Add port to bitmap of reserved ports */ - if (virBitmapSetBit(pa->bitmap, i) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to reserve port %zu"), i); - goto cleanup; + VIR_WITH_OBJECT_LOCK_GUARD(pa) { + for (i =3D range->start; i <=3D range->end; i++) { + bool used =3D false, v6used =3D false; + + if (virBitmapIsBitSet(pa->bitmap, i)) + continue; + + if (virPortAllocatorBindToPort(&v6used, i, AF_INET6) < 0 || + virPortAllocatorBindToPort(&used, i, AF_INET) < 0) + return -1; + + if (!used && !v6used) { + /* Add port to bitmap of reserved ports */ + if (virBitmapSetBit(pa->bitmap, i) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to reserve port %zu"), i); + return -1; + } + *port =3D i; + return 0; } - *port =3D i; - ret =3D 0; } } =20 - if (*port =3D=3D 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to find an unused port in range '%s' (%d-= %d)"), - range->name, range->start, range->end); - } - cleanup: - virObjectUnlock(pa); - return ret; + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to find an unused port in range '%s' (%d-%d)"= ), + range->name, range->start, range->end); + return -1; } =20 int virPortAllocatorRelease(unsigned short port) { - int ret =3D -1; virPortAllocator *pa =3D virPortAllocatorGet(); =20 if (!pa) @@ -259,25 +253,21 @@ virPortAllocatorRelease(unsigned short port) if (!port) return 0; =20 - virObjectLock(pa); - - if (virBitmapClearBit(pa->bitmap, port) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to release port %d"), - port); - goto cleanup; + VIR_WITH_OBJECT_LOCK_GUARD(pa) { + if (virBitmapClearBit(pa->bitmap, port) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to release port %d"), + port); + return -1; + } } =20 - ret =3D 0; - cleanup: - virObjectUnlock(pa); - return ret; + return 0; } =20 int virPortAllocatorSetUsed(unsigned short port) { - int ret =3D -1; virPortAllocator *pa =3D virPortAllocatorGet(); =20 if (!pa) @@ -286,17 +276,14 @@ virPortAllocatorSetUsed(unsigned short port) if (!port) return 0; =20 - virObjectLock(pa); - - if (virBitmapIsBitSet(pa->bitmap, port) || - virBitmapSetBit(pa->bitmap, port) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to reserve port %d"), port); - goto cleanup; + VIR_WITH_OBJECT_LOCK_GUARD(pa) { + if (virBitmapIsBitSet(pa->bitmap, port) || + virBitmapSetBit(pa->bitmap, port) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to reserve port %d"), port); + return -1; + } } =20 - ret =3D 0; - cleanup: - virObjectUnlock(pa); - return ret; + return 0; } --=20 2.31.1