/*
- * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "poll-loop.h"
#include "tag.h"
#include "timeval.h"
+#include "unaligned.h"
#include "util.h"
#include "vlan-bitmap.h"
#include "vlog.h"
COVERAGE_DEFINE(mac_learning_learned);
COVERAGE_DEFINE(mac_learning_expired);
-/* Returns the number of seconds since 'e' was last learned. */
+/* Returns the number of seconds since 'e' (within 'ml') was last learned. */
int
-mac_entry_age(const struct mac_entry *e)
+mac_entry_age(const struct mac_learning *ml, const struct mac_entry *e)
{
time_t remaining = e->expires - time_now();
- return MAC_ENTRY_IDLE_TIME - remaining;
+ return ml->idle_time - remaining;
}
static uint32_t
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 ^ ml->secret);
+ unsigned int mac1 = get_unaligned_u32((uint32_t *) mac);
+ unsigned int mac2 = get_unaligned_u16((uint16_t *) (mac + 4));
+ return hash_3words(mac1, mac2 | (vlan << 16), ml->secret);
}
static struct mac_entry *
}
}
-/* Creates and returns a new MAC learning table. */
+static unsigned int
+normalize_idle_time(unsigned int idle_time)
+{
+ return (idle_time < 15 ? 15
+ : idle_time > 3600 ? 3600
+ : idle_time);
+}
+
+/* Creates and returns a new MAC learning table with an initial MAC aging
+ * timeout of 'idle_time' seconds. */
struct mac_learning *
-mac_learning_create(void)
+mac_learning_create(unsigned int idle_time)
{
struct mac_learning *ml;
- int i;
ml = xmalloc(sizeof *ml);
list_init(&ml->lrus);
- list_init(&ml->free);
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;
+ ml->idle_time = normalize_idle_time(idle_time);
return 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);
+
bitmap_free(ml->flood_vlans);
free(ml);
}
}
}
+/* Changes the MAC aging timeout of 'ml' to 'idle_time' seconds. */
+void
+mac_learning_set_idle_time(struct mac_learning *ml, unsigned int idle_time)
+{
+ idle_time = normalize_idle_time(idle_time);
+ if (idle_time != ml->idle_time) {
+ struct mac_entry *e;
+ int delta;
+
+ delta = (int) idle_time - (int) ml->idle_time;
+ LIST_FOR_EACH (e, lru_node, &ml->lrus) {
+ e->expires += delta;
+ }
+ ml->idle_time = idle_time;
+ }
+}
+
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'.
if (!e) {
uint32_t hash = mac_table_hash(ml, src_mac, vlan);
- 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_node);
+ if (hmap_count(&ml->table) >= MAC_MAX) {
+ get_lru(ml, &e);
+ mac_learning_expire(ml, e);
}
+ 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;
+ } else {
+ list_remove(&e->lru_node);
}
/* 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;
+ e->expires = time_now() + ml->idle_time;
return e;
}
}
}
-/* 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);
- list_push_front(&ml->free, &e->lru_node);
+ free(e);
}
-/* Expires all the mac-learning entries in 'ml'. The tags in 'ml' are
- * discarded, so the client is responsible for revalidating any flows that
- * depend on 'ml', if necessary. */
+/* Expires all the mac-learning entries in 'ml'. If not NULL, the tags in 'ml'
+ * are added to 'tags'. Otherwise the tags in 'ml' are discarded. The client
+ * is responsible for revalidating any flows that depend on 'ml', if
+ * necessary. */
void
-mac_learning_flush(struct mac_learning *ml)
+mac_learning_flush(struct mac_learning *ml, struct tag_set *tags)
{
struct mac_entry *e;
while (get_lru(ml, &e)){
+ if (tags) {
+ tag_set_add(tags, e->tag);
+ }
mac_learning_expire(ml, e);
}
+ hmap_shrink(&ml->table);
}
void