From 4c3c5643f1f4ea206f332345e5cf6e31342f7559 Mon Sep 17 00:00:00 2001 From: Pravin B Shelar Date: Mon, 18 Jul 2016 13:53:29 -0700 Subject: [PATCH] datapath: backport: allow output of MPLS packets on tunnel vports Upstream commit: commit fe3a5f6c795810edb1646a840fec3c8c350c2a4e Author: Simon Horman openvswitch: allow output of MPLS packets on tunnel vports Currently output of MPLS packets on tunnel vports is not allowed by Open vSwitch. This is because historically encapsulation was done in such a way that the inner_protocol field of the skb needed to hold the inner protocol for both MPLS and tunnel encapsulation in order for GSO segmentation to be performed correctly. Since b2acd1dc3949 ("openvswitch: Use regular GRE net_device instead of vport") Open vSwitch makes use of lwt to output to tunnel netdevs which perform encapsulation. As no drivers expose support for MPLS offloads this means that GSO packets are segmented in software by validate_xmit_skb(), which is called from __dev_queue_xmit(), before tunnel encapsulation occurs. This means that the inner protocol of MPLS is no longer needed by the time encapsulation occurs and the contention on the inner_protocol field of the skb no longer occurs. Thus it is now safe to output MPLS to tunnel vports. Signed-off-by: Simon Horman Reviewed-by: Jesse Gross Signed-off-by: David S. Miller Signed-off-by: Pravin B Shelar Acked-by: Jesse Gross --- datapath/flow_netlink.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c index fb41f28d8..0f3266468 100644 --- a/datapath/flow_netlink.c +++ b/datapath/flow_netlink.c @@ -2046,9 +2046,10 @@ static int validate_set(const struct nlattr *a, break; case OVS_KEY_ATTR_TUNNEL: +#ifndef USE_UPSTREAM_TUNNEL if (eth_p_mpls(eth_type)) return -EINVAL; - +#endif if (masked) return -EINVAL; /* Masked tunnel set not supported. */ -- 2.20.1