bridge: set priority of STP packets

Submitted by stephen hemminger on Feb. 11, 2013, 6:22 p.m.

Details

Message ID 20130211102222.37743b22@nehalam.linuxnetplumber.net
State Accepted
Delegated to: David Miller
Headers show

Commit Message

stephen hemminger Feb. 11, 2013, 6:22 p.m.
Spanning Tree Protocol packets should have always been marked as
control packets, this causes them to get queued in the high prirority
FIFO. As Radia Perlman mentioned in her LCA talk, STP dies if bridge
gets overloaded and can't communicate. This is a long-standing bug back
to the first versions of Linux bridge.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

---
Please consider adding to  stable as well.

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

Comments

David Miller Feb. 11, 2013, 7:18 p.m.
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 11 Feb 2013 10:22:22 -0800

> Spanning Tree Protocol packets should have always been marked as
> control packets, this causes them to get queued in the high prirority
> FIFO. As Radia Perlman mentioned in her LCA talk, STP dies if bridge
> gets overloaded and can't communicate. This is a long-standing bug back
> to the first versions of Linux bridge.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

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
Eric Dumazet Feb. 11, 2013, 10:55 p.m.
On Mon, 2013-02-11 at 10:22 -0800, Stephen Hemminger wrote:
> Spanning Tree Protocol packets should have always been marked as
> control packets, this causes them to get queued in the high prirority
> FIFO. As Radia Perlman mentioned in her LCA talk, STP dies if bridge
> gets overloaded and can't communicate. This is a long-standing bug back
> to the first versions of Linux bridge.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> 
> ---
> Please consider adding to  stable as well.
> 
> --- a/net/bridge/br_stp_bpdu.c	2013-01-16 09:47:00.599539375 -0800
> +++ b/net/bridge/br_stp_bpdu.c	2013-02-11 08:13:56.315979316 -0800
> @@ -16,6 +16,7 @@
>  #include <linux/etherdevice.h>
>  #include <linux/llc.h>
>  #include <linux/slab.h>
> +#include <linux/pkt_sched.h>
>  #include <net/net_namespace.h>
>  #include <net/llc.h>
>  #include <net/llc_pdu.h>
> @@ -40,6 +41,7 @@ static void br_send_bpdu(struct net_brid
>  
>  	skb->dev = p->dev;
>  	skb->protocol = htons(ETH_P_802_2);
> +	skb->priority = TC_PRIO_CONTROL;
>  
>  	skb_reserve(skb, LLC_RESERVE);
>  	memcpy(__skb_put(skb, length), data, length);
> --

I wonder if we should not use the same for ARP packets, as some bonding
modes depend on them as well.



--
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 hide | download patch | download mbox

--- a/net/bridge/br_stp_bpdu.c	2013-01-16 09:47:00.599539375 -0800
+++ b/net/bridge/br_stp_bpdu.c	2013-02-11 08:13:56.315979316 -0800
@@ -16,6 +16,7 @@ 
 #include <linux/etherdevice.h>
 #include <linux/llc.h>
 #include <linux/slab.h>
+#include <linux/pkt_sched.h>
 #include <net/net_namespace.h>
 #include <net/llc.h>
 #include <net/llc_pdu.h>
@@ -40,6 +41,7 @@  static void br_send_bpdu(struct net_brid
 
 	skb->dev = p->dev;
 	skb->protocol = htons(ETH_P_802_2);
+	skb->priority = TC_PRIO_CONTROL;
 
 	skb_reserve(skb, LLC_RESERVE);
 	memcpy(__skb_put(skb, length), data, length);