bridge: rearrange fdb notifications (v2)

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>

bridge: rearrange fdb notifications (v2)
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>
stephen hemminger · David S. Miller
1 parent f58ee4e1a2
Showing 1 changed file with 20 additions and 19 deletions Side-by-side Diff
net/bridge/br_fdb.c
@@ -28,7 +28,8 @@
 static struct kmem_cache *br_fdb_cache __read_mostly;
 static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
 		      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;
  
  
  
@@ -80,10 +81,10 @@
 	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);
+	fdb_notify(br, f, RTM_DELNEIGH);
 	call_rcu(&f->rcu, fdb_rcu_free);
 }
  
@@ -114,7 +115,7 @@
 				}
  
 				/* delete old one */
-				fdb_delete(f);
+				fdb_delete(br, f);
 				goto insert;
 			}
 		}
@@ -144,7 +145,7 @@
 				continue;
 			this_timer = f->updated + delay;
 			if (time_before_eq(this_timer, jiffies))
-				fdb_delete(f);
+				fdb_delete(br, f);
 			else if (time_before(this_timer, next_timer))
 				next_timer = this_timer;
 		}
@@ -165,7 +166,7 @@
 		struct hlist_node *h, *n;
 		hlist_for_each_entry_safe(f, h, n, &br->hash[i], hlist) {
 			if (!f->is_static)
-				fdb_delete(f);
+				fdb_delete(br, f);
 		}
 	}
 	spin_unlock_bh(&br->hash_lock);
@@ -209,7 +210,7 @@
 				}
 			}
  
-			fdb_delete(f);
+			fdb_delete(br, f);
 		skip_delete: ;
 		}
 	}
@@ -370,7 +371,7 @@
 		br_warn(br, "adding interface %s with same address "
 		       "as a received packet\n",
 		       source->dev->name);
-		fdb_delete(fdb);
+		fdb_delete(br, fdb);
 	}
  
 	fdb = fdb_create(head, source, addr);
@@ -378,7 +379,7 @@
 		return -ENOMEM;
  
 	fdb->is_local = fdb->is_static = 1;
-	fdb_notify(fdb, RTM_NEWNEIGH);
+	fdb_notify(br, fdb, RTM_NEWNEIGH);
 	return 0;
 }
  
@@ -427,7 +428,7 @@
 		if (likely(!fdb_find(head, addr))) {
 			fdb = fdb_create(head, source, addr);
 			if (fdb)
-				fdb_notify(fdb, RTM_NEWNEIGH);
+				fdb_notify(br, fdb, RTM_NEWNEIGH);
 		}
 		/* else  we lose race and someone else inserts
 		 * it first, don't bother updating
@@ -448,7 +449,7 @@
 		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,
 			 u32 pid, u32 seq, int type, unsigned int flags)
 {
@@ -461,7 +462,6 @@
 	if (nlh == NULL)
 		return -EMSGSIZE;
  
-
 	ndm = nlmsg_data(nlh);
 	ndm->ndm_family	 = AF_BRIDGE;
 	ndm->ndm_pad1    = 0;
  
@@ -493,9 +493,10 @@
 		+ 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;
 	int err = -ENOBUFS;
  
@@ -503,7 +504,7 @@
 	if (skb == NULL)
 		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) {
 		/* -EMSGSIZE implies BUG in fdb_nlmsg_size() */
 		WARN_ON(err == -EMSGSIZE);
@@ -540,7 +541,7 @@
 				if (idx < cb->args[0])
 					goto skip;
  
-				if (fdb_fill_info(skb, f,
+				if (fdb_fill_info(skb, br, f,
 						  NETLINK_CB(cb->skb).pid,
 						  cb->nlh->nlmsg_seq,
 						  RTM_NEWNEIGH,
@@ -574,7 +575,7 @@
 		fdb = fdb_create(head, source, addr);
 		if (!fdb)
 			return -ENOMEM;
-		fdb_notify(fdb, RTM_NEWNEIGH);
+		fdb_notify(br, fdb, RTM_NEWNEIGH);
 	} else {
 		if (flags & NLM_F_EXCL)
 			return -EEXIST;
@@ -590,7 +591,7 @@
 			fdb->is_local = fdb->is_static = 0;
  
 		fdb->updated = fdb->used = jiffies;
-		fdb_notify(fdb, RTM_NEWNEIGH);
+		fdb_notify(br, fdb, RTM_NEWNEIGH);
 	}
  
 	return 0;
@@ -670,7 +671,7 @@
 	if (!fdb)
 		return -ENOENT;
  
-	fdb_delete(fdb);
+	fdb_delete(p->br, fdb);
 	return 0;
 }
...	...	@@ -28,7 +28,8 @@
28	28	static struct kmem_cache *br_fdb_cache __read_mostly;
29	29	static int fdb_insert(struct net_bridge br, struct net_bridge_port source,
30	30	const unsigned char *addr);
31		-static void fdb_notify(const struct net_bridge_fdb_entry *, int);
	31	+static void fdb_notify(struct net_bridge *br,
	32	+ const struct net_bridge_fdb_entry *, int);
32	33
33	34	static u32 fdb_salt __read_mostly;
34	35
35	36
36	37
...	...	@@ -80,10 +81,10 @@
80	81	kmem_cache_free(br_fdb_cache, ent);
81	82	}
82	83
83		-static inline void fdb_delete(struct net_bridge_fdb_entry *f)
	84	+static void fdb_delete(struct net_bridge br, struct net_bridge_fdb_entry f)
84	85	{
85		- fdb_notify(f, RTM_DELNEIGH);
86	86	hlist_del_rcu(&f->hlist);
	87	+ fdb_notify(br, f, RTM_DELNEIGH);
87	88	call_rcu(&f->rcu, fdb_rcu_free);
88	89	}
89	90
...	...	@@ -114,7 +115,7 @@
114	115	}
115	116
116	117	/* delete old one */
117		- fdb_delete(f);
	118	+ fdb_delete(br, f);
118	119	goto insert;
119	120	}
120	121	}
...	...	@@ -144,7 +145,7 @@
144	145	continue;
145	146	this_timer = f->updated + delay;
146	147	if (time_before_eq(this_timer, jiffies))
147		- fdb_delete(f);
	148	+ fdb_delete(br, f);
148	149	else if (time_before(this_timer, next_timer))
149	150	next_timer = this_timer;
150	151	}
...	...	@@ -165,7 +166,7 @@
165	166	struct hlist_node h, n;
166	167	hlist_for_each_entry_safe(f, h, n, &br->hash[i], hlist) {
167	168	if (!f->is_static)
168		- fdb_delete(f);
	169	+ fdb_delete(br, f);
169	170	}
170	171	}
171	172	spin_unlock_bh(&br->hash_lock);
...	...	@@ -209,7 +210,7 @@
209	210	}
210	211	}
211	212
212		- fdb_delete(f);
	213	+ fdb_delete(br, f);
213	214	skip_delete: ;
214	215	}
215	216	}
...	...	@@ -370,7 +371,7 @@
370	371	br_warn(br, "adding interface %s with same address "
371	372	"as a received packet\n",
372	373	source->dev->name);
373		- fdb_delete(fdb);
	374	+ fdb_delete(br, fdb);
374	375	}
375	376
376	377	fdb = fdb_create(head, source, addr);
...	...	@@ -378,7 +379,7 @@
378	379	return -ENOMEM;
379	380
380	381	fdb->is_local = fdb->is_static = 1;
381		- fdb_notify(fdb, RTM_NEWNEIGH);
	382	+ fdb_notify(br, fdb, RTM_NEWNEIGH);
382	383	return 0;
383	384	}
384	385
...	...	@@ -427,7 +428,7 @@
427	428	if (likely(!fdb_find(head, addr))) {
428	429	fdb = fdb_create(head, source, addr);
429	430	if (fdb)
430		- fdb_notify(fdb, RTM_NEWNEIGH);
	431	+ fdb_notify(br, fdb, RTM_NEWNEIGH);
431	432	}
432	433	/* else we lose race and someone else inserts
433	434	* it first, don't bother updating
...	...	@@ -448,7 +449,7 @@
448	449	return NUD_REACHABLE;
449	450	}
450	451
451		-static int fdb_fill_info(struct sk_buff *skb,
	452	+static int fdb_fill_info(struct sk_buff skb, const struct net_bridge br,
452	453	const struct net_bridge_fdb_entry *fdb,
453	454	u32 pid, u32 seq, int type, unsigned int flags)
454	455	{
...	...	@@ -461,7 +462,6 @@
461	462	if (nlh == NULL)
462	463	return -EMSGSIZE;
463	464
464		-
465	465	ndm = nlmsg_data(nlh);
466	466	ndm->ndm_family = AF_BRIDGE;
467	467	ndm->ndm_pad1 = 0;
468	468
...	...	@@ -493,9 +493,10 @@
493	493	+ nla_total_size(sizeof(struct nda_cacheinfo));
494	494	}
495	495
496		-static void fdb_notify(const struct net_bridge_fdb_entry *fdb, int type)
	496	+static void fdb_notify(struct net_bridge *br,
	497	+ const struct net_bridge_fdb_entry *fdb, int type)
497	498	{
498		- struct net *net = dev_net(fdb->dst->dev);
	499	+ struct net *net = dev_net(br->dev);
499	500	struct sk_buff *skb;
500	501	int err = -ENOBUFS;
501	502
...	...	@@ -503,7 +504,7 @@
503	504	if (skb == NULL)
504	505	goto errout;
505	506
506		- err = fdb_fill_info(skb, fdb, 0, 0, type, 0);
	507	+ err = fdb_fill_info(skb, br, fdb, 0, 0, type, 0);
507	508	if (err < 0) {
508	509	/* -EMSGSIZE implies BUG in fdb_nlmsg_size() */
509	510	WARN_ON(err == -EMSGSIZE);
...	...	@@ -540,7 +541,7 @@
540	541	if (idx < cb->args[0])
541	542	goto skip;
542	543
543		- if (fdb_fill_info(skb, f,
	544	+ if (fdb_fill_info(skb, br, f,
544	545	NETLINK_CB(cb->skb).pid,
545	546	cb->nlh->nlmsg_seq,
546	547	RTM_NEWNEIGH,
...	...	@@ -574,7 +575,7 @@
574	575	fdb = fdb_create(head, source, addr);
575	576	if (!fdb)
576	577	return -ENOMEM;
577		- fdb_notify(fdb, RTM_NEWNEIGH);
	578	+ fdb_notify(br, fdb, RTM_NEWNEIGH);
578	579	} else {
579	580	if (flags & NLM_F_EXCL)
580	581	return -EEXIST;
...	...	@@ -590,7 +591,7 @@
590	591	fdb->is_local = fdb->is_static = 0;
591	592
592	593	fdb->updated = fdb->used = jiffies;
593		- fdb_notify(fdb, RTM_NEWNEIGH);
	594	+ fdb_notify(br, fdb, RTM_NEWNEIGH);
594	595	}
595	596
596	597	return 0;
...	...	@@ -670,7 +671,7 @@
670	671	if (!fdb)
671	672	return -ENOENT;
672	673
673		- fdb_delete(fdb);
	674	+ fdb_delete(p->br, fdb);
674	675	return 0;
675	676	}
676	677