Patchwork bridge: fdb cleanup runs too often

login
register
mail settings
Submitter stephen hemminger
Date June 15, 2010, 4:14 p.m.
Message ID <20100615091412.17e0d656@nehalam>
Download mbox | patch
Permalink /patch/55760/
State Accepted
Delegated to: David Miller
Headers show

Comments

stephen hemminger - June 15, 2010, 4:14 p.m.
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>

---
This is 2.6.35 bug fix, and should also be considered
for stable because of the performance impact.

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - June 17, 2010, 8:55 p.m.
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Tue, 15 Jun 2010 09:14:12 -0700

> 
> 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>

Applied and queued up for -stable, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- a/net/bridge/br_fdb.c	2010-06-15 08:47:57.624465674 -0700
+++ b/net/bridge/br_fdb.c	2010-06-15 08:53:45.407855065 -0700
@@ -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.*/