gre: set inner_protocol on xmit

shorman-netronome · davem330 · commit 3d7b33209201 · 2016-08-15T13:37:12.000-07:00
Ensure that the inner_protocol is set on transmit so that GSO segmentation, which relies on that field, works correctly. This is achieved by setting the inner_protocol in gre_build_header rather than each caller of that function. It ensures that the inner_protocol is set when gre_fb_xmit() is used to transmit GRE which was not previously the case. I have observed this is not the case when OvS transmits GRE using lwtunnel metadata (which it always does). Fixes: 3872035 ("gre: Use inner_proto to obtain inner header protocol") Cc: Pravin Shelar <pshelar@ovn.org> Acked-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Simon Horman <simon.horman@netronome.com> Acked-by: Pravin B Shelar <pshelar@ovn.org> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/include/net/gre.h b/include/net/gre.h
@@ -104,6 +104,7 @@ static inline void gre_build_header(struct sk_buff *skb, int hdr_len,
 
 	skb_push(skb, hdr_len);
 
+	skb_set_inner_protocol(skb, proto);
 	skb_reset_transport_header(skb);
 	greh = (struct gre_base_hdr *)skb->data;
 	greh->flags = gre_tnl_flags_to_gre_flags(flags);
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
@@ -370,7 +370,6 @@ static void __gre_xmit(struct sk_buff *skb, struct net_device *dev,
 			 tunnel->parms.o_flags, proto, tunnel->parms.o_key,
 			 htonl(tunnel->o_seqno));
 
-	skb_set_inner_protocol(skb, proto);
 	ip_tunnel_xmit(skb, dev, tnl_params, tnl_params->protocol);
 }
 
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
@@ -519,8 +519,6 @@ static netdev_tx_t __gre6_xmit(struct sk_buff *skb,
 	gre_build_header(skb, tunnel->tun_hlen, tunnel->parms.o_flags,
 			 protocol, tunnel->parms.o_key, htonl(tunnel->o_seqno));
 
-	skb_set_inner_protocol(skb, protocol);
-
 	return ip6_tnl_xmit(skb, dev, dsfield, fl6, encap_limit, pmtu,
 			    NEXTHDR_GRE);
 }

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,6 @@ static void __gre_xmit(struct sk_buff skb, struct net_device dev,`
`370`	`370`	`tunnel->parms.o_flags, proto, tunnel->parms.o_key,`
`371`	`371`	`htonl(tunnel->o_seqno));`
`372`	`372`
`373`		`- skb_set_inner_protocol(skb, proto);`
`374`	`373`	`ip_tunnel_xmit(skb, dev, tnl_params, tnl_params->protocol);`
`375`	`374`	`}`
`376`	`375`
Original file line number	Diff line number	Diff line change
`@@ -519,8 +519,6 @@ static netdev_tx_t __gre6_xmit(struct sk_buff *skb,`
`519`	`519`	`gre_build_header(skb, tunnel->tun_hlen, tunnel->parms.o_flags,`
`520`	`520`	`protocol, tunnel->parms.o_key, htonl(tunnel->o_seqno));`
`521`	`521`
`522`		`- skb_set_inner_protocol(skb, protocol);`
`523`		`-`
`524`	`522`	`return ip6_tnl_xmit(skb, dev, dsfield, fl6, encap_limit, pmtu,`
`525`	`523`	`NEXTHDR_GRE);`
`526`	`524`	`}`