[Bridge] [PATCH] BRIDGE: Do not suppress FDB learning after topology change when forward_delay is 0.

[Bridge] [PATCH] BRIDGE: Do not suppress FDB learning after topology change when forward_delay is 0.

[Ian Campbell]

I recently noticed that my bridges were flooding traffic for a period of time
after a topology change. These bridges are part of a Xen host and therefore
have spanning tree disabled and forward_delay of zero. In this situation there
is no reason not to begin relearning immediately after a topology change.

The existing code uses hold_time == 0 to suppress learning in br_fdb_update.
hold_time() returns forward_delay if a topology change has recently occurred
and ageing_time if not. Setting each of those to zero has slightly different
semantics: Setting forward_delay to zero effectively means forward immediately
while setting ageing_time to zero effectively means do not learn.

The solution is to not learn after a topology change only if forward_delay is
non-zero but to retain the existing behaviour based on ageing_time if a
topology change has not occured.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Stephen Hemminger <shemminger@linux-foundation.org>
Cc: bridge@lists.linux-foundation.org
---
 net/bridge/br_fdb.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index a48f5ef..c4a38ed 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -57,6 +57,11 @@ static inline unsigned long hold_time(const struct net_bridge *br)
 	return br->topology_change ? br->forward_delay : br->ageing_time;
 }
 
+static inline int should_learn(const struct net_bridge *br)
+{
+	return br->topology_change ? !br->forward_delay : !!br->ageing_time;
+}
+
 static inline int has_expired(const struct net_bridge *br,
 				  const struct net_bridge_fdb_entry *fdb)
 {
@@ -384,7 +389,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
 	struct net_bridge_fdb_entry *fdb;
 
 	/* some users want to always flood. */
-	if (hold_time(br) == 0)
+	if (!should_learn(br))
 		return;
 
 	/* ignore packets unless we are using this port */
-- 
1.5.6.5

Re: [Bridge] [PATCH] BRIDGE: Do not suppress FDB learning after topology change when forward_delay is 0.

[Ian Campbell]

On Thu, 2009-05-14 at 07:01 -0400, Ian Campbell wrote:
> I recently noticed that my bridges were flooding traffic for a period of time
> after a topology change. These bridges are part of a Xen host and therefore
> have spanning tree disabled and forward_delay of zero. In this situation there
> is no reason not to begin relearning immediately after a topology change.
> 
> The existing code uses hold_time == 0 to suppress learning in br_fdb_update.
> hold_time() returns forward_delay if a topology change has recently occurred
> and ageing_time if not. Setting each of those to zero has slightly different
> semantics: Setting forward_delay to zero effectively means forward immediately
> while setting ageing_time to zero effectively means do not learn.
> 
> The solution is to not learn after a topology change only if forward_delay is
> non-zero but to retain the existing behaviour based on ageing_time if a
> topology change has not occured.

Hmm, now I'm wondering if I'm just completely confused about the
relevance of ->forward_delay in the context of the FDB, since makes no
sense to me ;-)

There are four places in br_fdb.c which make use of hold_time() (and
therefor == ->forward_delay after a topology change):

br_fdb_update -- discussed above, why would you not learn even during
the period after a topology change?

br_fdb_cleanup -- If forward_delay is 0 then we drop all FDB entries on
topology change, which makes sense. However if forward_delay is non-0
then we drop all FDB entries some time _after_ the topology change. Or
maybe not at all of forwarding_delay > bridge_forwarding_delay. Why not
just explicitly flush the FDB on topology change?

__br_fdb_get -- (calls hold_time() via has_expired()), I don't
understand why an entry would be considered to expire at a point
forward_delay ms after a topology change, rather than immediately on the
change, or not at all.

br_fdb_fillbuf -- (calls hold_time() via has_expired()).

I guess the root of the issue is the same in all of the cases... The
code seems to have been this way since forever (i.e. since git ;-)) so I
strongly suspect there is some aspect of all this I don't understand or
appreciate ;-) Can anyone enlighten me?

As a strawman I present the following patch (on top of the previous
one)...

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 7293ba4..8b0c92e 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -52,11 +52,6 @@ void br_fdb_fini(void)
 /* if topology_changing then use forward_delay (default 15 sec)
  * otherwise keep longer (default 5 minutes)
  */
-static inline unsigned long hold_time(const struct net_bridge *br)
-{
-	return br->topology_change ? br->forward_delay : br->ageing_time;
-}
-
 static inline int should_learn(const struct net_bridge *br)
 {
 	return br->topology_change ? !br->forward_delay : !!br->ageing_time;
@@ -66,7 +61,7 @@ static inline int has_expired(const struct net_bridge *br,
 				  const struct net_bridge_fdb_entry *fdb)
 {
 	return !fdb->is_static
-		&& time_before_eq(fdb->ageing_timer + hold_time(br), jiffies);
+		&& time_before_eq(fdb->ageing_timer + br->ageing_time, jiffies);
 }
 
 static inline int br_mac_hash(const unsigned char *mac)
@@ -124,7 +119,7 @@ void br_fdb_changeaddr(struct net_bridge_port *p, const unsigned char *newaddr)
 void br_fdb_cleanup(unsigned long _data)
 {
 	struct net_bridge *br = (struct net_bridge *)_data;
-	unsigned long delay = hold_time(br);
+	unsigned long delay = br->ageing_time;
 	unsigned long next_timer = jiffies + br->forward_delay;
 	int i;
 
diff --git a/net/bridge/br_stp.c b/net/bridge/br_stp.c
index 6e63ec3..459acbf 100644
--- a/net/bridge/br_stp.c
+++ b/net/bridge/br_stp.c
@@ -302,6 +302,7 @@ void br_topology_change_detection(struct net_bridge *br)
 
 	if (isroot) {
 		br->topology_change = 1;
+		br_fdb_flush(br);
 		mod_timer(&br->topology_change_timer, jiffies
 			  + br->bridge_forward_delay + br->bridge_max_age);
 	} else if (!br->topology_change_detected) {

Re: [Bridge] [PATCH] BRIDGE: Do not suppress FDB learning after topology change when forward_delay is 0.

[Stephen Hemminger]

On Thu, 14 May 2009 12:01:44 +0100
Ian Campbell <ian.campbell@citrix.com> wrote:

> I recently noticed that my bridges were flooding traffic for a period of time
> after a topology change. These bridges are part of a Xen host and therefore
> have spanning tree disabled and forward_delay of zero. In this situation there
> is no reason not to begin relearning immediately after a topology change.
> 
> The existing code uses hold_time == 0 to suppress learning in br_fdb_update.
> hold_time() returns forward_delay if a topology change has recently occurred
> and ageing_time if not. Setting each of those to zero has slightly different
> semantics: Setting forward_delay to zero effectively means forward immediately
> while setting ageing_time to zero effectively means do not learn.
> 
> The solution is to not learn after a topology change only if forward_delay is
> non-zero but to retain the existing behaviour based on ageing_time if a
> topology change has not occured.


Unless STP is enabled, br_topology_change is bogus.  It looks like,
the following would avoid the problem?

--- a/net/bridge/br_stp.c	2009-05-14 08:33:01.795909321 -0700
+++ b/net/bridge/br_stp.c	2009-05-14 08:34:32.839883992 -0700
@@ -375,7 +375,8 @@ static void br_make_forwarding(struct ne
 
 	if (br->forward_delay == 0) {
 		p->state = BR_STATE_FORWARDING;
-		br_topology_change_detection(br);
+		if (p->br->stp_enable == BR_KERNEL_STP)
+			br_topology_change_detection(br);
 		del_timer(&p->forward_delay_timer);
 	}
 	else if (p->br->stp_enabled == BR_KERNEL_STP)

Re: [Bridge] [PATCH] BRIDGE: Do not suppress FDB learning after topology change when forward_delay is 0.

[Ian Campbell]

On Thu, 2009-05-14 at 11:35 -0400, Stephen Hemminger wrote:
> Unless STP is enabled, br_topology_change is bogus.  It looks like,
> the following would avoid the problem?

Yes, it does and it looks like a much better fix to me. 

Thanks, Ian.

> 
> --- a/net/bridge/br_stp.c	2009-05-14 08:33:01.795909321 -0700
> +++ b/net/bridge/br_stp.c	2009-05-14 08:34:32.839883992 -0700
> @@ -375,7 +375,8 @@ static void br_make_forwarding(struct ne
>  
>  	if (br->forward_delay == 0) {
>  		p->state = BR_STATE_FORWARDING;
> -		br_topology_change_detection(br);
> +		if (p->br->stp_enable == BR_KERNEL_STP)
> +			br_topology_change_detection(br);
>  		del_timer(&p->forward_delay_timer);
>  	}
>  	else if (p->br->stp_enabled == BR_KERNEL_STP)
> 
> 

Re: [Bridge] [PATCH] BRIDGE: Do not suppress FDB learning after topology change when forward_delay is 0.

[Uli Luckas]

On Thursday, 14. May 2009, Stephen Hemminger wrote:
> On Thu, 14 May 2009 12:01:44 +0100
> Ian Campbell <ian.campbell@citrix.com> wrote:
> 
> > I recently noticed that my bridges were flooding traffic for a period of time
> > after a topology change. These bridges are part of a Xen host and therefore
> > have spanning tree disabled and forward_delay of zero. In this situation there
> > is no reason not to begin relearning immediately after a topology change.
> > 
> > The existing code uses hold_time == 0 to suppress learning in br_fdb_update.
> > hold_time() returns forward_delay if a topology change has recently occurred
> > and ageing_time if not. Setting each of those to zero has slightly different
> > semantics: Setting forward_delay to zero effectively means forward immediately
> > while setting ageing_time to zero effectively means do not learn.
> > 
> > The solution is to not learn after a topology change only if forward_delay is
> > non-zero but to retain the existing behaviour based on ageing_time if a
> > topology change has not occured.
> 
> 
> Unless STP is enabled, br_topology_change is bogus.  It looks like,
> the following would avoid the problem?
> 
> --- a/net/bridge/br_stp.c	2009-05-14 08:33:01.795909321 -0700
> +++ b/net/bridge/br_stp.c	2009-05-14 08:34:32.839883992 -0700
> @@ -375,7 +375,8 @@ static void br_make_forwarding(struct ne
>  
>  	if (br->forward_delay == 0) {
>  		p->state = BR_STATE_FORWARDING;
> -		br_topology_change_detection(br);
> +		if (p->br->stp_enable == BR_KERNEL_STP)
> +			br_topology_change_detection(br);
>  		del_timer(&p->forward_delay_timer);
>  	}
>  	else if (p->br->stp_enabled == BR_KERNEL_STP)
> 
> 
> _______________________________________________
> Bridge mailing list
> Bridge@lists.linux-foundation.org
> https://lists.linux-foundation.org/mailman/listinfo/bridge
> 

Hi Stephen,
should that fix this open issue "delay in bridge learning when forward delay is 0" [1]?

Uli

1) https://lists.linux-foundation.org/pipermail/bridge/2008-October/006059.html



-- 

------- ROAD ...the handyPC Company - - -  ) ) )

Uli Luckas
Head of Software Development

ROAD GmbH
Bennigsenstr. 14 | 12159 Berlin | Germany
fon: +49 (30) 230069 - 62 | fax: +49 (30) 230069 - 69
url: www.road.de

Amtsgericht Charlottenburg: HRB 96688 B
Managing director: Hans-Peter Constien

Re: [Bridge] [PATCH] BRIDGE: Do not suppress FDB learning after topology change when forward_delay is 0.

[richardvoigt]

On Thu, May 14, 2009 at 10:35 AM, Stephen Hemminger
<shemminger@linux-foundation.org> wrote:
> On Thu, 14 May 2009 12:01:44 +0100
> Ian Campbell <ian.campbell@citrix.com> wrote:
>
>> I recently noticed that my bridges were flooding traffic for a period of time
>> after a topology change. These bridges are part of a Xen host and therefore
>> have spanning tree disabled and forward_delay of zero. In this situation there
>> is no reason not to begin relearning immediately after a topology change.
>>
>> The existing code uses hold_time == 0 to suppress learning in br_fdb_update.
>> hold_time() returns forward_delay if a topology change has recently occurred
>> and ageing_time if not. Setting each of those to zero has slightly different
>> semantics: Setting forward_delay to zero effectively means forward immediately
>> while setting ageing_time to zero effectively means do not learn.
>>
>> The solution is to not learn after a topology change only if forward_delay is
>> non-zero but to retain the existing behaviour based on ageing_time if a
>> topology change has not occured.
>
>
> Unless STP is enabled, br_topology_change is bogus.  It looks like,
> the following would avoid the problem?
>
> --- a/net/bridge/br_stp.c       2009-05-14 08:33:01.795909321 -0700
> +++ b/net/bridge/br_stp.c       2009-05-14 08:34:32.839883992 -0700
> @@ -375,7 +375,8 @@ static void br_make_forwarding(struct ne
>
>        if (br->forward_delay == 0) {
>                p->state = BR_STATE_FORWARDING;
> -               br_topology_change_detection(br);
> +               if (p->br->stp_enable == BR_KERNEL_STP)
> +                       br_topology_change_detection(br);
>                del_timer(&p->forward_delay_timer);
>        }
>        else if (p->br->stp_enabled == BR_KERNEL_STP)

Comparing the new line to the last line of the snippet, it looks like
this change is wrong.  Are there really two members "stp_enable" and
"stp_enabled" of the same structure?

>
>
> _______________________________________________
> Bridge mailing list
> Bridge@lists.linux-foundation.org
> https://lists.linux-foundation.org/mailman/listinfo/bridge
>