Skip to contentSkip to conversation

bridge: relay bridge multicast pkgs if !STP

PATCH Applied Stephen Hemminger 2 participants 4 messages May 15, 2009 – May 18, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 bridge: relay bridge multicast pkgs if !STP

Currently the bridge catches all STP packets; even if STP is turned off. This prevents other systems (which do have STP turned on) from being able to detect loops in the network.

With this patch, if STP is off, then any packet sent to the STP multicast group address is forwarded to all ports.

Based on earlier patch by Joakim Tjernlund with changes to go through forwarding (not local chain), and optimization that only last octet needs to be checked.

---
Please put in for 2.6.30 because it is a bug fix.

net/bridge/br_input.c +5 -0
@@ -134,6 +134,10 @@ struct sk_buff *br_handle_frame(struct n
 		if (skb->protocol == htons(ETH_P_PAUSE))
 			goto drop;
 
+		/* If STP is turned off, then forward */
+		if (p->br->stp_enabled == BR_NO_STP && dest[5] == 0)
+			goto forward;
+
 		if (NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
 			    NULL, br_handle_local_finish))
 			return NULL;	/* frame consumed by filter */
@@ -141,6 +145,7 @@ struct sk_buff *br_handle_frame(struct n
 			return skb;	/* continue processing */
 	}
 
+forward:
 	switch (p->state) {
 	case BR_STATE_FORWARDING:
 		rhook = rcu_dereference(br_should_route_hook);
#1 lore raw

PATCH 2/2 bridge: fix initial packet flood if !STP

If bridge is configured with no STP and forwarding delay of 0 (which is typical for virtualization) then when link starts it will flood all packets for the first 20 seconds.

This bug was introduced by a combination of earlier changes:
* forwarding database uses hold time of zero to indicate user wants to always flood packets
* optimzation of the case of forwarding delay of 0 avoids the initial timer tick

The fix is to just skip all the topology change detection code if kernel STP is not being used.

net/bridge/br_stp.c +3 -0
@@ -297,6 +297,9 @@ void br_topology_change_detection(struct
 {
 	int isroot = br_is_root_bridge(br);
 
+	if (br->stp_enabled != BR_KERNEL_STP)
+		return;
+
 	pr_info("%s: topology change detected, %s\n", br->dev->name,
 		isroot ? "propagating" : "sending tcn bpdu");
 
maintainer
#2 lore raw

Re: [PATCH 2/2] bridge: fix initial packet flood if !STP

From: Stephen Hemminger <[email protected]>
Date: Fri, 15 May 2009 09:11:58 -0700

Quoted 10 lines

If bridge is configured with no STP and forwarding delay of 0 (which is typical for virtualization) then when link starts it will flood all packets for the first 20 seconds.

This bug was introduced by a combination of earlier changes:
* forwarding database uses hold time of zero to indicate user wants to always flood packets
* optimzation of the case of forwarding delay of 0 avoids the initial timer tick

Quoted 4 lines

The fix is to just skip all the topology change detection code if kernel STP is not being used.

Also applied, thanks Stephen.

To avoid confusion, I did apply these to net-2.6 since they are fixes.

Thanks!

maintainer Applied
#3 lore raw
In reply to Stephen Hemminger

From: Stephen Hemminger <[email protected]>
Date: Fri, 15 May 2009 09:10:13 -0700

Quoted 4 lines

Currently the bridge catches all STP packets; even if STP is turned off. This prevents other systems (which do have STP turned on) from being able to detect loops in the network.

Quoted 8 lines

With this patch, if STP is off, then any packet sent to the STP multicast group address is forwarded to all ports.

Based on earlier patch by Joakim Tjernlund with changes to go through forwarding (not local chain), and optimization that only last octet needs to be checked.

Applied.