Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9969873b authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by Greg Kroah-Hartman
Browse files

net: bridge: fdb: convert is_local to bitops 



[ Upstream commit 6869c3b02b596eba931a754f56875d2e2ac612db ]

The patch adds a new fdb flags field in the hole between the two cache
lines and uses it to convert is_local to bitops.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Stable-dep-of: bee2ef946d31 ("net: bridge: br_fdb_external_learn_add(): always set EXT_LEARN")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 76c1d0d1

net/bridge/br_fdb.c

+19 −13
Original line number Diff line number Diff line
@@ -255,7 +255,8 @@ void br_fdb_find_delete_local(struct net_bridge *br, 


	spin_lock_bh(&br->hash_lock);

	f = br_fdb_find(br, addr, vid);

	if (f && f->is_local && !f->added_by_user && f->dst == p)

	if (f && test_bit(BR_FDB_LOCAL, &f->flags) &&

	    !f->added_by_user && f->dst == p)

		fdb_delete_local(br, p, f);

	spin_unlock_bh(&br->hash_lock);

}
@@ -270,7 +271,8 @@ void br_fdb_changeaddr(struct net_bridge_port *p, const unsigned char *newaddr) 
	spin_lock_bh(&br->hash_lock);

	vg = nbp_vlan_group(p);

	hlist_for_each_entry(f, &br->fdb_list, fdb_node) {

		if (f->dst == p && f->is_local && !f->added_by_user) {

		if (f->dst == p && test_bit(BR_FDB_LOCAL, &f->flags) &&

		    !f->added_by_user) {

			/* delete old one */

			fdb_delete_local(br, p, f);
@@ -311,7 +313,8 @@ void br_fdb_change_mac_address(struct net_bridge *br, const u8 *newaddr) 


	/* If old entry was unassociated with any port, then delete it. */

	f = br_fdb_find(br, br->dev->dev_addr, 0);

	if (f && f->is_local && !f->dst && !f->added_by_user)

	if (f && test_bit(BR_FDB_LOCAL, &f->flags) &&

	    !f->dst && !f->added_by_user)

		fdb_delete_local(br, NULL, f);



	fdb_insert(br, NULL, newaddr, 0);
@@ -326,7 +329,8 @@ void br_fdb_change_mac_address(struct net_bridge *br, const u8 *newaddr) 
		if (!br_vlan_should_use(v))

			continue;

		f = br_fdb_find(br, br->dev->dev_addr, v->vid);

		if (f && f->is_local && !f->dst && !f->added_by_user)

		if (f && test_bit(BR_FDB_LOCAL, &f->flags) &&

		    !f->dst && !f->added_by_user)

			fdb_delete_local(br, NULL, f);

		fdb_insert(br, NULL, newaddr, v->vid);

	}
@@ -405,7 +409,7 @@ void br_fdb_delete_by_port(struct net_bridge *br, 
			if (f->is_static || (vid && f->key.vlan_id != vid))

				continue;



		if (f->is_local)

		if (test_bit(BR_FDB_LOCAL, &f->flags))

			fdb_delete_local(br, p, f);

		else

			fdb_delete(br, f, true);
@@ -474,7 +478,7 @@ int br_fdb_fillbuf(struct net_bridge *br, void *buf, 
		fe->port_no = f->dst->port_no;

		fe->port_hi = f->dst->port_no >> 8;



		fe->is_local = f->is_local;

		fe->is_local = test_bit(BR_FDB_LOCAL, &f->flags);

		if (!f->is_static)

			fe->ageing_timer_value = jiffies_delta_to_clock_t(jiffies - f->updated);

		++fe;
@@ -499,7 +503,9 @@ static struct net_bridge_fdb_entry *fdb_create(struct net_bridge *br, 
		memcpy(fdb->key.addr.addr, addr, ETH_ALEN);

		fdb->dst = source;

		fdb->key.vlan_id = vid;

		fdb->is_local = is_local;

		fdb->flags = 0;

		if (is_local)

			set_bit(BR_FDB_LOCAL, &fdb->flags);

		fdb->is_static = is_static;

		fdb->added_by_user = 0;

		fdb->added_by_external_learn = 0;
@@ -530,7 +536,7 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source, 
		/* it is okay to have multiple ports with same

		 * address, just use the first one.

		 */

		if (fdb->is_local)

		if (test_bit(BR_FDB_LOCAL, &fdb->flags))

			return 0;

		br_warn(br, "adding interface %s with same address as a received packet (addr:%pM, vlan:%u)\n",

		       source ? source->dev->name : br->dev->name, addr, vid);
@@ -576,7 +582,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, 
	fdb = fdb_find_rcu(&br->fdb_hash_tbl, addr, vid);

	if (likely(fdb)) {

		/* attempt to update an entry for a local interface */

		if (unlikely(fdb->is_local)) {

		if (unlikely(test_bit(BR_FDB_LOCAL, &fdb->flags))) {

			if (net_ratelimit())

				br_warn(br, "received packet on %s with own address as source address (addr:%pM, vlan:%u)\n",

					source->dev->name, addr, vid);
@@ -620,7 +626,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, 
static int fdb_to_nud(const struct net_bridge *br,

		      const struct net_bridge_fdb_entry *fdb)

{

	if (fdb->is_local)

	if (test_bit(BR_FDB_LOCAL, &fdb->flags))

		return NUD_PERMANENT;

	else if (fdb->is_static)

		return NUD_NOARP;
@@ -818,19 +824,19 @@ static int fdb_add_entry(struct net_bridge *br, struct net_bridge_port *source, 


	if (fdb_to_nud(br, fdb) != state) {

		if (state & NUD_PERMANENT) {

			fdb->is_local = 1;

			set_bit(BR_FDB_LOCAL, &fdb->flags);

			if (!fdb->is_static) {

				fdb->is_static = 1;

				fdb_add_hw_addr(br, addr);

			}

		} else if (state & NUD_NOARP) {

			fdb->is_local = 0;

			clear_bit(BR_FDB_LOCAL, &fdb->flags);

			if (!fdb->is_static) {

				fdb->is_static = 1;

				fdb_add_hw_addr(br, addr);

			}

		} else {

			fdb->is_local = 0;

			clear_bit(BR_FDB_LOCAL, &fdb->flags);

			if (fdb->is_static) {

				fdb->is_static = 0;

				fdb_del_hw_addr(br, addr);

net/bridge/br_input.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb 
	if (dst) {

		unsigned long now = jiffies;



		if (dst->is_local)

		if (test_bit(BR_FDB_LOCAL, &dst->flags))

			return br_pass_frame_up(skb);



		if (now != dst->used)

net/bridge/br_private.h

+7 −2
Original line number Diff line number Diff line
@@ -168,6 +168,11 @@ struct net_bridge_vlan_group { 
	u16				pvid;

};



/* bridge fdb flags */

enum {

	BR_FDB_LOCAL,

};



struct net_bridge_fdb_key {

	mac_addr addr;

	u16 vlan_id;
@@ -179,8 +184,8 @@ struct net_bridge_fdb_entry { 


	struct net_bridge_fdb_key	key;

	struct hlist_node		fdb_node;

	unsigned char			is_local:1,

					is_static:1,

	unsigned long			flags;

	unsigned char			is_static:1,

					is_sticky:1,

					added_by_user:1,

					added_by_external_learn:1,