@@ -19,7 +19,9 @@ ovn_controller_ovn_controller_SOURCES = \
ovn/controller/ovn-controller.c \
ovn/controller/ovn-controller.h \
ovn/controller/physical.c \
- ovn/controller/physical.h
+ ovn/controller/physical.h \
+ ovn/controller/filter.c \
+ ovn/controller/filter.h
ovn_controller_ovn_controller_LDADD = ovn/lib/libovn.la lib/libopenvswitch.la
man_MANS += ovn/controller/ovn-controller.8
EXTRA_DIST += ovn/controller/ovn-controller.8.xml
@@ -24,6 +24,8 @@
#include "openvswitch/vlog.h"
#include "ovn/lib/ovn-sb-idl.h"
#include "ovn-controller.h"
+#include "lport.h"
+#include "filter.h"
VLOG_DEFINE_THIS_MODULE(binding);
@@ -60,7 +62,9 @@ binding_register_ovs_idl(struct ovsdb_idl *ovs_idl)
}
static bool
-get_local_iface_ids(const struct ovsrec_bridge *br_int, struct shash *lports)
+get_local_iface_ids(const struct ovsrec_bridge *br_int, struct shash *lports,
+ struct lport_index *lports_index,
+ struct controller_ctx *ctx)
{
int i;
bool changed = false;
@@ -87,6 +91,9 @@ get_local_iface_ids(const struct ovsrec_bridge *br_int, struct shash *lports)
continue;
}
shash_add(&local_ports, iface_id, iface_rec);
+ if (!lport_lookup_by_name(lports_index, iface_id)) {
+ filter_lport(ctx, iface_id);
+ }
if (!shash_find(lports, iface_id)) {
shash_add(lports, iface_id, iface_rec);
changed = true;
@@ -159,8 +166,8 @@ remove_local_datapath_by_binding(struct hmap *local_datapaths,
static void
add_local_datapath(struct hmap *local_datapaths,
- const struct sbrec_port_binding *binding_rec,
- const struct uuid *uuid)
+ const struct sbrec_port_binding *binding_rec,
+ const struct uuid *uuid, struct controller_ctx *ctx)
{
if (get_local_datapath(local_datapaths,
binding_rec->datapath->tunnel_key)) {
@@ -174,6 +181,7 @@ add_local_datapath(struct hmap *local_datapaths,
binding_rec->datapath->tunnel_key);
hmap_insert(&local_datapaths_by_uuid, &ld->uuid_hmap_node,
uuid_hash(uuid));
+ filter_datapath(ctx, binding_rec);
}
static void
@@ -189,6 +197,7 @@ update_qos(const struct ovsrec_interface *iface_rec,
static void
consider_local_datapath(struct controller_ctx *ctx, struct shash *lports,
+ struct lport_index *lports_index,
const struct sbrec_chassis *chassis_rec,
const struct sbrec_port_binding *binding_rec,
struct hmap *local_datapaths)
@@ -203,7 +212,7 @@ consider_local_datapath(struct controller_ctx *ctx, struct shash *lports,
sset_add(&all_lports, binding_rec->logical_port);
}
add_local_datapath(local_datapaths, binding_rec,
- &binding_rec->header_.uuid);
+ &binding_rec->header_.uuid, ctx);
if (iface_rec && ctx->ovs_idl_txn) {
update_qos(iface_rec, binding_rec);
}
@@ -244,7 +253,7 @@ consider_local_datapath(struct controller_ctx *ctx, struct shash *lports,
sbrec_port_binding_set_chassis(binding_rec, chassis_rec);
sset_add(&all_lports, binding_rec->logical_port);
add_local_datapath(local_datapaths, binding_rec,
- &binding_rec->header_.uuid);
+ &binding_rec->header_.uuid, ctx);
}
} else if (chassis_rec && binding_rec->chassis == chassis_rec
&& strcmp(binding_rec->type, "gateway")) {
@@ -261,6 +270,12 @@ consider_local_datapath(struct controller_ctx *ctx, struct shash *lports,
* a patch port for each one. */
sset_add(&all_lports, binding_rec->logical_port);
}
+ const char *peer = smap_get(&binding_rec->options, "peer");
+ if (peer) {
+ if (!lport_lookup_by_name(lports_index, peer)) {
+ filter_lport(ctx, peer);
+ }
+ }
}
/* We persist lports because we need to know when it changes to
@@ -269,7 +284,8 @@ static struct shash lports = SHASH_INITIALIZER(&lports);
void
binding_run(struct controller_ctx *ctx, const struct ovsrec_bridge *br_int,
- const char *chassis_id, struct hmap *local_datapaths)
+ const char *chassis_id, struct lport_index *lports_index,
+ struct hmap *local_datapaths)
{
const struct sbrec_chassis *chassis_rec;
const struct sbrec_port_binding *binding_rec;
@@ -280,7 +296,8 @@ binding_run(struct controller_ctx *ctx, const struct ovsrec_bridge *br_int,
}
if (br_int) {
- if (ctx->ovnsb_idl_txn && get_local_iface_ids(br_int, &lports)) {
+ if (ctx->ovnsb_idl_txn && get_local_iface_ids(br_int, &lports,
+ lports_index, ctx)) {
process_full_binding = true;
}
} else {
@@ -296,8 +313,8 @@ binding_run(struct controller_ctx *ctx, const struct ovsrec_bridge *br_int,
struct hmap keep_local_datapath_by_uuid =
HMAP_INITIALIZER(&keep_local_datapath_by_uuid);
SBREC_PORT_BINDING_FOR_EACH(binding_rec, ctx->ovnsb_idl) {
- consider_local_datapath(ctx, &lports, chassis_rec, binding_rec,
- local_datapaths);
+ consider_local_datapath(ctx, &lports, lports_index, chassis_rec,
+ binding_rec, local_datapaths);
struct local_datapath *ld = xzalloc(sizeof *ld);
memcpy(&ld->uuid, &binding_rec->header_.uuid, sizeof ld->uuid);
hmap_insert(&keep_local_datapath_by_uuid, &ld->uuid_hmap_node,
@@ -317,7 +334,8 @@ binding_run(struct controller_ctx *ctx, const struct ovsrec_bridge *br_int,
if (sbrec_port_binding_is_deleted(binding_rec)) {
remove_local_datapath_by_binding(local_datapaths, binding_rec);
} else {
- consider_local_datapath(ctx, &lports, chassis_rec, binding_rec,
+ consider_local_datapath(ctx, &lports, lports_index,
+ chassis_rec, binding_rec,
local_datapaths);
}
}
@@ -25,11 +25,13 @@ struct ovsdb_idl;
struct ovsrec_bridge;
struct simap;
struct sset;
+struct lport_index;
void binding_register_ovs_idl(struct ovsdb_idl *);
void binding_reset_processing(void);
void binding_run(struct controller_ctx *, const struct ovsrec_bridge *br_int,
- const char *chassis_id, struct hmap *local_datapaths);
+ const char *chassis_id, struct lport_index *lports_index,
+ struct hmap *local_datapaths);
bool binding_cleanup(struct controller_ctx *, const char *chassis_id);
#endif /* ovn/binding.h */
new file mode 100644
@@ -0,0 +1,211 @@
+/* Copyright (c) 2015, 2016 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <config.h>
+#include "filter.h"
+
+#include "openvswitch/vlog.h"
+#include "ovn/lib/ovn-sb-idl.h"
+#include "ovn-controller.h"
+#include "lport.h"
+
+VLOG_DEFINE_THIS_MODULE(filter);
+
+static struct hmap filtered_dps = HMAP_INITIALIZER(&filtered_dps);
+static struct hmap filtered_lps = HMAP_INITIALIZER(&filtered_lps);
+
+struct filtered_dp {
+ struct hmap_node hmap_node;
+ int64_t tunnel_key;
+ struct sbrec_datapath_binding *datapath;
+ bool used;
+};
+
+struct filtered_lp {
+ struct hmap_node hmap_node;
+ const char *lport_name;
+ bool used;
+};
+
+void
+filter_init(struct ovsdb_idl *idl)
+{
+ sbrec_port_binding_add_clause_false(idl);
+ sbrec_mac_binding_add_clause_false(idl);
+ sbrec_logical_flow_add_clause_false(idl);
+ sbrec_multicast_group_add_clause_false(idl);
+}
+
+void
+filter_mark_unused(void)
+{
+ struct filtered_lp *lp;
+ struct filtered_lp *dp;
+
+ HMAP_FOR_EACH(lp, hmap_node, &filtered_lps) {
+ lp->used = false;
+ }
+ HMAP_FOR_EACH(dp, hmap_node, &filtered_dps) {
+ dp->used = false;
+ }
+}
+
+void
+filter_clear(struct ovsdb_idl *idl)
+{
+ struct filtered_lp *lp, *next;
+ struct filtered_lp *dp, *next_dp;
+
+ HMAP_FOR_EACH_SAFE(lp, next, hmap_node, &filtered_lps) {
+ hmap_remove(&filtered_lps, &lp->hmap_node);
+ free(lp);
+ }
+ HMAP_FOR_EACH_SAFE(dp, next_dp, hmap_node, &filtered_dps) {
+ hmap_remove(&filtered_dps, &dp->hmap_node);
+ free(dp);
+ }
+
+ ovsdb_idl_condition_reset(idl,
+ &sbrec_table_port_binding);
+ ovsdb_idl_condition_reset(idl,
+ &sbrec_table_logical_flow);
+ ovsdb_idl_condition_reset(idl,
+ &sbrec_table_mac_binding);
+ ovsdb_idl_condition_reset(idl,
+ &sbrec_table_multicast_group);
+}
+
+static struct filtered_dp *
+lookup_dp_by_pb(const struct sbrec_port_binding *pb)
+{
+ struct filtered_dp *dp;
+
+ HMAP_FOR_EACH_WITH_HASH(dp, hmap_node, pb->datapath->tunnel_key,
+ &filtered_dps) {
+ if (dp->tunnel_key == pb->datapath->tunnel_key) {
+ return dp;
+ }
+ }
+ return NULL;
+}
+
+void
+filter_remove_unused(struct controller_ctx *ctx,
+ const struct lport_index *lports_index)
+{
+ struct filtered_lp *lp, *next;
+ struct filtered_dp *dp, *next_dp;
+
+ HMAP_FOR_EACH_SAFE(lp, next, hmap_node, &filtered_lps) {
+ if (!lp->used) {
+ const struct sbrec_port_binding *pb =
+ lport_lookup_by_name(lports_index, lp->lport_name);
+ if (!pb) {
+ continue;
+ }
+ if (lookup_dp_by_pb(pb)) {
+ VLOG_INFO("Unfilter Port %s", lp->lport_name);
+ sbrec_port_binding_remove_clause_logical_port(ctx->ovnsb_idl,
+ OVSDB_F_EQ,
+ lp->lport_name);
+ hmap_remove(&filtered_lps, &lp->hmap_node);
+ free(lp);
+ break;
+ }
+ }
+ }
+ HMAP_FOR_EACH_SAFE(dp, next_dp, hmap_node, &filtered_dps) {
+ if (!dp->used) {
+ VLOG_INFO("Unfilter DP "UUID_FMT,
+ UUID_ARGS(&dp->datapath->header_.uuid));
+ sbrec_port_binding_remove_clause_datapath(ctx->ovnsb_idl,
+ OVSDB_F_EQ,
+ dp->datapath);
+ sbrec_mac_binding_remove_clause_datapath(ctx->ovnsb_idl,
+ OVSDB_F_EQ,
+ dp->datapath);
+ sbrec_logical_flow_remove_clause_logical_datapath(ctx->ovnsb_idl,
+ OVSDB_F_EQ,
+ dp->datapath);
+ sbrec_multicast_group_remove_clause_datapath(ctx->ovnsb_idl,
+ OVSDB_F_EQ,
+ dp->datapath);
+ hmap_remove(&filtered_dps, &dp->hmap_node);
+ free(dp);
+ }
+ }
+}
+
+void
+filter_lport(struct controller_ctx *ctx, const char *lport_name)
+{
+ struct filtered_lp *lp;
+ size_t hash = hash_bytes(lport_name, strlen(lport_name), 0);
+
+ HMAP_FOR_EACH_WITH_HASH(lp, hmap_node, hash, &filtered_lps) {
+ if (!strcmp(lp->lport_name, lport_name)) {
+ lp->used = true;
+ return;
+ }
+ }
+
+ VLOG_INFO("Filter Port %s", lport_name);
+
+ sbrec_port_binding_add_clause_logical_port(ctx->ovnsb_idl,
+ OVSDB_F_EQ,
+ lport_name);
+
+ char *name = xmalloc(strlen(lport_name));
+ lp = xmalloc(sizeof *lp);
+
+ strcpy(name, lport_name);
+ lp->lport_name = name;
+ lp->used = true;
+ hmap_insert(&filtered_lps, &lp->hmap_node,
+ hash);
+}
+
+void
+filter_datapath(struct controller_ctx *ctx,
+ const struct sbrec_port_binding *pb)
+{
+ struct filtered_dp *dp;
+
+ dp = lookup_dp_by_pb(pb);
+ if (dp) {
+ dp->used = true;
+ return;
+ }
+
+ VLOG_INFO("Filter DP "UUID_FMT, UUID_ARGS(&pb->datapath->header_.uuid));
+ sbrec_port_binding_add_clause_datapath(ctx->ovnsb_idl,
+ OVSDB_F_EQ,
+ pb->datapath);
+ sbrec_mac_binding_add_clause_datapath(ctx->ovnsb_idl,
+ OVSDB_F_EQ,
+ pb->datapath);
+ sbrec_logical_flow_add_clause_logical_datapath(ctx->ovnsb_idl,
+ OVSDB_F_EQ,
+ pb->datapath);
+ sbrec_multicast_group_add_clause_datapath(ctx->ovnsb_idl,
+ OVSDB_F_EQ,
+ pb->datapath);
+
+ dp = xmalloc(sizeof *dp);
+ dp->tunnel_key = pb->datapath->tunnel_key;
+ dp->datapath = pb->datapath;
+ dp->used = true;
+ hmap_insert(&filtered_dps, &dp->hmap_node, pb->datapath->tunnel_key);
+}
new file mode 100644
@@ -0,0 +1,33 @@
+/* Copyright (c) 2015 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OVN_FILTER_H
+#define OVN_FILTER_H 1
+
+struct controller_ctx;
+struct ovsdb_idl;
+struct sbrec_port_binding;
+struct lport_index;
+
+void filter_init(struct ovsdb_idl *idl);
+void filter_clear(struct ovsdb_idl *idl);
+void filter_mark_unused(void);
+void filter_remove_unused(struct controller_ctx *ctx,
+ const struct lport_index *lports);
+void filter_lport(struct controller_ctx *ctx, const char *lport_name);
+void filter_datapath(struct controller_ctx *ctx,
+ const struct sbrec_port_binding *pb);
+
+#endif /* ovn/controller/filter.h */
@@ -54,6 +54,7 @@
#include "stream.h"
#include "unixctl.h"
#include "util.h"
+#include "filter.h"
VLOG_DEFINE_THIS_MODULE(main);
@@ -379,6 +380,8 @@ main(int argc, char *argv[])
struct ovsdb_idl_loop ovnsb_idl_loop = OVSDB_IDL_LOOP_INITIALIZER(
ovsdb_idl_create(ovnsb_remote, &sbrec_idl_class, true, true));
+ filter_init(ovnsb_idl_loop.idl);
+
/* Track the southbound idl. */
ovsdb_idl_track_add_all(ovnsb_idl_loop.idl);
@@ -404,6 +407,7 @@ main(int argc, char *argv[])
binding_reset_processing();
lport_index_clear(&lports);
mcgroup_index_clear(&mcgroups);
+ filter_clear(ovnsb_idl_loop.idl);
} else {
free(new_ovnsb_remote);
}
@@ -422,19 +426,20 @@ main(int argc, char *argv[])
const struct ovsrec_bridge *br_int = get_br_int(&ctx);
const char *chassis_id = get_chassis_id(ctx.ovs_idl);
+ lport_index_fill(&lports, ctx.ovnsb_idl);
+ mcgroup_index_fill(&mcgroups, ctx.ovnsb_idl);
+ filter_mark_unused();
+
if (chassis_id) {
chassis_run(&ctx, chassis_id);
encaps_run(&ctx, br_int, chassis_id);
- binding_run(&ctx, br_int, chassis_id, &local_datapaths);
+ binding_run(&ctx, br_int, chassis_id, &lports, &local_datapaths);
}
if (br_int && chassis_id) {
patch_run(&ctx, br_int, chassis_id, &local_datapaths,
&patched_datapaths);
- lport_index_fill(&lports, ctx.ovnsb_idl);
- mcgroup_index_fill(&mcgroups, ctx.ovnsb_idl);
-
enum mf_field_id mff_ovn_geneve = ofctrl_run(br_int);
pinctrl_run(&ctx, &lports, br_int, chassis_id, &local_datapaths);
@@ -454,6 +459,7 @@ main(int argc, char *argv[])
hmap_destroy(&flow_table);
}
+ filter_remove_unused(&ctx, &lports);
sset_destroy(&all_lports);
unixctl_server_run(unixctl);
@@ -22,6 +22,7 @@
#include "lib/vswitch-idl.h"
#include "openvswitch/vlog.h"
#include "ovn-controller.h"
+#include "filter.h"
VLOG_DEFINE_THIS_MODULE(patch);
@@ -250,7 +251,8 @@ add_bridge_mappings(struct controller_ctx *ctx,
static void
add_patched_datapath(struct hmap *patched_datapaths,
- const struct sbrec_port_binding *binding_rec, bool local)
+ const struct sbrec_port_binding *binding_rec, bool local,
+ struct controller_ctx *ctx)
{
struct patched_datapath *pd = get_patched_datapath(patched_datapaths,
binding_rec->datapath->tunnel_key);
@@ -268,6 +270,7 @@ add_patched_datapath(struct hmap *patched_datapaths,
/* stale is set to false. */
hmap_insert(patched_datapaths, &pd->hmap_node,
binding_rec->datapath->tunnel_key);
+ filter_datapath(ctx, binding_rec);
}
static void
@@ -360,7 +363,7 @@ add_logical_patch_ports(struct controller_ctx *ctx,
existing_ports);
free(dst_name);
free(src_name);
- add_patched_datapath(patched_datapaths, binding, local_port);
+ add_patched_datapath(patched_datapaths, binding, local_port, ctx);
if (local_port) {
if (binding->chassis != chassis_rec && ctx->ovnsb_idl_txn) {
sbrec_port_binding_set_chassis(binding, chassis_rec);
@@ -92,11 +92,14 @@ AT_CHECK([ovn-sbctl \
-- --id=@dp2 create Datapath_Binding tunnel_key=2 \
-- create Port_Binding datapath=@dp1 logical_port=foo tunnel_key=1 type=patch options:peer=bar \
-- create Port_Binding datapath=@dp2 logical_port=bar tunnel_key=2 type=patch options:peer=foo \
+ -- create Port_Binding datapath=@dp1 logical_port=localvif3 tunnel_key=3 \
| ${PERL} $srcdir/uuidfilt.pl], [0], [<0>
<1>
<2>
<3>
+<4>
])
+ovs-vsctl add-port br-int localvif3 -- set Interface localvif3 external_ids:iface-id=localvif3
check_patches \
'br-int patch-br-int-to-localnet2 patch-localnet2-to-br-int' \
'br-eth0 patch-localnet2-to-br-int patch-br-int-to-localnet2' \
@@ -1351,6 +1351,7 @@ sim_add hv_gw
as hv_gw
ovs-vsctl add-br br-phys
ovn_attach n1 br-phys 192.168.0.3
+ovs-vsctl add-port br-int viflp-gw -- set Interface viflp-gw external-ids:iface-id=lp-gw
ovs-vsctl add-br br-phys2
net_attach n2 br-phys2
ovs-vsctl set open . external_ids:ovn-bridge-mappings="physnet1:br-phys2"
Conditional monitor of: Port_Binding, Logical_Flow, Multicast_Group MAC_Binding tables. As a result ovn-controller will be notified only about records belongs to a datapath that is being served by this hypervisor. Performance evaluation: OVN is the main candidate for conditional monitoring usage. It is clear that conditional monitoring reduces computation on the ovn-controller (client) side due to the reduced size of flow tables and update messages. Performance evaluation shows up to 75% computation reduction. However, performance evaluation shows also a reduction in computation on the SB ovsdb-server side proportional to the degree that each logical network is spread over physical hosts in the DC. Evaluation shows that in a realistic scenarios there is a computation reduction also in the server side. Evaluation on simulated environment of 50 hosts and 1000 logical ports shows the following results (cycles #): LN spread over # hosts| master | patch | change ------------------------------------------------------------- 1 | 24597200127 | 24339235374 | 1.0% 6 | 23788521572 | 19145229352 | 19.5% 12 | 23886405758 | 17913143176 | 25.0% 18 | 25812686279 | 23675094540 | 8.2% 24 | 28414671499 | 24770202308 | 12.8% 30 | 31487218890 | 28397543436 | 9.8% 36 | 36116993930 | 34105388739 | 5.5% 42 | 37898342465 | 38647139083 | -1.9% 48 | 41637996229 | 41846616306 | -0.5% 50 | 41679995357 | 43455565977 | -4.2% Signed-off-by: Liran Schour <lirans@il.ibm.com> --- ovn/controller/automake.mk | 4 +- ovn/controller/binding.c | 38 ++++++-- ovn/controller/binding.h | 4 +- ovn/controller/filter.c | 211 ++++++++++++++++++++++++++++++++++++++++ ovn/controller/filter.h | 33 +++++++ ovn/controller/ovn-controller.c | 14 ++- ovn/controller/patch.c | 7 +- tests/ovn-controller.at | 3 + tests/ovn.at | 1 + 9 files changed, 297 insertions(+), 18 deletions(-) create mode 100644 ovn/controller/filter.c create mode 100644 ovn/controller/filter.h