Commit 6b798d70 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net_next_ovs' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch 



Pravin B Shelar says:

====================
Open vSwitch

First two patches are related to OVS MPLS support. Rest of patches
are mostly refactoring and minor improvements to openvswitch.

v1-v2:
 - Fix conflicts due to "gue: Remote checksum offload"
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 271d70f4 a85311bf

include/linux/netdev_features.h

+1 −4
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ enum { 
	NETIF_F_GSO_SIT_BIT,		/* ... SIT tunnel with TSO */

	NETIF_F_GSO_UDP_TUNNEL_BIT,	/* ... UDP TUNNEL with TSO */

	NETIF_F_GSO_UDP_TUNNEL_CSUM_BIT,/* ... UDP TUNNEL with TSO & CSUM */

	NETIF_F_GSO_MPLS_BIT,		/* ... MPLS segmentation */

	NETIF_F_GSO_TUNNEL_REMCSUM_BIT, /* ... TUNNEL with TSO & REMCSUM */

	/**/NETIF_F_GSO_LAST =		/* last bit, see GSO_MASK */

		NETIF_F_GSO_TUNNEL_REMCSUM_BIT,
@@ -119,7 +118,6 @@ enum { 
#define NETIF_F_GSO_SIT		__NETIF_F(GSO_SIT)

#define NETIF_F_GSO_UDP_TUNNEL	__NETIF_F(GSO_UDP_TUNNEL)

#define NETIF_F_GSO_UDP_TUNNEL_CSUM __NETIF_F(GSO_UDP_TUNNEL_CSUM)

#define NETIF_F_GSO_MPLS	__NETIF_F(GSO_MPLS)

#define NETIF_F_GSO_TUNNEL_REMCSUM __NETIF_F(GSO_TUNNEL_REMCSUM)

#define NETIF_F_HW_VLAN_STAG_FILTER __NETIF_F(HW_VLAN_STAG_FILTER)

#define NETIF_F_HW_VLAN_STAG_RX	__NETIF_F(HW_VLAN_STAG_RX)
@@ -183,7 +181,6 @@ enum { 
				 NETIF_F_GSO_IPIP |			\

				 NETIF_F_GSO_SIT |			\

				 NETIF_F_GSO_UDP_TUNNEL |		\

				 NETIF_F_GSO_UDP_TUNNEL_CSUM |		\

				 NETIF_F_GSO_MPLS)

				 NETIF_F_GSO_UDP_TUNNEL_CSUM)



#endif	/* _LINUX_NETDEV_FEATURES_H */

include/linux/netdevice.h

+0 −1
Original line number Diff line number Diff line
@@ -3583,7 +3583,6 @@ static inline bool net_gso_ok(netdev_features_t features, int gso_type) 
	BUILD_BUG_ON(SKB_GSO_SIT     != (NETIF_F_GSO_SIT >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_UDP_TUNNEL != (NETIF_F_GSO_UDP_TUNNEL >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_UDP_TUNNEL_CSUM != (NETIF_F_GSO_UDP_TUNNEL_CSUM >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_MPLS    != (NETIF_F_GSO_MPLS >> NETIF_F_GSO_SHIFT));

	BUILD_BUG_ON(SKB_GSO_TUNNEL_REMCSUM != (NETIF_F_GSO_TUNNEL_REMCSUM >> NETIF_F_GSO_SHIFT));



	return (features & feature) == feature;

include/linux/skbuff.h

+1 −3
Original line number Diff line number Diff line
@@ -372,9 +372,7 @@ enum { 


	SKB_GSO_UDP_TUNNEL_CSUM = 1 << 11,



	SKB_GSO_MPLS = 1 << 12,



	SKB_GSO_TUNNEL_REMCSUM = 1 << 13,

	SKB_GSO_TUNNEL_REMCSUM = 1 << 12,

};



#if BITS_PER_LONG > 32

include/net/mpls.h

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014 Nicira, Inc.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of version 2 of the GNU General Public

 * License as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

 * General Public License for more details.

 */



#ifndef _NET_MPLS_H

#define _NET_MPLS_H 1



#include <linux/if_ether.h>

#include <linux/netdevice.h>



#define MPLS_HLEN 4



static inline bool eth_p_mpls(__be16 eth_type)

{

	return eth_type == htons(ETH_P_MPLS_UC) ||

		eth_type == htons(ETH_P_MPLS_MC);

}



/*

 * For non-MPLS skbs this will correspond to the network header.

 * For MPLS skbs it will be before the network_header as the MPLS

 * label stack lies between the end of the mac header and the network

 * header. That is, for MPLS skbs the end of the mac header

 * is the top of the MPLS label stack.

 */

static inline unsigned char *skb_mpls_header(struct sk_buff *skb)

{

	return skb_mac_header(skb) + skb->mac_len;

}

#endif

include/uapi/linux/openvswitch.h

+35 −3
Original line number Diff line number Diff line
@@ -293,6 +293,9 @@ enum ovs_key_attr { 
	OVS_KEY_ATTR_DP_HASH,      /* u32 hash value. Value 0 indicates the hash

				   is not computed by the datapath. */

	OVS_KEY_ATTR_RECIRC_ID, /* u32 recirc id */

	OVS_KEY_ATTR_MPLS,      /* array of struct ovs_key_mpls.

				 * The implementation may restrict

				 * the accepted length of the array. */



#ifdef __KERNEL__

	OVS_KEY_ATTR_TUNNEL_INFO,  /* struct ovs_tunnel_info */
@@ -340,6 +343,10 @@ struct ovs_key_ethernet { 
	__u8	 eth_dst[ETH_ALEN];

};



struct ovs_key_mpls {

	__be32 mpls_lse;

};



struct ovs_key_ipv4 {

	__be32 ipv4_src;

	__be32 ipv4_dst;
@@ -393,7 +400,7 @@ struct ovs_key_arp { 
};



struct ovs_key_nd {

	__u32 nd_target[4];

	__be32	nd_target[4];

	__u8	nd_sll[ETH_ALEN];

	__u8	nd_tll[ETH_ALEN];

};
@@ -483,6 +490,19 @@ enum ovs_userspace_attr { 


#define OVS_USERSPACE_ATTR_MAX (__OVS_USERSPACE_ATTR_MAX - 1)



/**

 * struct ovs_action_push_mpls - %OVS_ACTION_ATTR_PUSH_MPLS action argument.

 * @mpls_lse: MPLS label stack entry to push.

 * @mpls_ethertype: Ethertype to set in the encapsulating ethernet frame.

 *

 * The only values @mpls_ethertype should ever be given are %ETH_P_MPLS_UC and

 * %ETH_P_MPLS_MC, indicating MPLS unicast or multicast. Other are rejected.

 */

struct ovs_action_push_mpls {

	__be32 mpls_lse;

	__be16 mpls_ethertype; /* Either %ETH_P_MPLS_UC or %ETH_P_MPLS_MC */

};



/**

 * struct ovs_action_push_vlan - %OVS_ACTION_ATTR_PUSH_VLAN action argument.

 * @vlan_tpid: Tag protocol identifier (TPID) to push.
@@ -534,6 +554,15 @@ struct ovs_action_hash { 
 * @OVS_ACTION_ATTR_POP_VLAN: Pop the outermost 802.1Q header off the packet.

 * @OVS_ACTION_ATTR_SAMPLE: Probabilitically executes actions, as specified in

 * the nested %OVS_SAMPLE_ATTR_* attributes.

 * @OVS_ACTION_ATTR_PUSH_MPLS: Push a new MPLS label stack entry onto the

 * top of the packets MPLS label stack.  Set the ethertype of the

 * encapsulating frame to either %ETH_P_MPLS_UC or %ETH_P_MPLS_MC to

 * indicate the new packet contents.

 * @OVS_ACTION_ATTR_POP_MPLS: Pop an MPLS label stack entry off of the

 * packet's MPLS label stack.  Set the encapsulating frame's ethertype to

 * indicate the new packet contents. This could potentially still be

 * %ETH_P_MPLS if the resulting MPLS label stack is not empty.  If there

 * is no MPLS label stack, as determined by ethertype, no action is taken.

 *

 * Only a single header can be set with a single %OVS_ACTION_ATTR_SET.  Not all

 * fields within a header are modifiable, e.g. the IPv4 protocol and fragment
@@ -550,6 +579,9 @@ enum ovs_action_attr { 
	OVS_ACTION_ATTR_SAMPLE,       /* Nested OVS_SAMPLE_ATTR_*. */

	OVS_ACTION_ATTR_RECIRC,       /* u32 recirc_id. */

	OVS_ACTION_ATTR_HASH,	      /* struct ovs_action_hash. */

	OVS_ACTION_ATTR_PUSH_MPLS,    /* struct ovs_action_push_mpls. */

	OVS_ACTION_ATTR_POP_MPLS,     /* __be16 ethertype. */



	__OVS_ACTION_ATTR_MAX

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE