Evaluates change for SB port-binding in runtime_data node.
If the port-binding change has no impact for the runtime_data it will
not trigger runtime_data change.
Signed-off-by: Han Zhou <hzh...@ebay.com>
---
ovn/controller/binding.c | 91 +++++++++++++++++++++++++++++++++++++++++
ovn/controller/binding.h | 7 ++++
ovn/controller/ovn-controller.c | 42 ++++++++++++++++++-
3 files changed, 139 insertions(+), 1 deletion(-)
diff --git a/ovn/controller/binding.c b/ovn/controller/binding.c
index a4b30cb..7ec6074 100644
--- a/ovn/controller/binding.c
+++ b/ovn/controller/binding.c
@@ -615,6 +615,97 @@ binding_run(struct ovsdb_idl_txn *ovnsb_idl_txn,
hmap_destroy(&qos_map);
}
+static bool
+is_our_chassis(struct ovsdb_idl_index *sbrec_chassis_by_name,
+ const struct sbrec_chassis *chassis_rec,
+ const struct sbrec_port_binding *binding_rec,
+ const struct sset *active_tunnels,
+ const struct shash *lport_to_iface,
+ const struct sset *local_lports)
+{
+ const struct ovsrec_interface *iface_rec
+ = shash_find_data(lport_to_iface, binding_rec->logical_port);
+ struct ovs_list *gateway_chassis = NULL;
+
+ bool our_chassis = false;
+ if (iface_rec
+ || (binding_rec->parent_port && binding_rec->parent_port[0] &&
+ sset_contains(local_lports, binding_rec->parent_port))) {
+ /* This port is in our chassis unless it is a localport. */
+ if (strcmp(binding_rec->type, "localport")) {
+ our_chassis = true;
+ }
+ } else if (!strcmp(binding_rec->type, "l2gateway")) {
+ const char *chassis_id = smap_get(&binding_rec->options,
+ "l2gateway-chassis");
+ our_chassis = chassis_id && !strcmp(chassis_id, chassis_rec->name);
+ } else if (!strcmp(binding_rec->type, "chassisredirect")) {
+ gateway_chassis = gateway_chassis_get_ordered(sbrec_chassis_by_name,
+ binding_rec);
+ if (gateway_chassis &&
+ gateway_chassis_contains(gateway_chassis, chassis_rec)) {
+
+ our_chassis = gateway_chassis_is_active(
+ gateway_chassis, chassis_rec, active_tunnels);
+
+ }
+ gateway_chassis_destroy(gateway_chassis);
+ } else if (!strcmp(binding_rec->type, "l3gateway")) {
+ const char *chassis_id = smap_get(&binding_rec->options,
+ "l3gateway-chassis");
+ our_chassis = chassis_id && !strcmp(chassis_id, chassis_rec->name);
+ } else if (!strcmp(binding_rec->type, "localnet")) {
+ our_chassis = false;
+ }
+
+ return our_chassis;
+}
+
+/* Returns true if port-binding changes potentially require flow changes on
+ * the current chassis. Returns false if we are sure there is no impact. */
+bool
+binding_evaluate_port_binding_changes(
+ struct ovsdb_idl_index *sbrec_chassis_by_name,
+ const struct sbrec_port_binding_table *pb_table,
+ const struct ovsrec_bridge *br_int,
+ const struct sbrec_chassis *chassis_rec,
+ struct sset *active_tunnels,
+ struct sset *local_lports)
+{
+ if (!chassis_rec) {
+ return true;
+ }
+
+ const struct sbrec_port_binding *binding_rec;
+ struct shash lport_to_iface = SHASH_INITIALIZER(&lport_to_iface);
+ struct sset egress_ifaces = SSET_INITIALIZER(&egress_ifaces);
+ if (br_int) {
+ get_local_iface_ids(br_int, &lport_to_iface, local_lports,
+ &egress_ifaces);
+ }
+ SBREC_PORT_BINDING_TABLE_FOR_EACH_TRACKED (binding_rec, pb_table) {
+ /* XXX: currently OVSDB change tracking doesn't support getting old
+ * data when the operation is update, so if a port-binding moved from
+ * this chassis to another, we would not know it with this check.
+ * However, if the port is unbound from this chassis, the local ovsdb
+ * interface table will be updated, which will trigger recompute.
+ * If the port is still bound on this chassis, then below check
+ * is_our_chassis() will take care of that case. */
+ if (binding_rec->chassis == chassis_rec) {
+ return true;
+ }
+ if (is_our_chassis(sbrec_chassis_by_name, chassis_rec, binding_rec,
+ active_tunnels, &lport_to_iface, local_lports)
+ || !strcmp(binding_rec->type, "patch")
+ || !strcmp(binding_rec->type, "localport")
+ || !strcmp(binding_rec->type, "vtep")
+ || !strcmp(binding_rec->type, "localnet")) {
+ return true;
+ }
+ }
+ return false;
+}
+
/* Returns true if the database is all cleaned up, false if more work is
* required. */
bool
diff --git a/ovn/controller/binding.h b/ovn/controller/binding.h
index 837e109..6c62cc5 100644
--- a/ovn/controller/binding.h
+++ b/ovn/controller/binding.h
@@ -48,5 +48,12 @@ void binding_run(struct ovsdb_idl_txn *ovnsb_idl_txn,
bool binding_cleanup(struct ovsdb_idl_txn *ovnsb_idl_txn,
const struct sbrec_port_binding_table *,
const struct sbrec_chassis *);
+bool binding_evaluate_port_binding_changes(
+ struct ovsdb_idl_index *sbrec_chassis_by_name,
+ const struct sbrec_port_binding_table *,
+ const struct ovsrec_bridge *br_int,
+ const struct sbrec_chassis *,
+ struct sset *active_tunnels,
+ struct sset *local_lports);
#endif /* ovn/binding.h */
diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c
index 5c24cba..ba589fe 100644
--- a/ovn/controller/ovn-controller.c
+++ b/ovn/controller/ovn-controller.c
@@ -796,6 +796,46 @@ en_runtime_data_run(struct engine_node *node)
node->changed = true;
}
+static bool
+runtime_data_sb_port_binding_handler(struct engine_node *node)
+{
+ struct ed_type_runtime_data *data =
+ (struct ed_type_runtime_data *)node->data;
+ struct sset *local_lports = &data->local_lports;
+ struct sset *active_tunnels = &data->active_tunnels;
+
+ struct ovsrec_open_vswitch_table *ovs_table =
+ (struct ovsrec_open_vswitch_table *)EN_OVSDB_GET(
+ engine_get_input("OVS_open_vswitch", node));
+ struct ovsrec_bridge_table *bridge_table =
+ (struct ovsrec_bridge_table *)EN_OVSDB_GET(
+ engine_get_input("OVS_bridge", node));
+ const char *chassis_id = get_chassis_id(ovs_table);
+ const struct ovsrec_bridge *br_int = get_br_int(bridge_table, ovs_table);
+
+ ovs_assert(br_int && chassis_id);
+
+ struct ovsdb_idl_index *sbrec_chassis_by_name =
+ engine_ovsdb_node_get_index(
+ engine_get_input("SB_chassis", node),
+ "name");
+
+ const struct sbrec_chassis *chassis
+ = chassis_lookup_by_name(sbrec_chassis_by_name, chassis_id);
+ ovs_assert(chassis);
+
+ struct sbrec_port_binding_table *pb_table =
+ (struct sbrec_port_binding_table *)EN_OVSDB_GET(
+ engine_get_input("SB_port_binding", node));
+
+ bool changed = binding_evaluate_port_binding_changes(
+ sbrec_chassis_by_name, pb_table,
+ br_int, chassis, active_tunnels,
+ local_lports);
+
+ return !changed;
+}
+
struct ed_type_mff_ovn_geneve {
enum mf_field_id mff_ovn_geneve;
};
@@ -1182,7 +1222,7 @@ main(int argc, char *argv[])
engine_add_input(&en_runtime_data, &en_sb_address_set, NULL);
engine_add_input(&en_runtime_data, &en_sb_port_group, NULL);
engine_add_input(&en_runtime_data, &en_sb_datapath_binding, NULL);
- engine_add_input(&en_runtime_data, &en_sb_port_binding, NULL);
+ engine_add_input(&en_runtime_data, &en_sb_port_binding,
runtime_data_sb_port_binding_handler);
engine_add_input(&en_runtime_data, &en_sb_gateway_chassis, NULL);
engine_init(&en_flow_output);
--
2.1.0
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
