renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-20 16:46:23 +08:00
Code

bridge: rearrange fdb notifications (v2)

Browse Source 
Pass bridge to fdb_notify so it can determine correct namespace based
on namespace of bridge rather than namespace of destination port.
Also makes next patch easier.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger 2011-12-08 07:17:41 +00:00 committed by David S. Miller
parent f58ee4e1a2
commit 31e8a49c16
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
net/bridge/br_fdb.c
View File

@ -28,7 +28,8 @@
static struct kmem_cache *br_fdb_cache __read_mostly; static struct kmem_cache *br_fdb_cache __read_mostly;
static int 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); const unsigned char *addr);
static void fdb_notify(const struct net_bridge_fdb_entry *, int); static void fdb_notify(struct net_bridge *br,
const struct net_bridge_fdb_entry *, int);
static u32 fdb_salt __read_mostly; static u32 fdb_salt __read_mostly;
@ -80,10 +81,10 @@ static void fdb_rcu_free(struct rcu_head *head)
kmem_cache_free(br_fdb_cache, ent); kmem_cache_free(br_fdb_cache, ent);
} }
static inline void fdb_delete(struct net_bridge_fdb_entry *f) static void fdb_delete(struct net_bridge *br, struct net_bridge_fdb_entry *f)
{ {
fdb_notify(f, RTM_DELNEIGH);
hlist_del_rcu(&f->hlist); hlist_del_rcu(&f->hlist);
fdb_notify(br, f, RTM_DELNEIGH);
call_rcu(&f->rcu, fdb_rcu_free); call_rcu(&f->rcu, fdb_rcu_free);
} }
@ -114,7 +115,7 @@ void br_fdb_changeaddr(struct net_bridge_port *p, const unsigned char *newaddr)
} }
/* delete old one */ /* delete old one */
fdb_delete(f); fdb_delete(br, f);
goto insert; goto insert;
} }
} }
@ -144,7 +145,7 @@ void br_fdb_cleanup(unsigned long _data)
continue; continue;
this_timer = f->updated + delay; this_timer = f->updated + delay;
if (time_before_eq(this_timer, jiffies)) if (time_before_eq(this_timer, jiffies))
fdb_delete(f); fdb_delete(br, f);
else if (time_before(this_timer, next_timer)) else if (time_before(this_timer, next_timer))
next_timer = this_timer; next_timer = this_timer;
} }
@ -165,7 +166,7 @@ void br_fdb_flush(struct net_bridge *br)
struct hlist_node *h, *n; struct hlist_node *h, *n;
hlist_for_each_entry_safe(f, h, n, &br->hash[i], hlist) { hlist_for_each_entry_safe(f, h, n, &br->hash[i], hlist) {
if (!f->is_static) if (!f->is_static)
fdb_delete(f); fdb_delete(br, f);
} }
} }
spin_unlock_bh(&br->hash_lock); spin_unlock_bh(&br->hash_lock);
@ -209,7 +210,7 @@ void br_fdb_delete_by_port(struct net_bridge *br,
} }
} }
fdb_delete(f); fdb_delete(br, f);
skip_delete: ; skip_delete: ;
} }
} }
@ -370,7 +371,7 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
br_warn(br, "adding interface %s with same address " br_warn(br, "adding interface %s with same address "
"as a received packet\n", "as a received packet\n",
source->dev->name); source->dev->name);
fdb_delete(fdb); fdb_delete(br, fdb);
} }
fdb = fdb_create(head, source, addr); fdb = fdb_create(head, source, addr);
@ -378,7 +379,7 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
return -ENOMEM; return -ENOMEM;
fdb->is_local = fdb->is_static = 1; fdb->is_local = fdb->is_static = 1;
fdb_notify(fdb, RTM_NEWNEIGH); fdb_notify(br, fdb, RTM_NEWNEIGH);
return 0; return 0;
} }
@ -427,7 +428,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
if (likely(!fdb_find(head, addr))) { if (likely(!fdb_find(head, addr))) {
fdb = fdb_create(head, source, addr); fdb = fdb_create(head, source, addr);
if (fdb) if (fdb)
fdb_notify(fdb, RTM_NEWNEIGH); fdb_notify(br, fdb, RTM_NEWNEIGH);
} }
/* else we lose race and someone else inserts /* else we lose race and someone else inserts
* it first, don't bother updating * it first, don't bother updating
@ -448,7 +449,7 @@ static int fdb_to_nud(const struct net_bridge_fdb_entry *fdb)
return NUD_REACHABLE; return NUD_REACHABLE;
} }
static int fdb_fill_info(struct sk_buff *skb, static int fdb_fill_info(struct sk_buff *skb, const struct net_bridge *br,
const struct net_bridge_fdb_entry *fdb, const struct net_bridge_fdb_entry *fdb,
u32 pid, u32 seq, int type, unsigned int flags) u32 pid, u32 seq, int type, unsigned int flags)
{ {
@ -461,7 +462,6 @@ static int fdb_fill_info(struct sk_buff *skb,
if (nlh == NULL) if (nlh == NULL)
return -EMSGSIZE; return -EMSGSIZE;
ndm = nlmsg_data(nlh); ndm = nlmsg_data(nlh);
ndm->ndm_family = AF_BRIDGE; ndm->ndm_family = AF_BRIDGE;
ndm->ndm_pad1 = 0; ndm->ndm_pad1 = 0;
@ -493,9 +493,10 @@ static inline size_t fdb_nlmsg_size(void)
+ nla_total_size(sizeof(struct nda_cacheinfo)); + nla_total_size(sizeof(struct nda_cacheinfo));
} }
static void fdb_notify(const struct net_bridge_fdb_entry *fdb, int type) static void fdb_notify(struct net_bridge *br,
const struct net_bridge_fdb_entry *fdb, int type)
{ {
struct net *net = dev_net(fdb->dst->dev); struct net *net = dev_net(br->dev);
struct sk_buff *skb; struct sk_buff *skb;
int err = -ENOBUFS; int err = -ENOBUFS;
@ -503,7 +504,7 @@ static void fdb_notify(const struct net_bridge_fdb_entry *fdb, int type)
if (skb == NULL) if (skb == NULL)
goto errout; goto errout;
err = fdb_fill_info(skb, fdb, 0, 0, type, 0); err = fdb_fill_info(skb, br, fdb, 0, 0, type, 0);
if (err < 0) { if (err < 0) {
/* -EMSGSIZE implies BUG in fdb_nlmsg_size() */ /* -EMSGSIZE implies BUG in fdb_nlmsg_size() */
WARN_ON(err == -EMSGSIZE); WARN_ON(err == -EMSGSIZE);
@ -540,7 +541,7 @@ int br_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)
if (idx < cb->args[0]) if (idx < cb->args[0])
goto skip; goto skip;
if (fdb_fill_info(skb, f, if (fdb_fill_info(skb, br, f,
NETLINK_CB(cb->skb).pid, NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq, cb->nlh->nlmsg_seq,
RTM_NEWNEIGH, RTM_NEWNEIGH,
@ -574,7 +575,7 @@ static int fdb_add_entry(struct net_bridge_port *source, const __u8 *addr,
fdb = fdb_create(head, source, addr); fdb = fdb_create(head, source, addr);
if (!fdb) if (!fdb)
return -ENOMEM; return -ENOMEM;
fdb_notify(fdb, RTM_NEWNEIGH); fdb_notify(br, fdb, RTM_NEWNEIGH);
} else { } else {
if (flags & NLM_F_EXCL) if (flags & NLM_F_EXCL)
return -EEXIST; return -EEXIST;
@ -590,7 +591,7 @@ static int fdb_add_entry(struct net_bridge_port *source, const __u8 *addr,
fdb->is_local = fdb->is_static = 0; fdb->is_local = fdb->is_static = 0;
fdb->updated = fdb->used = jiffies; fdb->updated = fdb->used = jiffies;
fdb_notify(fdb, RTM_NEWNEIGH); fdb_notify(br, fdb, RTM_NEWNEIGH);
} }
return 0; return 0;
@ -670,7 +671,7 @@ static int fdb_delete_by_addr(struct net_bridge_port *p, const u8 *addr)
if (!fdb) if (!fdb)
return -ENOENT; return -ENOENT;
fdb_delete(fdb); fdb_delete(p->br, fdb);
return 0; return 0;
} }