Commit 45d9cc7c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'geneve' 

Andy Zhou says:

====================
Add Geneve tunnel protocol support

This patch series adds kernel support for Geneve (Generic Network
Virtualization Encapsulation) based on Geneve IETF draft:
http://www.ietf.org/id/draft-gross-geneve-01.txt



Patch 1 implements Geneve tunneling protocol driver

Patch 2-6 adds openvswitch support for creating and using
Geneve tunnels by OVS user space.

v1->v2:   Style fixes: use tab instead space for Kconfig
	  Patch 2-6 are reviewed by Pravin Shetty, add him to acked-by
	  Patch 6 was reviewed by Thomas Graf when commiting
	    to openvswitch.org, add him to acked-by.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c259c132 f5796684

include/net/geneve.h

0 → 100644
+91 −0
Original line number Original line Diff line number Diff line 
#ifndef __NET_GENEVE_H

#define __NET_GENEVE_H  1



#include <net/udp_tunnel.h>



struct geneve_sock;



typedef void (geneve_rcv_t)(struct geneve_sock *gs, struct sk_buff *skb);



struct geneve_sock {

	struct hlist_node	hlist;

	geneve_rcv_t		*rcv;

	void			*rcv_data;

	struct work_struct	del_work;

	struct socket		*sock;

	struct rcu_head		rcu;

	atomic_t		refcnt;

	struct udp_offload	udp_offloads;

};



/* Geneve Header:

 *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 *  |Ver|  Opt Len  |O|C|    Rsvd.  |          Protocol Type        |

 *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 *  |        Virtual Network Identifier (VNI)       |    Reserved   |

 *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 *  |                    Variable Length Options                    |

 *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 *

 * Option Header:

 *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 *  |          Option Class         |      Type     |R|R|R| Length  |

 *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 *  |                      Variable Option Data                     |

 *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

 */



struct geneve_opt {

	__be16	opt_class;

	u8	type;

#ifdef __LITTLE_ENDIAN_BITFIELD

	u8	length:5;

	u8	r3:1;

	u8	r2:1;

	u8	r1:1;

#else

	u8	r1:1;

	u8	r2:1;

	u8	r3:1;

	u8	length:5;

#endif

	u8	opt_data[];

};



#define GENEVE_CRIT_OPT_TYPE (1 << 7)



struct genevehdr {

#ifdef __LITTLE_ENDIAN_BITFIELD

	u8 opt_len:6;

	u8 ver:2;

	u8 rsvd1:6;

	u8 critical:1;

	u8 oam:1;

#else

	u8 ver:2;

	u8 opt_len:6;

	u8 oam:1;

	u8 critical:1;

	u8 rsvd1:6;

#endif

	__be16 proto_type;

	u8 vni[3];

	u8 rsvd2;

	struct geneve_opt options[];

};



#define GENEVE_VER 0

#define GENEVE_BASE_HLEN (sizeof(struct udphdr) + sizeof(struct genevehdr))



struct geneve_sock *geneve_sock_add(struct net *net, __be16 port,

				    geneve_rcv_t *rcv, void *data,

				    bool no_share, bool ipv6);



void geneve_sock_release(struct geneve_sock *vs);



int geneve_xmit_skb(struct geneve_sock *gs, struct rtable *rt,

		    struct sk_buff *skb, __be32 src, __be32 dst, __u8 tos,

		    __u8 ttl, __be16 df, __be16 src_port, __be16 dst_port,

		    __be16 tun_flags, u8 vni[3], u8 opt_len, u8 *opt,

		    bool xnet);

#endif

include/net/ip_tunnels.h

+11 −8
Original line number Original line Diff line number Diff line
@@ -95,6 +95,9 @@ struct ip_tunnel { 
#define TUNNEL_VERSION		__cpu_to_be16(0x40)

#define TUNNEL_VERSION		__cpu_to_be16(0x40)

#define TUNNEL_NO_KEY		__cpu_to_be16(0x80)

#define TUNNEL_NO_KEY		__cpu_to_be16(0x80)

#define TUNNEL_DONT_FRAGMENT    __cpu_to_be16(0x0100)

#define TUNNEL_DONT_FRAGMENT    __cpu_to_be16(0x0100)

#define TUNNEL_OAM		__cpu_to_be16(0x0200)

#define TUNNEL_CRIT_OPT		__cpu_to_be16(0x0400)

#define TUNNEL_OPTIONS_PRESENT	__cpu_to_be16(0x0800)





struct tnl_ptk_info {

struct tnl_ptk_info {

	__be16 flags;

	__be16 flags;

include/uapi/linux/openvswitch.h

+4 −1
Original line number Original line Diff line number Diff line
@@ -192,6 +192,7 @@ enum ovs_vport_type { 
	OVS_VPORT_TYPE_INTERNAL, /* network device implemented by datapath */

	OVS_VPORT_TYPE_INTERNAL, /* network device implemented by datapath */

	OVS_VPORT_TYPE_GRE,      /* GRE tunnel. */

	OVS_VPORT_TYPE_GRE,      /* GRE tunnel. */

	OVS_VPORT_TYPE_VXLAN,	 /* VXLAN tunnel. */

	OVS_VPORT_TYPE_VXLAN,	 /* VXLAN tunnel. */

	OVS_VPORT_TYPE_GENEVE,	 /* Geneve tunnel. */

	__OVS_VPORT_TYPE_MAX

	__OVS_VPORT_TYPE_MAX

};

};
@@ -294,7 +295,7 @@ enum ovs_key_attr { 
	OVS_KEY_ATTR_RECIRC_ID, /* u32 recirc id */

	OVS_KEY_ATTR_RECIRC_ID, /* u32 recirc id */





#ifdef __KERNEL__

#ifdef __KERNEL__

	OVS_KEY_ATTR_IPV4_TUNNEL,  /* struct ovs_key_ipv4_tunnel */

	OVS_KEY_ATTR_TUNNEL_INFO,  /* struct ovs_tunnel_info */

#endif

#endif

	__OVS_KEY_ATTR_MAX

	__OVS_KEY_ATTR_MAX

};

};
@@ -309,6 +310,8 @@ enum ovs_tunnel_key_attr { 
	OVS_TUNNEL_KEY_ATTR_TTL,                /* u8 Tunnel IP TTL. */

	OVS_TUNNEL_KEY_ATTR_TTL,                /* u8 Tunnel IP TTL. */

	OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT,      /* No argument, set DF. */

	OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT,      /* No argument, set DF. */

	OVS_TUNNEL_KEY_ATTR_CSUM,               /* No argument. CSUM packet. */

	OVS_TUNNEL_KEY_ATTR_CSUM,               /* No argument. CSUM packet. */

	OVS_TUNNEL_KEY_ATTR_OAM,                /* No argument. OAM frame.  */

	OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS,        /* Array of Geneve options. */

	__OVS_TUNNEL_KEY_ATTR_MAX

	__OVS_TUNNEL_KEY_ATTR_MAX

};

};

net/ipv4/Kconfig

+14 −0
Original line number Original line Diff line number Diff line
@@ -453,6 +453,20 @@ config TCP_CONG_BIC 
	increase provides TCP friendliness.

	increase provides TCP friendliness.

	See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/

	See http://www.csc.ncsu.edu/faculty/rhee/export/bitcp/





config GENEVE

	tristate "Generic Network Virtualization Encapsulation (Geneve)"

	depends on INET

	select NET_IP_TUNNEL

	select NET_UDP_TUNNEL

	---help---

	This allows one to create Geneve virtual interfaces that provide

	Layer 2 Networks over Layer 3 Networks. Geneve is often used

	to tunnel virtual network infrastructure in virtualized environments.

	For more information see:

	  http://tools.ietf.org/html/draft-gross-geneve-01



	  To compile this driver as a module, choose M here: the module



config TCP_CONG_CUBIC

config TCP_CONG_CUBIC

	tristate "CUBIC TCP"

	tristate "CUBIC TCP"

	default y

	default y

net/ipv4/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -56,6 +56,7 @@ obj-$(CONFIG_TCP_CONG_YEAH) += tcp_yeah.o 
obj-$(CONFIG_TCP_CONG_ILLINOIS) += tcp_illinois.o

obj-$(CONFIG_TCP_CONG_ILLINOIS) += tcp_illinois.o

obj-$(CONFIG_MEMCG_KMEM) += tcp_memcontrol.o

obj-$(CONFIG_MEMCG_KMEM) += tcp_memcontrol.o

obj-$(CONFIG_NETLABEL) += cipso_ipv4.o

obj-$(CONFIG_NETLABEL) += cipso_ipv4.o

obj-$(CONFIG_GENEVE) += geneve.o





obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \

obj-$(CONFIG_XFRM) += xfrm4_policy.o xfrm4_state.o xfrm4_input.o \

		      xfrm4_output.o xfrm4_protocol.o
 
		      xfrm4_output.o xfrm4_protocol.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE