projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bridge: Make bridge_pick_local_hw_addr() easier to reason.
[openvswitch]
/
lib
/
mac-learning.c
diff --git
a/lib/mac-learning.c
b/lib/mac-learning.c
index 4bb9f2a2a59d7ec73c715b8bb67839d647dcdb47..efd1dd4b8b052dfdfee62598eae7c3baa854eeff 100644
(file)
--- a/
lib/mac-learning.c
+++ b/
lib/mac-learning.c
@@
-46,9
+46,10
@@
mac_entry_age(const struct mac_entry *e)
}
static uint32_t
}
static uint32_t
-mac_table_hash(const uint8_t mac[ETH_ADDR_LEN], uint16_t vlan)
+mac_table_hash(const struct mac_learning *ml, const uint8_t mac[ETH_ADDR_LEN],
+ uint16_t vlan)
{
{
- return hash_bytes(mac, ETH_ADDR_LEN, vlan);
+ return hash_bytes(mac, ETH_ADDR_LEN, vlan
^ ml->secret
);
}
static struct mac_entry *
}
static struct mac_entry *
@@
-64,8
+65,7
@@
static tag_type
make_unknown_mac_tag(const struct mac_learning *ml,
const uint8_t mac[ETH_ADDR_LEN], uint16_t vlan)
{
make_unknown_mac_tag(const struct mac_learning *ml,
const uint8_t mac[ETH_ADDR_LEN], uint16_t vlan)
{
- uint32_t h = hash_int(ml->secret, mac_table_hash(mac, vlan));
- return tag_create_deterministic(h);
+ return tag_create_deterministic(mac_table_hash(ml, mac, vlan));
}
static struct mac_entry *
}
static struct mac_entry *
@@
-74,7
+74,7
@@
mac_entry_lookup(const struct mac_learning *ml,
{
struct mac_entry *e;
{
struct mac_entry *e;
- HMAP_FOR_EACH_WITH_HASH (e, hmap_node, mac_table_hash(mac, vlan),
+ HMAP_FOR_EACH_WITH_HASH (e, hmap_node, mac_table_hash(m
l, m
ac, vlan),
&ml->table) {
if (e->vlan == vlan && eth_addr_equals(e->mac, mac)) {
return e;
&ml->table) {
if (e->vlan == vlan && eth_addr_equals(e->mac, mac)) {
return e;
@@
-103,16
+103,10
@@
struct mac_learning *
mac_learning_create(void)
{
struct mac_learning *ml;
mac_learning_create(void)
{
struct mac_learning *ml;
- int i;
ml = xmalloc(sizeof *ml);
list_init(&ml->lrus);
ml = xmalloc(sizeof *ml);
list_init(&ml->lrus);
- list_init(&ml->free);
hmap_init(&ml->table);
hmap_init(&ml->table);
- for (i = 0; i < MAC_MAX; i++) {
- struct mac_entry *s = &ml->entries[i];
- list_push_front(&ml->free, &s->lru_node);
- }
ml->secret = random_uint32();
ml->flood_vlans = NULL;
return ml;
ml->secret = random_uint32();
ml->flood_vlans = NULL;
return ml;
@@
-123,7
+117,14
@@
void
mac_learning_destroy(struct mac_learning *ml)
{
if (ml) {
mac_learning_destroy(struct mac_learning *ml)
{
if (ml) {
+ struct mac_entry *e, *next;
+
+ HMAP_FOR_EACH_SAFE (e, next, hmap_node, &ml->table) {
+ hmap_remove(&ml->table, &e->hmap_node);
+ free(e);
+ }
hmap_destroy(&ml->table);
hmap_destroy(&ml->table);
+
bitmap_free(ml->flood_vlans);
free(ml);
}
bitmap_free(ml->flood_vlans);
free(ml);
}
@@
-148,7
+149,7
@@
mac_learning_set_flood_vlans(struct mac_learning *ml,
static bool
is_learning_vlan(const struct mac_learning *ml, uint16_t vlan)
{
static bool
is_learning_vlan(const struct mac_learning *ml, uint16_t vlan)
{
- return
vlan_bitmap_contains
(ml->flood_vlans, vlan);
+ return
!ml->flood_vlans || !bitmap_is_set
(ml->flood_vlans, vlan);
}
/* Returns true if 'src_mac' may be learned on 'vlan' for 'ml'.
}
/* Returns true if 'src_mac' may be learned on 'vlan' for 'ml'.
@@
-179,21
+180,24
@@
mac_learning_insert(struct mac_learning *ml,
e = mac_entry_lookup(ml, src_mac, vlan);
if (!e) {
e = mac_entry_lookup(ml, src_mac, vlan);
if (!e) {
- if (!list_is_empty(&ml->free)) {
- e = mac_entry_from_lru_node(ml->free.next);
-
} else
{
-
e = mac_entry_from_lru_node(ml->lrus.next
);
-
hmap_remove(&ml->table, &e->hmap_nod
e);
+ uint32_t hash = mac_table_hash(ml, src_mac, vlan);
+
+
if (hmap_count(&ml->table) >= MAC_MAX)
{
+
get_lru(ml, &e
);
+
mac_learning_expire(ml,
e);
}
}
- hmap_insert(&ml->table, &e->hmap_node, mac_table_hash(src_mac, vlan));
+
+ e = xmalloc(sizeof *e);
+ hmap_insert(&ml->table, &e->hmap_node, hash);
memcpy(e->mac, src_mac, ETH_ADDR_LEN);
e->vlan = vlan;
e->tag = 0;
e->grat_arp_lock = TIME_MIN;
memcpy(e->mac, src_mac, ETH_ADDR_LEN);
e->vlan = vlan;
e->tag = 0;
e->grat_arp_lock = TIME_MIN;
+ } else {
+ list_remove(&e->lru_node);
}
/* Mark 'e' as recently used. */
}
/* Mark 'e' as recently used. */
- list_remove(&e->lru_node);
list_push_back(&ml->lrus, &e->lru_node);
e->expires = time_now() + MAC_ENTRY_IDLE_TIME;
list_push_back(&ml->lrus, &e->lru_node);
e->expires = time_now() + MAC_ENTRY_IDLE_TIME;
@@
-247,14
+251,13
@@
mac_learning_lookup(const struct mac_learning *ml,
}
}
}
}
-/* Expires 'e' from the 'ml' hash table. 'e' must not already be on the free
- * list. */
+/* Expires 'e' from the 'ml' hash table. */
void
mac_learning_expire(struct mac_learning *ml, struct mac_entry *e)
{
hmap_remove(&ml->table, &e->hmap_node);
list_remove(&e->lru_node);
void
mac_learning_expire(struct mac_learning *ml, struct mac_entry *e)
{
hmap_remove(&ml->table, &e->hmap_node);
list_remove(&e->lru_node);
-
list_push_front(&ml->free, &e->lru_nod
e);
+
free(
e);
}
/* Expires all the mac-learning entries in 'ml'. The tags in 'ml' are
}
/* Expires all the mac-learning entries in 'ml'. The tags in 'ml' are
@@
-267,6
+270,7
@@
mac_learning_flush(struct mac_learning *ml)
while (get_lru(ml, &e)){
mac_learning_expire(ml, e);
}
while (get_lru(ml, &e)){
mac_learning_expire(ml, e);
}
+ hmap_shrink(&ml->table);
}
void
}
void