From nobody Mon Feb 9 16:13:02 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=1646823851; cv=none; d=zohomail.com; s=zohoarc; b=fOhD3Jx+g4tw3UDbMRX4a1s0TbNlnnZanoY+RFZ2hJGC1oYXFmH3jcNon6tmhq6QP4dpcCv35uBm8pw6JnQy0jz76zngO/GufKBId89qnsRkfj/HEeKexfUr/l94ZWc1TzTT9qsptIaDJfJEb7wVZG3TVU9SW8tuukgmTo7EWFI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646823851; 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=7rMBn5qVlrhCazO2KW9JEstQmGrO4JWIMdBU6AhSQjY=; b=FP/JIYrEb47VrpP7AZpXRWUCuWbUS8uvsHsA8/jsJi5Trz2nAehCCKAUqgZ7tVGK8MIwfIwjPDLfu+VFSOWoJZdBTAmJMvecr1ZIGsRCsRQA55Uy8kYOYC4ccIxq+004fi42khmPr8cPpLsl+Mu2YtgA1Bx5oqFJb8PruRfzQqY= 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 1646823851743580.5611676932114; Wed, 9 Mar 2022 03:04:11 -0800 (PST) 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-581-51KGV8ZmOlKjU-pnvF8BvQ-1; Wed, 09 Mar 2022 06:04:10 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 68AFD811E9B; Wed, 9 Mar 2022 11:04:08 +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 566827C33C8; Wed, 9 Mar 2022 11:04:08 +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 1FB6B196A5D2; Wed, 9 Mar 2022 11:04:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B6FE4196A5E5 for ; Wed, 9 Mar 2022 11:03:57 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 693D81059178; Wed, 9 Mar 2022 11:03:57 +0000 (UTC) Received: from work.redhat.com (unknown [10.39.195.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC9C21059176; Wed, 9 Mar 2022 11:03:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646823851; 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=7rMBn5qVlrhCazO2KW9JEstQmGrO4JWIMdBU6AhSQjY=; b=MioIC5dBPfGkOd74VdV8cWC/fj2k+YK7J2CzHROmwUtDwnVfWpUmMJxXgM4Ngtciy1LsQa T0i5/aHnIaj94+HbNhRr2mSo1V6pzBq29Te+xwJRneb+SFhdo4Wpr97asso+RUi5fbl6Ou ZGv61Y4+AErkX6Vz9esufMhuvg7zJT0= X-MC-Unique: 51KGV8ZmOlKjU-pnvF8BvQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 09/12] nwfilter_ipaddrmap: Use automatic mutex management Date: Wed, 9 Mar 2022 12:02:27 +0100 Message-Id: <20220309110230.24213-10-twiederh@redhat.com> In-Reply-To: <20220309110230.24213-1-twiederh@redhat.com> References: <20220309110230.24213-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.9 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: 1646823854092100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/nwfilter_ipaddrmap.c | 80 ++++++++++++++--------------------- 1 file changed, 31 insertions(+), 49 deletions(-) diff --git a/src/conf/nwfilter_ipaddrmap.c b/src/conf/nwfilter_ipaddrmap.c index e2f123b9d9..4090cc2769 100644 --- a/src/conf/nwfilter_ipaddrmap.c +++ b/src/conf/nwfilter_ipaddrmap.c @@ -49,37 +49,28 @@ static GHashTable *ipAddressMap; int virNWFilterIPAddrMapAddIPAddr(const char *ifname, char *addr) { - int ret =3D -1; - char *addrCopy; + g_autofree char *addrCopy =3D g_strdup(addr); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&ipAddressMapLock); virNWFilterVarValue *val; =20 - addrCopy =3D g_strdup(addr); - - virMutexLock(&ipAddressMapLock); - - val =3D virHashLookup(ipAddressMap, ifname); - if (!val) { - val =3D virNWFilterVarValueCreateSimple(addrCopy); - if (!val) - goto cleanup; - addrCopy =3D NULL; - ret =3D virHashUpdateEntry(ipAddressMap, ifname, val); - if (ret < 0) - virNWFilterVarValueFree(val); - goto cleanup; - } else { + if ((val =3D virHashLookup(ipAddressMap, ifname)) !=3D NULL) { if (virNWFilterVarValueAddValue(val, addrCopy) < 0) - goto cleanup; + return -1; + addrCopy =3D NULL; + return 0; } =20 - ret =3D 0; + if ((val =3D virNWFilterVarValueCreateSimple(addrCopy)) =3D=3D NULL) + return -1; =20 - cleanup: - virMutexUnlock(&ipAddressMapLock); - VIR_FREE(addrCopy); + addrCopy =3D NULL; + if (virHashUpdateEntry(ipAddressMap, ifname, val) < 0) { + virNWFilterVarValueFree(val); + return -1; + } =20 - return ret; + return 0; } =20 /* Delete all or a specific IP address from an interface. After this @@ -99,31 +90,28 @@ virNWFilterIPAddrMapAddIPAddr(const char *ifname, char = *addr) int virNWFilterIPAddrMapDelIPAddr(const char *ifname, const char *ipaddr) { - int ret =3D -1; + VIR_LOCK_GUARD lock =3D virLockGuardLock(&ipAddressMapLock); virNWFilterVarValue *val =3D NULL; =20 - virMutexLock(&ipAddressMapLock); - - if (ipaddr !=3D NULL) { - val =3D virHashLookup(ipAddressMap, ifname); - if (val) { - if (virNWFilterVarValueGetCardinality(val) =3D=3D 1 && - STREQ(ipaddr, - virNWFilterVarValueGetNthValue(val, 0))) - goto remove_entry; - virNWFilterVarValueDelValue(val, ipaddr); - ret =3D virNWFilterVarValueGetCardinality(val); - } - } else { - remove_entry: + if (!ipaddr) { /* remove whole entry */ virHashRemoveEntry(ipAddressMap, ifname); - ret =3D 0; + return 0; + } + + if (!(val =3D virHashLookup(ipAddressMap, ifname))) { + return -1; } =20 - virMutexUnlock(&ipAddressMapLock); + if (virNWFilterVarValueGetCardinality(val) =3D=3D 1 && + STREQ(ipaddr, virNWFilterVarValueGetNthValue(val, 0))) { + /* remove whole entry */ + virHashRemoveEntry(ipAddressMap, ifname); + return 0; + } =20 - return ret; + virNWFilterVarValueDelValue(val, ipaddr); + return virNWFilterVarValueGetCardinality(val); } =20 /* Get the list of IP addresses known to be in use by an interface @@ -135,15 +123,9 @@ virNWFilterIPAddrMapDelIPAddr(const char *ifname, cons= t char *ipaddr) virNWFilterVarValue * virNWFilterIPAddrMapGetIPAddr(const char *ifname) { - virNWFilterVarValue *res; - - virMutexLock(&ipAddressMapLock); - - res =3D virHashLookup(ipAddressMap, ifname); - - virMutexUnlock(&ipAddressMapLock); + VIR_LOCK_GUARD lock =3D virLockGuardLock(&ipAddressMapLock); =20 - return res; + return virHashLookup(ipAddressMap, ifname); } =20 int --=20 2.31.1