[ovs-dev] [PATCH ovn RFC v4 15/24] Pull forwarding groups and admission control to separate functions

anton.ivanov at cambridgegreys.com anton.ivanov at cambridgegreys.com
Wed Sep 2 14:59:41 UTC 2020


From: Anton Ivanov <anton.ivanov at cambridgegreys.com>

Signed-off-by: Anton Ivanov <anton.ivanov at cambridgegreys.com>
---
 northd/ovn-northd.c | 54 +++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c
index 455258dfd..ce0647fe9 100644
--- a/northd/ovn-northd.c
+++ b/northd/ovn-northd.c
@@ -6616,6 +6616,36 @@ build_lswitch_flows_pre_acl_and_acl_od(
     }
 }
 
+static void
+build_lswitch_flows_forwarding_groups(struct ovn_datapath *od, struct hmap *lflows)
+{
+    /* Build logical flows for the forwarding groups */
+    if (!od->nbs || !od->nbs->n_forwarding_groups) {
+        return;
+    }
+    build_fwd_group_lflows(od, lflows);
+}
+
+static void
+build_lswitch_flows_admission_control(struct ovn_datapath *od, struct hmap *lflows)
+{
+
+    /* Logical switch ingress table 0: Admission control framework (priority
+     * 100). */
+    if (od->nbs) {
+        /* Logical VLANs not supported. */
+        ovn_lflow_add(lflows, od, S_SWITCH_IN_PORT_SEC_L2, 100, "vlan.present",
+                      "drop;");
+
+        /* Broadcast/multicast source address is invalid. */
+        ovn_lflow_add(lflows, od, S_SWITCH_IN_PORT_SEC_L2, 100, "eth.src[40]",
+                      "drop;");
+
+        /* Port security flows have priority 50 (see below) and will continue
+         * to the next table if packet source is acceptable. */
+    }
+}
+
 static void
 build_lswitch_flows(struct hmap *datapaths, struct hmap *ports,
                     struct hmap *port_groups, struct hmap *lflows,
@@ -6635,32 +6665,12 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap *ports,
                 od, lflows, meter_groups, lbs, port_groups);
     }
 
-    /* Build logical flows for the forwarding groups */
     HMAP_FOR_EACH (od, key_node, datapaths) {
-        if (!od->nbs || !od->nbs->n_forwarding_groups) {
-            continue;
-        }
-
-        build_fwd_group_lflows(od, lflows);
+        build_lswitch_flows_forwarding_groups(od, lflows);
     }
 
-    /* Logical switch ingress table 0: Admission control framework (priority
-     * 100). */
     HMAP_FOR_EACH (od, key_node, datapaths) {
-        if (!od->nbs) {
-            continue;
-        }
-
-        /* Logical VLANs not supported. */
-        ovn_lflow_add(lflows, od, S_SWITCH_IN_PORT_SEC_L2, 100, "vlan.present",
-                      "drop;");
-
-        /* Broadcast/multicast source address is invalid. */
-        ovn_lflow_add(lflows, od, S_SWITCH_IN_PORT_SEC_L2, 100, "eth.src[40]",
-                      "drop;");
-
-        /* Port security flows have priority 50 (see below) and will continue
-         * to the next table if packet source is acceptable. */
+        build_lswitch_flows_admission_control(od, lflows);
     }
 
     build_lswitch_input_port_sec(ports, datapaths, lflows);
-- 
2.20.1



More information about the dev mailing list