From nobody Wed Feb 11 01:26:12 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=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 --- 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