diff mbox series

[ovs-dev] lflow: Add MAC bindings when new datapath is added to chassis

Message ID 20220425082642.1367462-1-amusil@redhat.com
State Superseded
Headers show
Series [ovs-dev] lflow: Add MAC bindings when new datapath is added to chassis | expand

Checks

Context Check Description
ovsrobot/apply-robot warning apply and check: warning
ovsrobot/github-robot-_Build_and_Test fail github build: failed
ovsrobot/github-robot-_ovn-kubernetes fail github build: failed

Commit Message

Ales Musil April 25, 2022, 8:26 a.m. UTC 
It can happen that MAC binding physical flow is not created
on when new datapath is added to chassis.

Consider following scenario:
Chassis are set with "ovn-monitor-all=true".

T0 - The CH0 have only DP0
T1 - MAC binding table gets new update for DP1
T2 - This is reported to CH0 and ignored as DP1 is not local for CH0
T3 - The DP1 is added to CH0

Under this scenario the MAC binding is never
considered on the CH0 and the flow table.
The CH0 is missing those MAC bindings that arrived in
the time when DP1 was not local.

When chassis gets new datapath add all MAC bindings
to prevent this issue.

Reported-at: https://bugzilla.redhat.com/2069783
Signed-off-by: Ales Musil <amusil@redhat.com>
---
 controller/lflow.c          | 21 +++++++++++++++++++++
 controller/lflow.h          |  2 ++
 controller/ovn-controller.c | 22 ++++++++++++++++++++++
 3 files changed, 45 insertions(+)

Comments

0-day Robot April 25, 2022, 4:22 p.m. UTC | #1 
Bleep bloop.  Greetings Ales Musil, I am a robot and I have tried out your patch.
Thanks for your contribution.

I encountered some error that I wasn't expecting.  See the details below.


checkpatch:
WARNING: Line is 86 characters long (recommended limit is 79)
#42 FILE: controller/lflow.c:2650:
            sbrec_mac_binding_index_init_row(l_ctx_in->sbrec_mac_binding_by_datapath);

WARNING: Line is 98 characters long (recommended limit is 79)
#45 FILE: controller/lflow.c:2653:
    SBREC_MAC_BINDING_FOR_EACH_EQUAL (mb, mb_index_row, l_ctx_in->sbrec_mac_binding_by_datapath) {

WARNING: Line is 95 characters long (recommended limit is 79)
#46 FILE: controller/lflow.c:2654:
        consider_neighbor_flow(l_ctx_in->sbrec_port_binding_by_name, l_ctx_in->local_datapaths,

WARNING: Line is 100 characters long (recommended limit is 79)
#52 FILE: controller/lflow.c:2660:
            sbrec_static_mac_binding_index_init_row(l_ctx_in->sbrec_static_mac_binding_by_datapath);

WARNING: Line is 94 characters long (recommended limit is 79)
#56 FILE: controller/lflow.c:2664:
                                             l_ctx_in->sbrec_static_mac_binding_by_datapath) {

WARNING: Line is 95 characters long (recommended limit is 79)
#57 FILE: controller/lflow.c:2665:
        consider_neighbor_flow(l_ctx_in->sbrec_port_binding_by_name, l_ctx_in->local_datapaths,

WARNING: Line is 90 characters long (recommended limit is 79)
#104 FILE: controller/ovn-controller.c:2422:
    l_ctx_in->sbrec_static_mac_binding_by_datapath = sbrec_static_mac_binding_by_datapath;

Lines checked: 134, Warnings: 7, Errors: 0


Please check this out.  If you feel there has been an error, please email aconole@redhat.com

Thanks,
0-day Robot
diff mbox series

Patch

diff --git a/controller/lflow.c b/controller/lflow.c
index b7ddeb1c0..98c96cdf0 100644
--- a/controller/lflow.c
+++ b/controller/lflow.c
@@ -2646,6 +2646,27 @@  lflow_add_flows_for_datapath(const struct sbrec_datapath_binding *dp,
     }
     sbrec_fdb_index_destroy_row(fdb_index_row);
 
+    struct sbrec_mac_binding *mb_index_row =
+            sbrec_mac_binding_index_init_row(l_ctx_in->sbrec_mac_binding_by_datapath);
+    sbrec_mac_binding_index_set_datapath(mb_index_row, dp);
+    const struct sbrec_mac_binding *mb;
+    SBREC_MAC_BINDING_FOR_EACH_EQUAL (mb, mb_index_row, l_ctx_in->sbrec_mac_binding_by_datapath) {
+        consider_neighbor_flow(l_ctx_in->sbrec_port_binding_by_name, l_ctx_in->local_datapaths,
+                               mb, NULL, l_ctx_out->flow_table, 100);
+    }
+    sbrec_mac_binding_index_destroy_row(mb_index_row);
+
+    struct sbrec_static_mac_binding *smb_index_row =
+            sbrec_static_mac_binding_index_init_row(l_ctx_in->sbrec_static_mac_binding_by_datapath);
+    sbrec_static_mac_binding_index_set_datapath(smb_index_row, dp);
+    const struct sbrec_static_mac_binding *smb;
+    SBREC_STATIC_MAC_BINDING_FOR_EACH_EQUAL (smb, smb_index_row,
+                                             l_ctx_in->sbrec_static_mac_binding_by_datapath) {
+        consider_neighbor_flow(l_ctx_in->sbrec_port_binding_by_name, l_ctx_in->local_datapaths,
+                               NULL, smb, l_ctx_out->flow_table, 100);
+    }
+    sbrec_static_mac_binding_index_destroy_row(smb_index_row);
+
     dhcp_opts_destroy(&dhcp_opts);
     dhcp_opts_destroy(&dhcpv6_opts);
     nd_ra_opts_destroy(&nd_ra_opts);
diff --git a/controller/lflow.h b/controller/lflow.h
index 4003a15a5..ba2efcebd 100644
--- a/controller/lflow.h
+++ b/controller/lflow.h
@@ -136,6 +136,8 @@  struct lflow_ctx_in {
     struct ovsdb_idl_index *sbrec_logical_flow_by_logical_dp_group;
     struct ovsdb_idl_index *sbrec_port_binding_by_name;
     struct ovsdb_idl_index *sbrec_fdb_by_dp_key;
+    struct ovsdb_idl_index *sbrec_mac_binding_by_datapath;
+    struct ovsdb_idl_index *sbrec_static_mac_binding_by_datapath;
     const struct sbrec_port_binding_table *port_binding_table;
     const struct sbrec_dhcp_options_table *dhcp_options_table;
     const struct sbrec_dhcpv6_options_table *dhcpv6_options_table;
diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c
index b68010d8b..140b102f5 100644
--- a/controller/ovn-controller.c
+++ b/controller/ovn-controller.c
@@ -2326,6 +2326,16 @@  init_lflow_ctx(struct engine_node *node,
                 engine_get_input("SB_fdb", node),
                 "dp_key");
 
+    struct ovsdb_idl_index *sbrec_mac_binding_by_datapath =
+            engine_ovsdb_node_get_index(
+                    engine_get_input("SB_mac_binding", node),
+                    "datapath");
+
+    struct ovsdb_idl_index *sbrec_static_mac_binding_by_datapath =
+            engine_ovsdb_node_get_index(
+                    engine_get_input("SB_static_mac_binding", node),
+                    "datapath");
+
     struct sbrec_port_binding_table *port_binding_table =
         (struct sbrec_port_binding_table *)EN_OVSDB_GET(
             engine_get_input("SB_port_binding", node));
@@ -2408,6 +2418,8 @@  init_lflow_ctx(struct engine_node *node,
         sbrec_logical_flow_by_dp_group;
     l_ctx_in->sbrec_port_binding_by_name = sbrec_port_binding_by_name;
     l_ctx_in->sbrec_fdb_by_dp_key = sbrec_fdb_by_dp_key;
+    l_ctx_in->sbrec_mac_binding_by_datapath = sbrec_mac_binding_by_datapath;
+    l_ctx_in->sbrec_static_mac_binding_by_datapath = sbrec_static_mac_binding_by_datapath;
     l_ctx_in->port_binding_table = port_binding_table;
     l_ctx_in->dhcp_options_table  = dhcp_table;
     l_ctx_in->dhcpv6_options_table = dhcpv6_table;
@@ -3277,6 +3289,12 @@  main(int argc, char *argv[])
         = ovsdb_idl_index_create2(ovnsb_idl_loop.idl,
                                   &sbrec_fdb_col_mac,
                                   &sbrec_fdb_col_dp_key);
+    struct ovsdb_idl_index *sbrec_mac_binding_by_datapath
+            = ovsdb_idl_index_create1(ovnsb_idl_loop.idl,
+                                      &sbrec_mac_binding_col_datapath);
+    struct ovsdb_idl_index *sbrec_static_mac_binding_by_datapath
+            = ovsdb_idl_index_create1(ovnsb_idl_loop.idl,
+                                      &sbrec_static_mac_binding_col_datapath);
 
     ovsdb_idl_track_add_all(ovnsb_idl_loop.idl);
     ovsdb_idl_omit_alert(ovnsb_idl_loop.idl,
@@ -3511,6 +3529,10 @@  main(int argc, char *argv[])
                                 sbrec_datapath_binding_by_key);
     engine_ovsdb_node_add_index(&en_sb_fdb, "dp_key",
                                 sbrec_fdb_by_dp_key);
+    engine_ovsdb_node_add_index(&en_sb_mac_binding, "datapath",
+                                sbrec_mac_binding_by_datapath);
+    engine_ovsdb_node_add_index(&en_sb_static_mac_binding, "datapath",
+                                sbrec_static_mac_binding_by_datapath);
 
     struct ed_type_lflow_output *lflow_output_data =
         engine_get_internal_data(&en_lflow_output);