nwfilter_dhcpsnoop: Replace virNWFilterSnoopReqLock functions

Use automatic mutex management instead.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

src/nwfilter/nwfilter_dhcpsnoop.c

@@ -139,7 +139,7 @@ struct _virNWFilterSnoopReq {
 /*
  * Note about lock-order:
  * 1st: virNWFilterSnoopState.snoopLock
- * 2nd: virNWFilterSnoopReqLock(req)
+ * 2nd: &req->lock
  *
  * Rationale: Former protects the SnoopReqs hash, latter its contents
  */
@@ -246,9 +246,6 @@ static int virNWFilterSnoopReqLeaseDel(virNWFilterSnoopReq *req,
                                        bool update_leasefile,
                                        bool instantiate);
 
-static void virNWFilterSnoopReqLock(virNWFilterSnoopReq *req);
-static void virNWFilterSnoopReqUnlock(virNWFilterSnoopReq *req);
-
 static void virNWFilterSnoopLeaseFileLoad(void);
 static void virNWFilterSnoopLeaseFileSave(virNWFilterSnoopIPLease *ipl);
 
@@ -362,11 +359,9 @@ virNWFilterSnoopIPLeaseTimerAdd(virNWFilterSnoopIPLease *plnew)
     virNWFilterSnoopReq *req = plnew->snoopReq;
 
     /* protect req->start / req->end */
-    virNWFilterSnoopReqLock(req);
+    VIR_LOCK_GUARD lock = virLockGuardLock(&req->lock);
 
     virNWFilterSnoopListAdd(plnew, &req->start, &req->end);
-
-    virNWFilterSnoopReqUnlock(req);
 }
 
 /*
@@ -378,12 +373,9 @@ virNWFilterSnoopIPLeaseTimerDel(virNWFilterSnoopIPLease *ipl)
     virNWFilterSnoopReq *req = ipl->snoopReq;
 
     /* protect req->start / req->end */
-    virNWFilterSnoopReqLock(req);
+    VIR_LOCK_GUARD lock = virLockGuardLock(&req->lock);
 
     virNWFilterSnoopListDel(ipl, &req->start, &req->end);
-
-    virNWFilterSnoopReqUnlock(req);
-
     ipl->timeout = 0;
 }
 
@@ -401,36 +393,24 @@ virNWFilterSnoopIPLeaseInstallRule(virNWFilterSnoopIPLease *ipl,
                                    bool instantiate)
 {
     g_autofree char *ipaddr = virSocketAddrFormat(&ipl->ipAddress);
-    int rc = -1;
+    virNWFilterSnoopReq *req = ipl->snoopReq;
-    virNWFilterSnoopReq *req;
+    VIR_LOCK_GUARD lock = virLockGuardLock(&req->lock);
 
     if (!ipaddr)
         return -1;
 
-    req = ipl->snoopReq;
-
-    /* protect req->binding->portdevname */
-    virNWFilterSnoopReqLock(req);
-
     if (virNWFilterIPAddrMapAddIPAddr(req->binding->portdevname, ipaddr) < 0)
-        goto cleanup;
+        return -1;
 
-    if (!instantiate) {
+    if (!instantiate)
-        rc = 0;
+        return 0;
-        goto cleanup;
-    }
 
     /* instantiate the filters */
 
-    if (req->binding->portdevname) {
+    if (!req->binding->portdevname)
-        rc = virNWFilterInstantiateFilterLate(req->driver,
+        return -1;
-                                              req->binding,
-                                              req->ifindex);
-    }
 
- cleanup:
+    return virNWFilterInstantiateFilterLate(req->driver, req->binding, req->ifindex);
-    virNWFilterSnoopReqUnlock(req);
-    return rc;
 }
 
 /*
@@ -473,7 +453,7 @@ virNWFilterSnoopReqLeaseTimerRun(virNWFilterSnoopReq *req)
     bool is_last = false;
 
     /* protect req->start */
-    virNWFilterSnoopReqLock(req);
+    VIR_LOCK_GUARD lock = virLockGuardLock(&req->lock);
 
     while (req->start && req->start->timeout <= now) {
         if (req->start->next == NULL ||
@@ -483,8 +463,6 @@ virNWFilterSnoopReqLeaseTimerRun(virNWFilterSnoopReq *req)
                                     is_last);
     }
 
-    virNWFilterSnoopReqUnlock(req);
-
     return 0;
 }
 
@@ -562,24 +540,6 @@ virNWFilterSnoopReqFree(virNWFilterSnoopReq *req)
     g_free(req);
 }
 
-/*
- * Lock a Snoop request 'req'
- */
-static void
-virNWFilterSnoopReqLock(virNWFilterSnoopReq *req)
-{
-    virMutexLock(&req->lock);
-}
-
-/*
- * Unlock a Snoop request 'req'
- */
-static void
-virNWFilterSnoopReqUnlock(virNWFilterSnoopReq *req)
-{
-    virMutexUnlock(&req->lock);
-}
-
 /*
  * virNWFilterSnoopReqRelease - hash table free function to kill a request
  */
@@ -592,12 +552,10 @@ virNWFilterSnoopReqRelease(void *req0)
         return;
 
     /* protect req->threadkey */
-    virNWFilterSnoopReqLock(req);
+    VIR_WITH_MUTEX_LOCK_GUARD(&req->lock) {
-
         if (req->threadkey)
             virNWFilterSnoopCancel(&req->threadkey);
-
+    }
-    virNWFilterSnoopReqUnlock(req);
 
     virNWFilterSnoopReqFree(req);
 }
@@ -658,45 +616,33 @@ virNWFilterSnoopReqLeaseAdd(virNWFilterSnoopReq *req,
                             virNWFilterSnoopIPLease *plnew,
                             bool update_leasefile)
 {
+    VIR_LOCK_GUARD lock = virLockGuardLock(&req->lock);
     virNWFilterSnoopIPLease *pl;
 
     plnew->snoopReq = req;
 
-    /* protect req->start and the lease */
-    virNWFilterSnoopReqLock(req);
-
     pl = virNWFilterSnoopIPLeaseGetByIP(req->start, &plnew->ipAddress);
 
     if (pl) {
         virNWFilterSnoopIPLeaseUpdate(pl, plnew->timeout);
-
+        virLockGuardUnlock(&lock);
-        virNWFilterSnoopReqUnlock(req);
+    } else {
-
-        goto cleanup;
-    }
-
-    virNWFilterSnoopReqUnlock(req);
-
         pl = g_new0(virNWFilterSnoopIPLease, 1);
         *pl = *plnew;
 
-    /* protect req->threadkey */
-    virNWFilterSnoopReqLock(req);
-
         if (req->threadkey && virNWFilterSnoopIPLeaseInstallRule(pl, true) < 0) {
-        virNWFilterSnoopReqUnlock(req);
             g_free(pl);
             return -1;
         }
 
-    virNWFilterSnoopReqUnlock(req);
+        virLockGuardUnlock(&lock);
 
         /* put the lease on the req's list */
         virNWFilterSnoopIPLeaseTimerAdd(pl);
 
         g_atomic_int_add(&virNWFilterSnoopState.nLeases, 1);
+    }
 
- cleanup:
     if (update_leasefile)
         virNWFilterSnoopLeaseFileSave(pl);
 
@@ -710,24 +656,19 @@ virNWFilterSnoopReqLeaseAdd(virNWFilterSnoopReq *req,
 static int
 virNWFilterSnoopReqRestore(virNWFilterSnoopReq *req)
 {
-    int ret = 0;
     virNWFilterSnoopIPLease *ipl;
 
     /* protect req->start */
-    virNWFilterSnoopReqLock(req);
+    VIR_LOCK_GUARD lock = virLockGuardLock(&req->lock);
 
     for (ipl = req->start; ipl; ipl = ipl->next) {
         /* instantiate the rules at the last lease */
         bool is_last = (ipl->next == NULL);
-        if (virNWFilterSnoopIPLeaseInstallRule(ipl, is_last) < 0) {
+        if (virNWFilterSnoopIPLeaseInstallRule(ipl, is_last) < 0)
-            ret = -1;
+            return -1;
-            break;
-        }
     }
 
-    virNWFilterSnoopReqUnlock(req);
+    return 0;
-
-    return ret;
 }
 
 /*
@@ -759,16 +700,15 @@ virNWFilterSnoopReqLeaseDel(virNWFilterSnoopReq *req,
     g_autofree char *ipstr = NULL;
 
     /* protect req->start, req->ifname and the lease */
-    virNWFilterSnoopReqLock(req);
+    VIR_LOCK_GUARD lock = virLockGuardLock(&req->lock);
 
     ipl = virNWFilterSnoopIPLeaseGetByIP(req->start, ipaddr);
     if (ipl == NULL)
-        goto lease_not_found;
+        return 0;
 
     ipstr = virSocketAddrFormat(&ipl->ipAddress);
     if (!ipstr) {
-        ret = -1;
+        return -1;
-        goto lease_not_found;
     }
 
     virNWFilterSnoopIPLeaseTimerDel(ipl);
@@ -807,10 +747,6 @@ virNWFilterSnoopReqLeaseDel(virNWFilterSnoopReq *req,
     g_free(ipl);
 
     ignore_value(!!g_atomic_int_dec_and_test(&virNWFilterSnoopState.nLeases));
-
- lease_not_found:
-    virNWFilterSnoopReqUnlock(req);
-
     return ret;
 }
 
@@ -1279,8 +1215,7 @@ virNWFilterDHCPSnoopThread(void *req0)
     /* whoever started us increased the reference counter for the req for us */
 
     /* protect req->binding->portdevname & req->threadkey */
-    virNWFilterSnoopReqLock(req);
+    VIR_WITH_MUTEX_LOCK_GUARD(&req->lock) {
-
         if (req->binding->portdevname && req->threadkey) {
             for (i = 0; i < G_N_ELEMENTS(pcapConf); i++) {
                 pcapConf[i].handle =
@@ -1296,16 +1231,12 @@ virNWFilterDHCPSnoopThread(void *req0)
             }
             tmp = virNetDevGetIndex(req->binding->portdevname, &ifindex);
             threadkey = g_strdup(req->threadkey);
-        worker = virThreadPoolNewFull(1, 1, 0,
+            worker = virThreadPoolNewFull(1, 1, 0, virNWFilterDHCPDecodeWorker,
-                                      virNWFilterDHCPDecodeWorker,
+                                          "dhcp-decode", NULL, req);
-                                      "dhcp-decode",
-                                      NULL,
-                                      req);
         }
 
         /* let creator know how well we initialized */
-    if (error || !threadkey || tmp < 0 || !worker ||
+        if (error || !threadkey || tmp < 0 || !worker || ifindex != req->ifindex) {
-        ifindex != req->ifindex) {
             virErrorPreserveLast(&req->threadError);
             req->threadStatus = THREAD_STATUS_FAIL;
         } else {
@@ -1313,8 +1244,7 @@ virNWFilterDHCPSnoopThread(void *req0)
         }
 
         virCondSignal(&req->threadStatusCond);
-
+    }
-    virNWFilterSnoopReqUnlock(req);
 
     if (req->threadStatus != THREAD_STATUS_OK)
         goto cleanup;
@@ -1362,12 +1292,10 @@ virNWFilterDHCPSnoopThread(void *req0)
                 tmp = -1;
 
                 /* protect req->binding->portdevname */
-                virNWFilterSnoopReqLock(req);
+                VIR_WITH_MUTEX_LOCK_GUARD(&req->lock) {
-
                     if (req->binding->portdevname)
                         tmp = virNetDevValidateConfig(req->binding->portdevname, NULL, ifindex);
-
+                }
-                virNWFilterSnoopReqUnlock(req);
 
                 if (tmp <= 0) {
                     error = true;
@@ -1378,11 +1306,9 @@ virNWFilterDHCPSnoopThread(void *req0)
                     g_clear_pointer(&pcapConf[i].handle, pcap_close);
 
                     /* protect req->binding->portdevname */
-                    virNWFilterSnoopReqLock(req);
+                    VIR_WITH_MUTEX_LOCK_GUARD(&req->lock) {
-
                         virReportError(VIR_ERR_INTERNAL_ERROR,
-                                   _("interface '%s' failing; "
+                                       _("interface '%s' failing; reopening"),
-                                     "reopening"),
                                        req->binding->portdevname);
                         if (req->binding->portdevname)
                             pcapConf[i].handle =
@@ -1390,8 +1316,7 @@ virNWFilterDHCPSnoopThread(void *req0)
                                                          &req->binding->mac,
                                                          pcapConf[i].filter,
                                                          pcapConf[i].dir);
-
+                    }
-                    virNWFilterSnoopReqUnlock(req);
 
                     if (!pcapConf[i].handle) {
                         error = true;
@@ -1448,16 +1373,14 @@ virNWFilterDHCPSnoopThread(void *req0)
     /* protect IfNameToKey */
     VIR_WITH_MUTEX_LOCK_GUARD(&virNWFilterSnoopState.snoopLock) {
         /* protect req->binding->portdevname & req->threadkey */
-        virNWFilterSnoopReqLock(req);
+        VIR_WITH_MUTEX_LOCK_GUARD(&req->lock) {
-
             virNWFilterSnoopCancel(&req->threadkey);
 
             ignore_value(virHashRemoveEntry(virNWFilterSnoopState.ifnameToKey,
                                             req->binding->portdevname));
 
             g_clear_pointer(&req->binding->portdevname, g_free);
-
+        }
-        virNWFilterSnoopReqUnlock(req);
     }
 
  cleanup:
@@ -1563,7 +1486,7 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriver *techdriver,
     }
 
     /* prevent thread from holding req */
-    virNWFilterSnoopReqLock(req);
+    virMutexLock(&req->lock);
 
     if (virThreadCreateFull(&thread, false, virNWFilterDHCPSnoopThread,
                             "dhcp-snoop", false, req) != 0) {
@@ -1604,7 +1527,7 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriver *techdriver,
         goto exit_snoop_cancel;
     }
 
-    virNWFilterSnoopReqUnlock(req);
+    virMutexUnlock(&req->lock);
 
     virMutexUnlock(&virNWFilterSnoopState.snoopLock);
 
@@ -1615,7 +1538,7 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriver *techdriver,
  exit_snoop_cancel:
     virNWFilterSnoopCancel(&req->threadkey);
  exit_snoopreq_unlock:
-    virNWFilterSnoopReqUnlock(req);
+    virMutexUnlock(&req->lock);
  exit_rem_ifnametokey:
     virHashRemoveEntry(virNWFilterSnoopState.ifnameToKey, binding->portdevname);
  exit_snoopunlock:
@@ -1706,12 +1629,11 @@ virNWFilterSnoopPruneIter(const void *payload,
                           const void *data G_GNUC_UNUSED)
 {
     virNWFilterSnoopReq *req = (virNWFilterSnoopReq *)payload;
-    bool del_req;
 
     /* clean up orphaned, expired leases */
 
     /* protect req->threadkey */
-    virNWFilterSnoopReqLock(req);
+    VIR_LOCK_GUARD lock = virLockGuardLock(&req->lock);
 
     if (!req->threadkey)
         virNWFilterSnoopReqLeaseTimerRun(req);
@@ -1719,11 +1641,7 @@ virNWFilterSnoopPruneIter(const void *payload,
     /*
      * have the entry removed if it has no leases and no one holds a ref
      */
-    del_req = ((req->start == NULL) && (g_atomic_int_get(&req->refctr) == 0));
+    return ((req->start == NULL) && (g_atomic_int_get(&req->refctr) == 0));
-
-    virNWFilterSnoopReqUnlock(req);
-
-    return del_req;
 }
 
 /*
@@ -1740,12 +1658,11 @@ virNWFilterSnoopSaveIter(void *payload,
     virNWFilterSnoopIPLease *ipl;
 
     /* protect req->start */
-    virNWFilterSnoopReqLock(req);
+    VIR_LOCK_GUARD lock = virLockGuardLock(&req->lock);
 
     for (ipl = req->start; ipl; ipl = ipl->next)
         ignore_value(virNWFilterSnoopLeaseFileWrite(tfd, req->ifkey, ipl));
 
-    virNWFilterSnoopReqUnlock(req);
     return 0;
 }
 
@@ -1901,7 +1818,7 @@ virNWFilterSnoopRemAllReqIter(const void *payload,
     virNWFilterSnoopReq *req = (virNWFilterSnoopReq *)payload;
 
     /* protect req->binding->portdevname */
-    virNWFilterSnoopReqLock(req);
+    VIR_LOCK_GUARD lock = virLockGuardLock(&req->lock);
 
     if (req->binding && req->binding->portdevname) {
         ignore_value(virHashRemoveEntry(virNWFilterSnoopState.ifnameToKey,
@@ -1917,8 +1834,6 @@ virNWFilterSnoopRemAllReqIter(const void *payload,
         g_clear_pointer(&req->binding->portdevname, g_free);
     }
 
-    virNWFilterSnoopReqUnlock(req);
-
     /* removal will call virNWFilterSnoopCancel() */
     return 1;
 }
@@ -2000,14 +1915,12 @@ virNWFilterDHCPSnoopEnd(const char *ifname)
         }
 
         /* protect req->binding->portdevname & req->threadkey */
-        virNWFilterSnoopReqLock(req);
+        VIR_WITH_MUTEX_LOCK_GUARD(&req->lock) {
-
             /* keep valid lease req; drop interface association */
             virNWFilterSnoopCancel(&req->threadkey);
 
             g_clear_pointer(&req->binding->portdevname, g_free);
-
+        }
-        virNWFilterSnoopReqUnlock(req);
 
         virNWFilterSnoopReqPut(req);
     } else {                      /* free all of them */