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

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

net: bridge: fdb: convert added_by_external_learn to use bitops 



[ Upstream commit b5cd9f7c42480ede119a390607a9dbe6263f6795 ]

Convert the added_by_external_learn field to a flag and use 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 4b1bf0ea

net/bridge/br_fdb.c

+9 −10
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static inline int has_expired(const struct net_bridge *br, 
				  const struct net_bridge_fdb_entry *fdb)

{

	return !test_bit(BR_FDB_STATIC, &fdb->flags) &&

	       !fdb->added_by_external_learn &&

	       !test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags) &&

	       time_before_eq(fdb->updated + hold_time(br), jiffies);

}
@@ -357,7 +357,7 @@ void br_fdb_cleanup(struct work_struct *work) 
		unsigned long this_timer;



		if (test_bit(BR_FDB_STATIC, &f->flags) ||

		    f->added_by_external_learn)

		    test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &f->flags))

			continue;

		this_timer = f->updated + delay;

		if (time_after(this_timer, now)) {
@@ -511,7 +511,6 @@ static struct net_bridge_fdb_entry *fdb_create(struct net_bridge *br, 
			set_bit(BR_FDB_LOCAL, &fdb->flags);

		if (is_static)

			set_bit(BR_FDB_STATIC, &fdb->flags);

		fdb->added_by_external_learn = 0;

		fdb->offloaded = 0;

		fdb->updated = fdb->used = jiffies;

		if (rhashtable_lookup_insert_fast(&br->fdb_hash_tbl,
@@ -598,8 +597,8 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, 
				fdb->dst = source;

				fdb_modified = true;

				/* Take over HW learned entry */

				if (unlikely(fdb->added_by_external_learn))

					fdb->added_by_external_learn = 0;

				test_and_clear_bit(BR_FDB_ADDED_BY_EXT_LEARN,

						   &fdb->flags);

			}

			if (now != fdb->updated)

				fdb->updated = now;
@@ -664,7 +663,7 @@ static int fdb_fill_info(struct sk_buff *skb, const struct net_bridge *br, 


	if (fdb->offloaded)

		ndm->ndm_flags |= NTF_OFFLOADED;

	if (fdb->added_by_external_learn)

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

		ndm->ndm_flags |= NTF_EXT_LEARNED;

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

		ndm->ndm_flags |= NTF_STICKY;
@@ -1107,7 +1106,7 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p, 
		}

		if (swdev_notify)

			set_bit(BR_FDB_ADDED_BY_USER, &fdb->flags);

		fdb->added_by_external_learn = 1;

		set_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags);

		fdb_notify(br, fdb, RTM_NEWNEIGH, swdev_notify);

	} else {

		fdb->updated = jiffies;
@@ -1117,12 +1116,12 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p, 
			modified = true;

		}



		if (fdb->added_by_external_learn) {

		if (test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags)) {

			/* Refresh entry */

			fdb->used = jiffies;

		} else if (!test_bit(BR_FDB_ADDED_BY_USER, &fdb->flags)) {

			/* Take over SW learned entry */

			fdb->added_by_external_learn = 1;

			set_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags);

			modified = true;

		}
@@ -1149,7 +1148,7 @@ int br_fdb_external_learn_del(struct net_bridge *br, struct net_bridge_port *p, 
	spin_lock_bh(&br->hash_lock);



	fdb = br_fdb_find(br, addr, vid);

	if (fdb && fdb->added_by_external_learn)

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

		fdb_delete(br, fdb, swdev_notify);

	else

		err = -ENOENT;

net/bridge/br_private.h

+2 −2
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ enum { 
	BR_FDB_STATIC,

	BR_FDB_STICKY,

	BR_FDB_ADDED_BY_USER,

	BR_FDB_ADDED_BY_EXT_LEARN,

};



struct net_bridge_fdb_key {
@@ -188,8 +189,7 @@ struct net_bridge_fdb_entry { 
	struct net_bridge_fdb_key	key;

	struct hlist_node		fdb_node;

	unsigned long			flags;

	unsigned char			added_by_external_learn:1,

					offloaded:1;

	unsigned char			offloaded:1;



	/* write-heavy members should not affect lookups */

	unsigned long			updated ____cacheline_aligned_in_smp;