Skip Mac Learning support

Author: kgunjikar

northd/en-global-config.c

@@ -54,6 +54,7 @@ en_global_config_init(struct engine_node *node OVS_UNUSED,
     struct ed_type_global_config *data = xzalloc(sizeof *data);
     smap_init(&data->nb_options);
     smap_init(&data->sb_options);
+    sset_init(&data->pf9_mac_learning_skip);
     northd_enable_all_features(data);
     return data;
 }
@@ -100,17 +101,23 @@ en_global_config_run(struct engine_node *node , void *data)
         }
     }
 
-    const char *skip_mac = smap_get(&nb->external_ids,
-                                    "pf9-mac-learning-skip");
-    config_data->pf9_mac_learning_skip_set = false;
-    if (skip_mac) {
-        struct eth_addr ea;
-        if (eth_addr_from_string(skip_mac, &ea)) {
-            snprintf(config_data->pf9_mac_learning_skip,
-                     sizeof config_data->pf9_mac_learning_skip,
-                     ETH_ADDR_FMT, ETH_ADDR_ARGS(ea));
-            config_data->pf9_mac_learning_skip_set = true;
+    const char *skip_macs = smap_get(&nb->external_ids,
+                                     "pf9-mac-learning-skip");
+    sset_clear(&config_data->pf9_mac_learning_skip);
+    if (skip_macs && skip_macs[0]) {
+        struct sset raw = SSET_INITIALIZER(&raw);
+        sset_from_delimited_string(&raw, skip_macs, ", \t\n");
+        const char *mac;
+        SSET_FOR_EACH (mac, &raw) {
+            struct eth_addr ea;
+            if (eth_addr_from_string(mac, &ea)) {
+                char mac_str[ETH_ADDR_STRLEN + 1];
+                snprintf(mac_str, sizeof mac_str, ETH_ADDR_FMT,
+                         ETH_ADDR_ARGS(ea));
+                sset_add(&config_data->pf9_mac_learning_skip, mac_str);
+            }
         }
+        sset_destroy(&raw);
     }
 
     struct smap *options = &config_data->nb_options;
@@ -178,6 +185,7 @@ void en_global_config_cleanup(void *data OVS_UNUSED)
     struct ed_type_global_config *config_data = data;
     smap_destroy(&config_data->nb_options);
     smap_destroy(&config_data->sb_options);
+    sset_destroy(&config_data->pf9_mac_learning_skip);
     destroy_debug_config();
 }
 

northd/en-global-config.h

@@ -6,6 +6,7 @@
 /* OVS includes. */
 #include "lib/packets.h"
 #include "lib/smap.h"
+#include "lib/sset.h"
 
 /* OVN includes. */
 #include "lib/inc-proc-eng.h"
@@ -43,9 +44,8 @@ struct ed_type_global_config {
     char svc_monitor_mac[ETH_ADDR_STRLEN + 1];
     struct eth_addr svc_monitor_mac_ea;
 
-    /* MAC to skip from FDB learning, sourced from NB_Global.external_ids. */
-    bool pf9_mac_learning_skip_set;
-    char pf9_mac_learning_skip[ETH_ADDR_STRLEN + 1];
+    /* MACs to skip from FDB learning, sourced from NB_Global.external_ids. */
+    struct sset pf9_mac_learning_skip;
 
     struct chassis_features features;
 

northd/en-lflow.c

@@ -90,9 +90,9 @@ lflow_get_input_data(struct engine_node *node,
         smap_get_bool(&global_config->nb_options,
                       "pf9-allow-mac-forged-transmits", false);
     lflow_input->pf9_mac_learning_skip =
-        global_config->pf9_mac_learning_skip_set
-        ? global_config->pf9_mac_learning_skip
-        : NULL;
+        sset_is_empty(&global_config->pf9_mac_learning_skip)
+        ? NULL
+        : &global_config->pf9_mac_learning_skip;
 }
 
 void en_lflow_run(struct engine_node *node, void *data)

northd/northd.c

@@ -5758,7 +5758,7 @@ static void
 build_lswitch_learn_fdb_op(
     struct ovn_port *op, struct lflow_table *lflows,
     struct ds *actions, struct ds *match,
-    const char *pf9_mac_learning_skip)
+    const struct sset *pf9_mac_learning_skip)
 {
     ovs_assert(op->nbsp);
 
@@ -5779,9 +5779,12 @@ build_lswitch_learn_fdb_op(
                                           op->lflow_ref);
 
         ds_put_cstr(match, " && "REGBIT_LKUP_FDB" == 0");
-        if (pf9_mac_learning_skip) {
-            ds_put_format(match, " && eth.src != %s",
-                          pf9_mac_learning_skip);
+        if (pf9_mac_learning_skip &&
+            !sset_is_empty(pf9_mac_learning_skip)) {
+            const char *skip_mac;
+            SSET_FOR_EACH (skip_mac, pf9_mac_learning_skip) {
+                ds_put_format(match, " && eth.src != %s", skip_mac);
+            }
         }
         ds_clear(actions);
         ds_put_cstr(actions, "put_fdb(inport, eth.src); next;");
@@ -15794,7 +15797,7 @@ struct lswitch_flow_build_info {
     struct ds actions;
     size_t thread_lflow_counter;
     const char *svc_monitor_mac;
-    const char *pf9_mac_learning_skip;
+    const struct sset *pf9_mac_learning_skip;
 };
 
 /* Helper function to combine all lflow generation which is iterated by
@@ -15877,7 +15880,7 @@ build_lswitch_and_lrouter_iterate_by_lsp(struct ovn_port *op,
                                          const struct hmap *ls_ports,
                                          const struct hmap *lr_ports,
                                          const struct shash *meter_groups,
-                                         const char *pf9_mac_learning_skip,
+                                         const struct sset *pf9_mac_learning_skip,
                                          struct ds *match,
                                          struct ds *actions,
                                          struct lflow_table *lflows)
@@ -16164,7 +16167,7 @@ build_lswitch_and_lrouter_flows(
     const struct chassis_features *features,
     const char *svc_monitor_mac,
     bool pf9_allow_mac_forged_transmits,
-    const char *pf9_mac_learning_skip)
+    const struct sset *pf9_mac_learning_skip)
 {
 
     char *svc_check_match = xasprintf("eth.dst == %s", svc_monitor_mac);

northd/northd.h

@@ -18,6 +18,7 @@
 
 #include "lib/ovn-sb-idl.h"
 #include "lib/ovn-util.h"
+#include "lib/sset.h"
 #include "lib/ovs-atomic.h"
 #include "lib/sset.h"
 #include "northd/en-port-group.h"
@@ -191,7 +192,7 @@ struct lflow_input {
     bool ovn_internal_version_changed;
     const char *svc_monitor_mac;
     bool pf9_allow_mac_forged_transmits;
-    const char *pf9_mac_learning_skip;
+    const struct sset *pf9_mac_learning_skip;
 };
 
 extern int parallelization_state;