With this patch, the mac_learning module takes responsibility for
remembering tags which need revalidation after a
mac_learning_changed() call. This removes one of
ofproto-dpif-xlate's dpif_backer uses.
Signed-off-by: Ethan Jackson <et...@nicira.com>
---
lib/mac-learning.c | 15 +++++++++------
lib/mac-learning.h | 3 ++-
ofproto/ofproto-dpif-xlate.c | 3 +--
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/lib/mac-learning.c b/lib/mac-learning.c
index 052ac48..d66f331 100644
--- a/lib/mac-learning.c
+++ b/lib/mac-learning.c
@@ -123,6 +123,7 @@ mac_learning_create(unsigned int idle_time)
ml->flood_vlans = NULL;
ml->idle_time = normalize_idle_time(idle_time);
ml->max_entries = MAC_DEFAULT_MAX;
+ tag_set_init(&ml->tags);
return ml;
}
@@ -245,22 +246,20 @@ mac_learning_insert(struct mac_learning *ml,
return e;
}
-/* Changes 'e''s tag to a new, randomly selected one, and returns the tag that
- * would have been previously used for this entry's MAC and VLAN (either before
- * 'e' was inserted, if it is new, or otherwise before its port was updated.)
+/* Changes 'e''s tag to a new, randomly selected one.
*
* The client should call this function after obtaining a MAC learning entry
* from mac_learning_insert(), if the entry is either new or if its learned
* port has changed. */
-tag_type
+void
mac_learning_changed(struct mac_learning *ml, struct mac_entry *e)
{
- tag_type old_tag = e->tag;
+ tag_type tag = e->tag ? e->tag : make_unknown_mac_tag(ml, e->mac, e->vlan);
COVERAGE_INC(mac_learning_learned);
e->tag = tag_create_random();
- return old_tag ? old_tag : make_unknown_mac_tag(ml, e->mac, e->vlan);
+ tag_set_add(&ml->tags, tag);
}
/* Looks up MAC 'dst' for VLAN 'vlan' in 'ml' and returns the associated MAC
@@ -322,6 +321,10 @@ void
mac_learning_run(struct mac_learning *ml, struct tag_set *set)
{
struct mac_entry *e;
+
+ tag_set_union(set, &ml->tags);
+ tag_set_init(&ml->tags);
+
while (get_lru(ml, &e)
&& (hmap_count(&ml->table) > ml->max_entries
|| time_now() >= e->expires)) {
diff --git a/lib/mac-learning.h b/lib/mac-learning.h
index 666b00f..1cbacfe 100644
--- a/lib/mac-learning.h
+++ b/lib/mac-learning.h
@@ -85,6 +85,7 @@ struct mac_learning {
unsigned long *flood_vlans; /* Bitmap of learning disabled VLANs. */
unsigned int idle_time; /* Max age before deleting an entry. */
size_t max_entries; /* Max number of learned MACs. */
+ struct tag_set tags; /* Tags which have changed. */
};
/* Basics. */
@@ -107,7 +108,7 @@ bool mac_learning_may_learn(const struct mac_learning *,
struct mac_entry *mac_learning_insert(struct mac_learning *,
const uint8_t src[ETH_ADDR_LEN],
uint16_t vlan);
-tag_type mac_learning_changed(struct mac_learning *, struct mac_entry *);
+void mac_learning_changed(struct mac_learning *, struct mac_entry *);
/* Lookup. */
struct mac_entry *mac_learning_lookup(const struct mac_learning *,
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index e4b1fd3..e53eaad 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -465,8 +465,7 @@ update_learning_table(struct ofproto_dpif *ofproto,
in_bundle->name, vlan);
mac->port.p = in_bundle;
- tag_set_add(&ofproto->backer->revalidate_set,
- mac_learning_changed(ofproto->ml, mac));
+ mac_learning_changed(ofproto->ml, mac);
}
}
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
