Commit be0c5677 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

net: bridge: fdb: br_fdb_update can take flags directly 



If we modify br_fdb_update() to take flags directly we can get rid of
one test and one atomic bitop in the learning path.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52340b82

include/trace/events/bridge.h

+6 −6
Original line number Diff line number Diff line
@@ -95,16 +95,16 @@ TRACE_EVENT(fdb_delete, 
TRACE_EVENT(br_fdb_update,



	TP_PROTO(struct net_bridge *br, struct net_bridge_port *source,

		 const unsigned char *addr, u16 vid, bool added_by_user),

		 const unsigned char *addr, u16 vid, unsigned long flags),



	TP_ARGS(br, source, addr, vid, added_by_user),

	TP_ARGS(br, source, addr, vid, flags),



	TP_STRUCT__entry(

		__string(br_dev, br->dev->name)

		__string(dev, source->dev->name)

		__array(unsigned char, addr, ETH_ALEN)

		__field(u16, vid)

		__field(bool, added_by_user)

		__field(unsigned long, flags)

	),



	TP_fast_assign(
@@ -112,14 +112,14 @@ TRACE_EVENT(br_fdb_update, 
		__assign_str(dev, source->dev->name);

		memcpy(__entry->addr, addr, ETH_ALEN);

		__entry->vid = vid;

		__entry->added_by_user = added_by_user;

		__entry->flags = flags;

	),



	TP_printk("br_dev %s source %s addr %02x:%02x:%02x:%02x:%02x:%02x vid %u added_by_user %d",

	TP_printk("br_dev %s source %s addr %02x:%02x:%02x:%02x:%02x:%02x vid %u flags 0x%lx",

		  __get_str(br_dev), __get_str(dev), __entry->addr[0],

		  __entry->addr[1], __entry->addr[2], __entry->addr[3],

		  __entry->addr[4], __entry->addr[5], __entry->vid,

		  __entry->added_by_user)

		  __entry->flags)

);

net/bridge/br_fdb.c

+6 −9
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source, 
}



void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,

		   const unsigned char *addr, u16 vid, bool added_by_user)

		   const unsigned char *addr, u16 vid, unsigned long flags)

{

	struct net_bridge_fdb_entry *fdb;

	bool fdb_modified = false;
@@ -592,21 +592,18 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, 
			}

			if (now != fdb->updated)

				fdb->updated = now;

			if (unlikely(added_by_user))

			if (unlikely(test_bit(BR_FDB_ADDED_BY_USER, &flags)))

				set_bit(BR_FDB_ADDED_BY_USER, &fdb->flags);

			if (unlikely(fdb_modified)) {

				trace_br_fdb_update(br, source, addr, vid, added_by_user);

				trace_br_fdb_update(br, source, addr, vid, flags);

				fdb_notify(br, fdb, RTM_NEWNEIGH, true);

			}

		}

	} else {

		spin_lock(&br->hash_lock);

		fdb = fdb_create(br, source, addr, vid, 0);

		fdb = fdb_create(br, source, addr, vid, flags);

		if (fdb) {

			if (unlikely(added_by_user))

				set_bit(BR_FDB_ADDED_BY_USER, &fdb->flags);

			trace_br_fdb_update(br, source, addr, vid,

					    added_by_user);

			trace_br_fdb_update(br, source, addr, vid, flags);

			fdb_notify(br, fdb, RTM_NEWNEIGH, true);

		}

		/* else  we lose race and someone else inserts
@@ -889,7 +886,7 @@ static int __br_fdb_add(struct ndmsg *ndm, struct net_bridge *br, 
		}

		local_bh_disable();

		rcu_read_lock();

		br_fdb_update(br, p, addr, vid, true);

		br_fdb_update(br, p, addr, vid, BIT(BR_FDB_ADDED_BY_USER));

		rcu_read_unlock();

		local_bh_enable();

	} else if (ndm->ndm_flags & NTF_EXT_LEARNED) {

net/bridge/br_input.c

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb 
	/* insert into forwarding database after filtering to avoid spoofing */

	br = p->br;

	if (p->flags & BR_LEARNING)

		br_fdb_update(br, p, eth_hdr(skb)->h_source, vid, false);

		br_fdb_update(br, p, eth_hdr(skb)->h_source, vid, 0);



	local_rcv = !!(br->dev->flags & IFF_PROMISC);

	if (is_multicast_ether_addr(eth_hdr(skb)->h_dest)) {
@@ -184,7 +184,7 @@ static void __br_handle_local_finish(struct sk_buff *skb) 
	if ((p->flags & BR_LEARNING) &&

	    !br_opt_get(p->br, BROPT_NO_LL_LEARN) &&

	    br_should_learn(p, skb, &vid))

		br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, false);

		br_fdb_update(p->br, p, eth_hdr(skb)->h_source, vid, 0);

}



/* note: already called with rcu_read_lock */

net/bridge/br_private.h

+1 −1
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ int br_fdb_fillbuf(struct net_bridge *br, void *buf, unsigned long count, 
int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source,

		  const unsigned char *addr, u16 vid);

void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,

		   const unsigned char *addr, u16 vid, bool added_by_user);

		   const unsigned char *addr, u16 vid, unsigned long flags);



int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],

		  struct net_device *dev, const unsigned char *addr, u16 vid);