mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 05:47:55 +00:00
Code Issues Releases Wiki Activity

mac-learning: Simplify mac_learning_changed().

Browse Source 
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 <ethan@nicira.com>
This commit is contained in:
Ethan Jackson 2013-06-12 13:58:16 -07:00
parent 8961699e03
commit ae1736c07c
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/mac-learning.c
View File

@ -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,23 @@ 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. Causes
* mac_learning_run() to flag for revalidation 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.)
*
* 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 +324,12 @@ void
mac_learning_run(struct mac_learning *ml, struct tag_set *set)
{
struct mac_entry *e;
if (set) {
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)) {
@ -336,7 +344,8 @@ mac_learning_run(struct mac_learning *ml, struct tag_set *set)
void
mac_learning_wait(struct mac_learning *ml)
{
if (hmap_count(&ml->table) > ml->max_entries) {
if (hmap_count(&ml->table) > ml->max_entries
|| !tag_set_is_empty(&ml->tags)) {
poll_immediate_wake();
} else if (!list_is_empty(&ml->lrus)) {
struct mac_entry *e = mac_entry_from_lru_node(ml->lrus.next);

3
lib/mac-learning.h
View File

@ -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 *,

3
ofproto/ofproto-dpif-xlate.c
View File

@ -466,8 +466,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);
}
}