From nobody Sat Feb 7 14:16:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1562773687; cv=none; d=zoho.com; s=zohoarc; b=hikQnpouGeEigjRe4UhIbs8JyouGuu7GfHREujsAeY+gPUYPpNdp8TUrFBB+2O9Jbu/uBtQYODL3GQ+QA7pJDsYe99HGSpdLSKlfWb0qn4a9DID36QkI1IOUNz1rYWqdttV2QLpDkaqwen74XKP764qIrA0+jQ5bHpCrXJa/XBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562773687; h=Content-Type:Content-Transfer-Encoding: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:ARC-Authentication-Results; bh=zkr7S5hhOtlZY0ekbsWmNpzg6TJOoIP6Z5tcqaHiAe4=; b=VjvKQ7xsW0SjtTas+TwEpQbykJANXabmt4rskyymhCCqJWmWa+USyN5IlGuInS7LuJN5IQZooDaiZiKlY2DqkN7sHn5gd6+apOtgroAJ5cVq7XSL7y8mqSh7fJttxTlxXPSoCpSR6WIcjcyw2oJpzPIA5NIQ0eyzrkS2CWiYcgQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1562773687470175.0388668336101; Wed, 10 Jul 2019 08:48:07 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4993C7BEFB; Wed, 10 Jul 2019 15:48:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 252C21001DDD; Wed, 10 Jul 2019 15:48:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DA8E4206DE; Wed, 10 Jul 2019 15:48:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x6AFlx9J017824 for ; Wed, 10 Jul 2019 11:47:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id BE19210027BF; Wed, 10 Jul 2019 15:47:59 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-53.ams2.redhat.com [10.36.112.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id C28541001DDD; Wed, 10 Jul 2019 15:47:58 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 10 Jul 2019 16:47:36 +0100 Message-Id: <20190710154741.17065-8-berrange@redhat.com> In-Reply-To: <20190710154741.17065-1-berrange@redhat.com> References: <20190710154741.17065-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 07/12] nwfilter: acquire a pidfile in the driver root directory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 10 Jul 2019 15:48:06 +0000 (UTC) When we allow multiple instances of the driver for the same user account, using a separate root directory, we need to ensure mutual exclusion. Use a pidfile to guarantee this. In privileged libvirtd this ends up locking /var/run/libvirt/nwfilter/driver.pid In unprivileged libvirtd this ends up locking /run/user/$UID/libvirt/nwfilter/run/driver.pid NB, the latter can vary depending on $XDG_RUNTIME_DIR Signed-off-by: Daniel P. Berrang=C3=A9 --- src/conf/virnwfilterobj.h | 4 ++++ src/nwfilter/nwfilter_driver.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/src/conf/virnwfilterobj.h b/src/conf/virnwfilterobj.h index bdf5c51fe2..a6bdfb3864 100644 --- a/src/conf/virnwfilterobj.h +++ b/src/conf/virnwfilterobj.h @@ -36,10 +36,14 @@ struct _virNWFilterDriverState { virMutex lock; bool privileged; =20 + /* pid file FD, ensures two copies of the driver can't use the same ro= ot */ + int lockFD; + virNWFilterObjListPtr nwfilters; =20 virNWFilterBindingObjListPtr bindings; =20 + char *stateDir; char *configDir; char *bindingDir; }; diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index fdfc6f48fa..43561241f6 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -38,6 +38,7 @@ #include "nwfilter_gentech_driver.h" #include "configmake.h" #include "virfile.h" +#include "virpidfile.h" #include "virstring.h" #include "viraccessapicheck.h" =20 @@ -188,6 +189,7 @@ nwfilterStateInitialize(bool privileged, if (VIR_ALLOC(driver) < 0) return -1; =20 + driver->lockFD =3D -1; if (virMutexInit(&driver->lock) < 0) goto err_free_driverstate; =20 @@ -203,6 +205,19 @@ nwfilterStateInitialize(bool privileged, =20 nwfilterDriverLock(); =20 + if (VIR_STRDUP(driver->stateDir, LOCALSTATEDIR "/run/libvirt/nwfilter"= ) < 0) + goto error; + + if (virFileMakePathWithMode(driver->stateDir, S_IRWXU) < 0) { + virReportSystemError(errno, _("cannot create state directory '%s'"= ), + driver->stateDir); + goto error; + } + + if ((driver->lockFD =3D + virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < = 0) + goto error; + if (virNWFilterIPAddrMapInit() < 0) goto err_free_driverstate; if (virNWFilterLearnInit() < 0) @@ -346,6 +361,10 @@ nwfilterStateCleanup(void) =20 nwfilterDriverRemoveDBusMatches(); =20 + if (driver->lockFD !=3D -1) + virPidFileRelease(driver->stateDir, "driver", driver->lockFD); + + VIR_FREE(driver->stateDir); VIR_FREE(driver->configDir); VIR_FREE(driver->bindingDir); nwfilterDriverUnlock(); --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list