diff mbox

[1/1] net-gre: clear skb->queue_mapping in GRE recv path

Message ID pvm39syraqr.fsf@chavey.mtv.corp.google.com
State Superseded, archived
Delegated to: David Miller
Headers show

Commit Message

laurent chavey Sept. 24, 2010, 11:18 p.m. UTC
From: chavey <chavey@google.com>
Date: Fri, 24 Sep 2010 15:05:02 -0700

A continuous stream of errors:

  slbgre0 received packet on queue [123], but number of RX queues is 1
  net_ratelimit: 155786 callbacks suppressed

is filling up /var/log/messages.

This is due to not unsetting skb->queue_mapping in the GRE receive path.

Signed-off-by: chavey <chavey@google.com>
---
 net/ipv4/ip_gre.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Comments

Eric Dumazet Sept. 25, 2010, 6:46 a.m. UTC | #1
Le vendredi 24 septembre 2010 à 16:18 -0700, chavey@google.com a écrit :
> From: chavey <chavey@google.com>
> Date: Fri, 24 Sep 2010 15:05:02 -0700
> 
> A continuous stream of errors:
> 
>   slbgre0 received packet on queue [123], but number of RX queues is 1
>   net_ratelimit: 155786 callbacks suppressed
> 
> is filling up /var/log/messages.
> 
> This is due to not unsetting skb->queue_mapping in the GRE receive path.
> 
> Signed-off-by: chavey <chavey@google.com>
> ---
>  net/ipv4/ip_gre.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
> index 945b20a..53bdb97 100644
> --- a/net/ipv4/ip_gre.c
> +++ b/net/ipv4/ip_gre.c
> @@ -641,6 +641,7 @@ static int ipgre_rcv(struct sk_buff *skb)
>  		}
>  
>  		skb_tunnel_rx(skb, tunnel->dev);
> +		skb_set_queue_mapping(skb, 0);
>  
>  		skb_reset_network_header(skb);
>  		ipgre_ecn_decapsulate(iph, skb);


Laurent

Please use you full name in your signature, 

Then, have you seen Tom Herbert patch yesterday ?

http://patchwork.ozlabs.org/patch/65583/

He suggested to place this skb_set_queue_mapping(skb, 0) inside
skb_tunnel_rx(), so that we dont patch every tunnel driver ...

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

Patch

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 945b20a..53bdb97 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -641,6 +641,7 @@  static int ipgre_rcv(struct sk_buff *skb)
 		}
 
 		skb_tunnel_rx(skb, tunnel->dev);
+		skb_set_queue_mapping(skb, 0);
 
 		skb_reset_network_header(skb);
 		ipgre_ecn_decapsulate(iph, skb);