Commit 41c389d7 authored May 27, 2014 by Roopa Prabhu Committed by David S. Miller Jun 02, 2014

bridge: Add bridge ifindex to bridge fdb notify msgs

(This patch was previously posted as RFC at
http://patchwork.ozlabs.org/patch/352677/

)

This patch adds NDA_MASTER attribute to neighbour attributes enum for
bridge/master ifindex. And adds NDA_MASTER to bridge fdb notify msgs.

Today bridge fdb notifications dont contain bridge information.
Userspace can derive it from the port information in the fdb
notification. However this is tricky in some scenarious.

Example, bridge port delete notification comes before bridge fdb
delete notifications. And we have seen problems in userspace
when using libnl where, the bridge fdb delete notification handling code
does not understand which bridge this fdb entry is part of because
the bridge and port association has already been deleted.
And these notifications (port membership and fdb) are generated on
separate rtnl groups.

Fixing the order of notifications could possibly solve the problem
for some cases (I can submit a separate patch for that).

This patch chooses to add NDA_MASTER to bridge fdb notify msgs
because it not only solves the problem described above, but also helps
userspace avoid another lookup into link msgs to derive the master index.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 74e8ce34

include/uapi/linux/neighbour.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ enum {
		NDA_PORT,
		NDA_VNI,
		NDA_IFINDEX,
		NDA_MASTER,
		__NDA_MAX
		};

net/bridge/br_fdb.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -616,6 +616,8 @@ static int fdb_fill_info(struct sk_buff skb, const struct net_bridge br,

		if (nla_put(skb, NDA_LLADDR, ETH_ALEN, &fdb->addr))
		goto nla_put_failure;
		if (nla_put_u32(skb, NDA_MASTER, br->dev->ifindex))
		goto nla_put_failure;
		ci.ndm_used = jiffies_to_clock_t(now - fdb->used);
		ci.ndm_confirmed = 0;
		ci.ndm_updated = jiffies_to_clock_t(now - fdb->updated);
		@@ -637,6 +639,7 @@ static inline size_t fdb_nlmsg_size(void)
		{
		return NLMSG_ALIGN(sizeof(struct ndmsg))
		+ nla_total_size(ETH_ALEN) /* NDA_LLADDR */
		+ nla_total_size(sizeof(u32)) /* NDA_MASTER */
		+ nla_total_size(sizeof(u16)) /* NDA_VLAN */
		+ nla_total_size(sizeof(struct nda_cacheinfo));
		}

Admin message