dpif-netdev: Implement conntrack flush interface.

New functions are implemented in the conntrack module to support this.

Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
Acked-by: Flavio Leitner <fbl@sysclose.org>

diff --git a/lib/conntrack.c b/lib/conntrack.c
index 2f75b9f930fbb515a7f0a87280b54f0315da6036..1998cd33d3f72a8d017dcf39f83f0418f9fa1b65 100644 (file)
--- a/lib/conntrack.c
+++ b/lib/conntrack.c
@@ -1171,3 +1171,26 @@ conntrack_dump_done(struct conntrack_dump *dump OVS_UNUSED)
 {
     return 0;
 }
+
+int
+conntrack_flush(struct conntrack *ct, const uint16_t *zone)
+{
+    unsigned i;
+
+    for (i = 0; i < CONNTRACK_BUCKETS; i++) {
+        struct conn *conn, *next;
+
+        ct_lock_lock(&ct->buckets[i].lock);
+        HMAP_FOR_EACH_SAFE(conn, next, node, &ct->buckets[i].connections) {
+            if (!zone || *zone == conn->key.zone) {
+                ovs_list_remove(&conn->exp_node);
+                hmap_remove(&ct->buckets[i].connections, &conn->node);
+                atomic_count_dec(&ct->n_conn);
+                delete_conn(conn);
+            }
+        }
+        ct_lock_unlock(&ct->buckets[i].lock);
+    }
+
+    return 0;
+}

diff --git a/lib/conntrack.h b/lib/conntrack.h
index 2f0680eb2ce36e94ab23c840ee27e22a263779e6..8802d35a667046be799e6f4e2505d95a800762d0 100644 (file)
--- a/lib/conntrack.h
+++ b/lib/conntrack.h
@@ -83,6 +83,8 @@ int conntrack_dump_start(struct conntrack *, struct conntrack_dump *,
                          const uint16_t *pzone);
 int conntrack_dump_next(struct conntrack_dump *, struct ct_dpif_entry *);
 int conntrack_dump_done(struct conntrack_dump *);
+
+int conntrack_flush(struct conntrack *, const uint16_t *zone);
 \f
 /* 'struct ct_lock' is a wrapper for an adaptive mutex.  It's useful to try
  * different types of locks (e.g. spinlocks) */

diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index 1d0fbc02e1cbda11bb4a0a5d43a76fa60addcc84..166667f06b8dc8e829538b36ff93fe8512a64333 100644 (file)
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -4593,6 +4593,14 @@ dpif_netdev_ct_dump_done(struct dpif *dpif OVS_UNUSED,
     return err;
 }
 
+static int
+dpif_netdev_ct_flush(struct dpif *dpif, const uint16_t *zone)
+{
+    struct dp_netdev *dp = get_dp_netdev(dpif);
+
+    return conntrack_flush(&dp->conntrack, zone);
+}
+
 const struct dpif_class dpif_netdev_class = {
     "netdev",
     dpif_netdev_init,
@@ -4637,7 +4645,7 @@ const struct dpif_class dpif_netdev_class = {
     dpif_netdev_ct_dump_start,
     dpif_netdev_ct_dump_next,
     dpif_netdev_ct_dump_done,
-    NULL,                       /* ct_flush */
+    dpif_netdev_ct_flush,
 };
 
 static void