#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/spinlock.h>
-#include <linux/if_bridge.h>
#include <linux/times.h>
+#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <asm/atomic.h>
-#include <asm/uaccess.h>
#include "br_private.h"
static kmem_cache_t *br_fdb_cache;
+static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
+ const unsigned char *addr, int is_local);
void __init br_fdb_init(void)
{
&& time_before_eq(fdb->ageing_timer + hold_time(br), jiffies);
}
-static inline void copy_fdb(struct __fdb_entry *ent,
- const struct net_bridge_fdb_entry *f)
-{
- memset(ent, 0, sizeof(struct __fdb_entry));
- memcpy(ent->mac_addr, f->addr.addr, ETH_ALEN);
- ent->port_no = f->dst?f->dst->port_no:0;
- ent->is_local = f->is_local;
- ent->ageing_timer_value = f->is_static ? 0
- : jiffies_to_clock_t(jiffies - f->ageing_timer);
-}
-
static __inline__ int br_mac_hash(const unsigned char *mac)
{
unsigned long x;
static __inline__ void fdb_delete(struct net_bridge_fdb_entry *f)
{
hlist_del(&f->hlist);
- list_del(&f->age_list);
+ if (!f->is_static)
+ list_del(&f->age_list);
+
br_fdb_put(f);
}
void br_fdb_changeaddr(struct net_bridge_port *p, const unsigned char *newaddr)
{
- struct net_bridge *br;
+ struct net_bridge *br = p->br;
int i;
- int newhash = br_mac_hash(newaddr);
-
- br = p->br;
+
write_lock_bh(&br->hash_lock);
- for (i=0;i<BR_HASH_SIZE;i++) {
+
+ /* Search all chains since old address/hash is unknown */
+ for (i = 0; i < BR_HASH_SIZE; i++) {
struct hlist_node *h;
-
hlist_for_each(h, &br->hash[i]) {
- struct net_bridge_fdb_entry *f
- = hlist_entry(h, struct net_bridge_fdb_entry, hlist);
+ struct net_bridge_fdb_entry *f;
+ f = hlist_entry(h, struct net_bridge_fdb_entry, hlist);
if (f->dst == p && f->is_local) {
- memcpy(f->addr.addr, newaddr, ETH_ALEN);
- if (newhash != i) {
- hlist_del(&f->hlist);
- hlist_add_head(&f->hlist,
- &br->hash[newhash]);
+ /* maybe another port has same hw addr? */
+ struct net_bridge_port *op;
+ list_for_each_entry(op, &br->port_list, list) {
+ if (op != p &&
+ !memcmp(op->dev->dev_addr,
+ f->addr.addr, ETH_ALEN)) {
+ f->dst = op;
+ goto insert;
+ }
}
- goto out;
+
+ /* delete old one */
+ fdb_delete(f);
+ goto insert;
}
}
}
- out:
+ insert:
+ /* insert new address, may fail if invalid address or dup. */
+ fdb_insert(br, p, newaddr, 1);
+
+
write_unlock_bh(&br->hash_lock);
}
unsigned long expires = f->ageing_timer + delay;
if (time_before_eq(expires, jiffies)) {
- if (!f->is_static) {
- pr_debug("expire age %lu jiffies %lu\n",
- f->ageing_timer, jiffies);
- fdb_delete(f);
- }
+ WARN_ON(f->is_static);
+ pr_debug("expire age %lu jiffies %lu\n",
+ f->ageing_timer, jiffies);
+ fdb_delete(f);
} else {
mod_timer(&br->gc_timer, expires);
break;
int i;
write_lock_bh(&br->hash_lock);
- for (i=0;i<BR_HASH_SIZE;i++) {
+ for (i = 0; i < BR_HASH_SIZE; i++) {
struct hlist_node *h, *g;
hlist_for_each_safe(h, g, &br->hash[i]) {
struct net_bridge_fdb_entry *f
= hlist_entry(h, struct net_bridge_fdb_entry, hlist);
- if (f->dst == p) {
- fdb_delete(f);
+ if (f->dst != p)
+ continue;
+
+ /*
+ * if multiple ports all have the same device address
+ * then when one port is deleted, assign
+ * the local entry to other port
+ */
+ if (f->is_local) {
+ struct net_bridge_port *op;
+ list_for_each_entry(op, &br->port_list, list) {
+ if (op != p &&
+ !memcmp(op->dev->dev_addr,
+ f->addr.addr, ETH_ALEN)) {
+ f->dst = op;
+ goto skip_delete;
+ }
+ }
}
+
+ fdb_delete(f);
+ skip_delete: ;
}
}
write_unlock_bh(&br->hash_lock);
kmem_cache_free(br_fdb_cache, ent);
}
-int br_fdb_get_entries(struct net_bridge *br,
- unsigned char *_buf,
- int maxnum,
- int offset)
+/*
+ * Fill buffer with forwarding table records in
+ * the API format.
+ */
+int br_fdb_fillbuf(struct net_bridge *br, void *buf,
+ unsigned long maxnum, unsigned long skip)
{
- int i;
- int num;
- struct __fdb_entry *walk;
+ struct __fdb_entry *fe = buf;
+ int i, num = 0;
+ struct hlist_node *h;
+ struct net_bridge_fdb_entry *f;
- num = 0;
- walk = (struct __fdb_entry *)_buf;
+ memset(buf, 0, maxnum*sizeof(struct __fdb_entry));
read_lock_bh(&br->hash_lock);
- for (i=0;i<BR_HASH_SIZE;i++) {
- struct hlist_node *h;
-
- hlist_for_each(h, &br->hash[i]) {
- struct net_bridge_fdb_entry *f
- = hlist_entry(h, struct net_bridge_fdb_entry, hlist);
- struct __fdb_entry ent;
-
+ for (i = 0; i < BR_HASH_SIZE; i++) {
+ hlist_for_each_entry(f, h, &br->hash[i], hlist) {
if (num >= maxnum)
goto out;
if (has_expired(br, f))
continue;
- if (offset) {
- offset--;
+ if (skip) {
+ --skip;
continue;
}
- copy_fdb(&ent, f);
-
- atomic_inc(&f->use_count);
- read_unlock_bh(&br->hash_lock);
-
- if (copy_to_user(walk, &ent, sizeof(struct __fdb_entry)))
- return -EFAULT;
-
- read_lock_bh(&br->hash_lock);
-
- /* entry was deleted during copy_to_user */
- if (atomic_dec_and_test(&f->use_count)) {
- kmem_cache_free(br_fdb_cache, f);
- num = -EAGAIN;
- goto out;
- }
-
- /* entry changed address hash while copying */
- if (br_mac_hash(f->addr.addr) != i) {
- num = -EAGAIN;
- goto out;
- }
-
- num++;
- walk++;
+ /* convert from internal format to API */
+ memcpy(fe->mac_addr, f->addr.addr, ETH_ALEN);
+ fe->port_no = f->dst->port_no;
+ fe->is_local = f->is_local;
+ if (!f->is_static)
+ fe->ageing_timer_value = jiffies_to_clock_t(jiffies - f->ageing_timer);
+ ++fe;
+ ++num;
}
}
out:
read_unlock_bh(&br->hash_lock);
+
return num;
}
-int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
+static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
const unsigned char *addr, int is_local)
{
struct hlist_node *h;
struct net_bridge_fdb_entry *fdb;
int hash = br_mac_hash(addr);
- int ret = 0;
if (!is_valid_ether_addr(addr))
return -EADDRNOTAVAIL;
- write_lock_bh(&br->hash_lock);
- hlist_for_each(h, &br->hash[hash]) {
- fdb = hlist_entry(h, struct net_bridge_fdb_entry, hlist);
+ hlist_for_each_entry(fdb, h, &br->hash[hash], hlist) {
if (!memcmp(fdb->addr.addr, addr, ETH_ALEN)) {
/* attempt to update an entry for a local interface */
- if (unlikely(fdb->is_local)) {
+ if (fdb->is_local) {
+ /* it is okay to have multiple ports with same
+ * address, just don't allow to be spoofed.
+ */
if (is_local)
- printk(KERN_INFO "%s: attempt to add"
- " interface with same source address.\n",
- source->dev->name);
- else if (net_ratelimit())
+ return 0;
+
+ if (net_ratelimit())
printk(KERN_WARNING "%s: received packet with "
" own address as source address\n",
source->dev->name);
- ret = -EEXIST;
- goto out;
+ return -EEXIST;
}
-
- if (likely(!fdb->is_static || is_local)) {
- /* move to end of age list */
- list_del(&fdb->age_list);
+ if (is_local) {
+ printk(KERN_WARNING "%s adding interface with same address "
+ "as a received packet\n",
+ source->dev->name);
goto update;
}
- goto out;
+
+ if (fdb->is_static)
+ return 0;
+
+ /* move to end of age list */
+ list_del(&fdb->age_list);
+ goto update;
}
}
fdb = kmem_cache_alloc(br_fdb_cache, GFP_ATOMIC);
- if (unlikely(fdb == NULL)) {
- ret = -ENOMEM;
- goto out;
- }
+ if (!fdb)
+ return ENOMEM;
memcpy(fdb->addr.addr, addr, ETH_ALEN);
atomic_set(&fdb->use_count, 1);
fdb->is_local = is_local;
fdb->is_static = is_local;
fdb->ageing_timer = jiffies;
- list_add_tail(&fdb->age_list, &br->age_list);
- out:
- write_unlock_bh(&br->hash_lock);
+ if (!is_local)
+ list_add_tail(&fdb->age_list, &br->age_list);
+ return 0;
+}
+
+int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
+ const unsigned char *addr, int is_local)
+{
+ int ret;
+
+ write_lock_bh(&br->hash_lock);
+ ret = fdb_insert(br, source, addr, is_local);
+ write_unlock_bh(&br->hash_lock);
return ret;
}
git://git.onelab.eu / linux-2.6.git / blobdiff