[ovs-dev] [PATCH 11/18] ofproto-dpif: Introduce multicast snooping handler
Flavio Leitner
fbl at redhat.com
Fri Apr 11 21:34:16 UTC 2014
It follows mac learning, but since the multicast snooping
feature can be disabled, the locking is handled in the
library.
Signed-off-by: Flavio Leitner <fbl at redhat.com>
---
ofproto/ofproto-dpif-xlate.c | 11 ++++++++++-
ofproto/ofproto-dpif-xlate.h | 4 +++-
ofproto/ofproto-dpif.c | 17 ++++++++++++++++-
3 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index caa7aa6..22798cc 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -33,6 +33,7 @@
#include "learn.h"
#include "list.h"
#include "mac-learning.h"
+#include "mcast-snooping.h"
#include "meta-flow.h"
#include "multipath.h"
#include "netdev-vport.h"
@@ -77,6 +78,7 @@ struct xbridge {
char *name; /* Name used in log messages. */
struct dpif *dpif; /* Datapath interface. */
struct mac_learning *ml; /* Mac learning handle. */
+ struct mcast_snooping *ms; /* Multicast Snooping handle. */
struct mbridge *mbridge; /* Mirroring. */
struct dpif_sflow *sflow; /* SFlow handle, or null. */
struct dpif_ipfix *ipfix; /* Ipfix handle, or null. */
@@ -256,7 +258,8 @@ void
xlate_ofproto_set(struct ofproto_dpif *ofproto, const char *name,
struct dpif *dpif, struct rule_dpif *miss_rule,
struct rule_dpif *no_packet_in_rule,
- const struct mac_learning *ml, struct stp *stp,
+ const struct mac_learning *ml,
+ const struct mcast_snooping *ms, struct stp *stp,
const struct mbridge *mbridge,
const struct dpif_sflow *sflow,
const struct dpif_ipfix *ipfix,
@@ -282,6 +285,11 @@ xlate_ofproto_set(struct ofproto_dpif *ofproto, const char *name,
xbridge->ml = mac_learning_ref(ml);
}
+ if (xbridge->ms != ms) {
+ mcast_snooping_unref(xbridge->ms);
+ xbridge->ms = mcast_snooping_ref(ms);
+ }
+
if (xbridge->mbridge != mbridge) {
mbridge_unref(xbridge->mbridge);
xbridge->mbridge = mbridge_ref(mbridge);
@@ -342,6 +350,7 @@ xlate_remove_ofproto(struct ofproto_dpif *ofproto)
hmap_remove(&xbridges, &xbridge->hmap_node);
mac_learning_unref(xbridge->ml);
+ mcast_snooping_unref(xbridge->ms);
mbridge_unref(xbridge->mbridge);
dpif_sflow_unref(xbridge->sflow);
dpif_ipfix_unref(xbridge->ipfix);
diff --git a/ofproto/ofproto-dpif-xlate.h b/ofproto/ofproto-dpif-xlate.h
index 8b53e10..caf6657 100644
--- a/ofproto/ofproto-dpif-xlate.h
+++ b/ofproto/ofproto-dpif-xlate.h
@@ -31,6 +31,7 @@ struct lacp;
struct dpif_ipfix;
struct dpif_sflow;
struct mac_learning;
+struct mcast_snooping;
struct xlate_recirc {
uint32_t recirc_id; /* !0 Use recirculation instead of output. */
@@ -134,7 +135,8 @@ extern struct ovs_rwlock xlate_rwlock;
void xlate_ofproto_set(struct ofproto_dpif *, const char *name,
struct dpif *, struct rule_dpif *miss_rule,
struct rule_dpif *no_packet_in_rule,
- const struct mac_learning *, struct stp *,
+ const struct mac_learning *,
+ const struct mcast_snooping *, struct stp *,
const struct mbridge *, const struct dpif_sflow *,
const struct dpif_ipfix *, const struct netflow *,
enum ofp_config_flags, bool forward_bpdu,
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 9bc4b71..5c380e4 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -37,6 +37,7 @@
#include "lacp.h"
#include "learn.h"
#include "mac-learning.h"
+#include "mcast-snooping.h"
#include "meta-flow.h"
#include "multipath.h"
#include "netdev-vport.h"
@@ -229,6 +230,7 @@ enum revalidate_reason {
REV_PORT_TOGGLED, /* Port enabled or disabled by CFM, LACP, ...*/
REV_FLOW_TABLE, /* Flow table changed. */
REV_MAC_LEARNING, /* Mac learning changed. */
+ REV_MCAST_SNOOPING, /* multicast snooping changed. */
};
COVERAGE_DEFINE(rev_reconfigure);
COVERAGE_DEFINE(rev_stp);
@@ -236,6 +238,7 @@ COVERAGE_DEFINE(rev_bond);
COVERAGE_DEFINE(rev_port_toggled);
COVERAGE_DEFINE(rev_flow_table);
COVERAGE_DEFINE(rev_mac_learning);
+COVERAGE_DEFINE(rev_mcast_snooping);
/* All datapaths of a given type share a single dpif backer instance. */
struct dpif_backer {
@@ -288,6 +291,7 @@ struct ofproto_dpif {
struct dpif_ipfix *ipfix;
struct hmap bundles; /* Contains "struct ofbundle"s. */
struct mac_learning *ml;
+ struct mcast_snooping *ms;
bool has_bonded_bundles;
bool lacp_enabled;
struct mbridge *mbridge;
@@ -571,6 +575,7 @@ type_run(const char *type)
case REV_PORT_TOGGLED: COVERAGE_INC(rev_port_toggled); break;
case REV_FLOW_TABLE: COVERAGE_INC(rev_flow_table); break;
case REV_MAC_LEARNING: COVERAGE_INC(rev_mac_learning); break;
+ case REV_MCAST_SNOOPING: COVERAGE_INC(rev_mcast_snooping); break;
}
backer->need_revalidate = 0;
@@ -586,7 +591,7 @@ type_run(const char *type)
xlate_ofproto_set(ofproto, ofproto->up.name,
ofproto->backer->dpif, ofproto->miss_rule,
ofproto->no_packet_in_rule, ofproto->ml,
- ofproto->stp, ofproto->mbridge,
+ ofproto->ms, ofproto->stp, ofproto->mbridge,
ofproto->sflow, ofproto->ipfix,
ofproto->netflow, ofproto->up.frag_handling,
ofproto->up.forward_bpdu,
@@ -1127,6 +1132,7 @@ construct(struct ofproto *ofproto_)
ofproto->dump_seq = 0;
hmap_init(&ofproto->bundles);
ofproto->ml = mac_learning_create(MAC_ENTRY_DEFAULT_IDLE_TIME);
+ ofproto->ms = NULL;
ofproto->mbridge = mbridge_create();
ofproto->has_bonded_bundles = false;
ofproto->lacp_enabled = false;
@@ -1307,6 +1313,7 @@ destruct(struct ofproto *ofproto_)
dpif_sflow_unref(ofproto->sflow);
hmap_destroy(&ofproto->bundles);
mac_learning_unref(ofproto->ml);
+ mcast_snooping_unref(ofproto->ms);
hmap_destroy(&ofproto->vlandev_map);
hmap_destroy(&ofproto->realdev_vid_map);
@@ -1333,6 +1340,7 @@ run(struct ofproto *ofproto_)
ovs_rwlock_wrlock(&ofproto->ml->rwlock);
mac_learning_flush(ofproto->ml);
ovs_rwlock_unlock(&ofproto->ml->rwlock);
+ mcast_snooping_mdb_flush(ofproto->ms);
}
/* Do not perform any periodic activity required by 'ofproto' while
@@ -1385,6 +1393,10 @@ run(struct ofproto *ofproto_)
}
ovs_rwlock_unlock(&ofproto->ml->rwlock);
+ if (mcast_snooping_run(ofproto->ms)) {
+ ofproto->backer->need_revalidate = REV_MCAST_SNOOPING;
+ }
+
new_dump_seq = seq_read(udpif_dump_seq(ofproto->backer->udpif));
if (ofproto->dump_seq != new_dump_seq) {
struct rule *rule, *next_rule;
@@ -1451,6 +1463,7 @@ wait(struct ofproto *ofproto_)
ovs_rwlock_rdlock(&ofproto->ml->rwlock);
mac_learning_wait(ofproto->ml);
ovs_rwlock_unlock(&ofproto->ml->rwlock);
+ mcast_snooping_wait(ofproto->ms);
stp_wait(ofproto);
if (ofproto->backer->need_revalidate) {
/* Shouldn't happen, but if it does just go around again. */
@@ -1956,6 +1969,7 @@ update_stp_port_state(struct ofport_dpif *ofport)
ovs_rwlock_wrlock(&ofproto->ml->rwlock);
mac_learning_flush(ofproto->ml);
ovs_rwlock_unlock(&ofproto->ml->rwlock);
+ mcast_snooping_mdb_flush(ofproto->ms);
}
fwd_change = stp_forward_in_state(ofport->stp_state)
!= stp_forward_in_state(state);
@@ -2081,6 +2095,7 @@ stp_run(struct ofproto_dpif *ofproto)
ovs_rwlock_wrlock(&ofproto->ml->rwlock);
mac_learning_flush(ofproto->ml);
ovs_rwlock_unlock(&ofproto->ml->rwlock);
+ mcast_snooping_mdb_flush(ofproto->ms);
}
}
}
--
1.9.0
More information about the dev
mailing list