bridge: fdb cleanup runs too often (25442e06) · Commits · 戴 / test

It is common in end-node, non STP bridges to set forwarding delay to zero; which causes the forwarding database cleanup to run every clock tick. Change to run only as soon as needed or at next ageing timer interval which ever is sooner. Use round_jiffies_up macro rather than attempting round up by changing value. Signed-off-by:

Stephen Hemminger <shemminger@vyatta.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/bridge/br_fdb.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -128,7 +128,7 @@ void br_fdb_cleanup(unsigned long _data)
		{
		struct net_bridge br = (struct net_bridge )_data;
		unsigned long delay = hold_time(br);
		unsigned long next_timer = jiffies + br->forward_delay;
		unsigned long next_timer = jiffies + br->ageing_time;
		int i;

		spin_lock_bh(&br->hash_lock);
		@@ -149,9 +149,7 @@ void br_fdb_cleanup(unsigned long _data)
		}
		spin_unlock_bh(&br->hash_lock);

		/* Add HZ/4 to ensure we round the jiffies upwards to be after the next
		* timer, otherwise we might round down and will have no-op run. */
		mod_timer(&br->gc_timer, round_jiffies(next_timer + HZ/4));
		mod_timer(&br->gc_timer, round_jiffies_up(next_timer));
		}

		/* Completely flush all dynamic entries in forwarding database.*/

Admin message