From 29c71cfa0c137abd49bfa346c1b871d2543071ae Mon Sep 17 00:00:00 2001 From: Pravin Shelar Date: Fri, 7 Feb 2014 10:46:53 -0800 Subject: [PATCH] datapath: Add support for Linux 3.12 Bump kernel support for datapath module to include 3.12. Make use of native ip-tunnel API for Kernel >= 3.12. Based on patch from James Page. Signed-off-by: James Page Signed-off-by: Pravin B Shelar Reviewed-by: Kyle Mestery --- FAQ | 2 +- NEWS | 2 ++ acinclude.m4 | 4 +-- datapath/flow_netlink.c | 1 + datapath/linux/compat/gre.c | 5 ++++ datapath/linux/compat/gso.c | 4 +++ datapath/linux/compat/gso.h | 5 ++++ datapath/linux/compat/include/net/gre.h | 4 +++ .../linux/compat/include/net/ip_tunnels.h | 9 +++++- datapath/linux/compat/include/net/vxlan.h | 8 +++++- datapath/linux/compat/ip_tunnels_core.c | 7 ++++- datapath/linux/compat/vxlan.c | 9 ++++-- datapath/vport-gre.c | 2 +- datapath/vport-lisp.c | 28 +++++++++++++++++-- datapath/vport-vxlan.c | 2 +- 15 files changed, 79 insertions(+), 13 deletions(-) diff --git a/FAQ b/FAQ index c6ccbd154..f46170ce2 100644 --- a/FAQ +++ b/FAQ @@ -148,7 +148,7 @@ A: The following table lists the Linux kernel versions against which the 1.10.x 2.6.18 to 3.8 1.11.x 2.6.18 to 3.8 2.0.x 2.6.32 to 3.10 - 2.1.x 2.6.32 to 3.11 + 2.1.x 2.6.32 to 3.12 Open vSwitch userspace should also work with the Linux kernel module built into Linux 3.3 and later. diff --git a/NEWS b/NEWS index f0d5a1062..8ec6c909c 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,8 @@ Post-v2.1.0 - Upon the receipt of a SIGHUP signal, ovs-vswitchd no longer reopens its log file (it will terminate instead). Please use 'ovs-appctl vlog/reopen' instead. + - Support for Linux kernels up to 3.12. On Kernel 3.12 OVS uses tunnel + API for GRE and VXLAN. v2.1.0 - xx xxx xxxx diff --git a/acinclude.m4 b/acinclude.m4 index 830fd3f0d..8f41e3384 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -134,10 +134,10 @@ AC_DEFUN([OVS_CHECK_LINUX], [ AC_MSG_RESULT([$kversion]) if test "$version" -ge 3; then - if test "$version" = 3 && test "$patchlevel" -le 11; then + if test "$version" = 3 && test "$patchlevel" -le 12; then : # Linux 3.x else - AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.11.x is not supported]) + AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 3.12.x is not supported]) fi else if test "$version" -le 1 || test "$patchlevel" -le 5 || test "$sublevel" -le 31; then diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c index 40751cb54..4c68a68b9 100644 --- a/datapath/flow_netlink.c +++ b/datapath/flow_netlink.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include diff --git a/datapath/linux/compat/gre.c b/datapath/linux/compat/gre.c index 58b1e73e9..07b270a02 100644 --- a/datapath/linux/compat/gre.c +++ b/datapath/linux/compat/gre.c @@ -16,6 +16,9 @@ * 02110-1301, USA */ +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0) + #include #if IS_ENABLED(CONFIG_NET_IPGRE_DEMUX) @@ -340,3 +343,5 @@ void gre_build_header(struct sk_buff *skb, const struct tnl_ptk_info *tpi, } #endif /* CONFIG_NET_IPGRE_DEMUX */ + +#endif /* 3.12 */ diff --git a/datapath/linux/compat/gso.c b/datapath/linux/compat/gso.c index 32f906c82..9ded17c63 100644 --- a/datapath/linux/compat/gso.c +++ b/datapath/linux/compat/gso.c @@ -16,6 +16,9 @@ * 02110-1301, USA */ +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0) + #include #include #include @@ -229,3 +232,4 @@ int rpl_ip_local_out(struct sk_buff *skb) } return ret; } +#endif /* 3.12 */ diff --git a/datapath/linux/compat/gso.h b/datapath/linux/compat/gso.h index 44fd213f0..b83a4c3c8 100644 --- a/datapath/linux/compat/gso.h +++ b/datapath/linux/compat/gso.h @@ -1,6 +1,9 @@ #ifndef __LINUX_GSO_WRAPPER_H #define __LINUX_GSO_WRAPPER_H +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0) + #include #include @@ -69,4 +72,6 @@ static inline void skb_reset_inner_headers(struct sk_buff *skb) #define ip_local_out rpl_ip_local_out int ip_local_out(struct sk_buff *skb); + +#endif /* 3.12 */ #endif diff --git a/datapath/linux/compat/include/net/gre.h b/datapath/linux/compat/include/net/gre.h index a6f29c45c..6268655fc 100644 --- a/datapath/linux/compat/include/net/gre.h +++ b/datapath/linux/compat/include/net/gre.h @@ -4,6 +4,7 @@ #include #include +#include #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37) || \ defined(HAVE_GRE_CISCO_REGISTER) #include_next @@ -78,6 +79,8 @@ static inline __be16 tnl_flags_to_gre_flags(__be16 tflags) #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,10,0) */ #endif /* HAVE_GRE_CISCO_REGISTER */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0) + #define gre_build_header rpl_gre_build_header void gre_build_header(struct sk_buff *skb, const struct tnl_ptk_info *tpi, int hdr_len); @@ -98,5 +101,6 @@ static inline int ip_gre_calc_hlen(__be16 o_flags) addend += 4; return addend; } +#endif #endif diff --git a/datapath/linux/compat/include/net/ip_tunnels.h b/datapath/linux/compat/include/net/ip_tunnels.h index a786aa99d..e59f9f356 100644 --- a/datapath/linux/compat/include/net/ip_tunnels.h +++ b/datapath/linux/compat/include/net/ip_tunnels.h @@ -1,6 +1,11 @@ #ifndef __NET_IP_TUNNELS_WRAPPER_H #define __NET_IP_TUNNELS_WRAPPER_H 1 +#include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0) +#include_next +#else + #include #include #include @@ -34,7 +39,9 @@ struct tnl_ptk_info { int iptunnel_xmit(struct rtable *rt, struct sk_buff *skb, __be32 src, __be32 dst, __u8 proto, - __u8 tos, __u8 ttl, __be16 df); + __u8 tos, __u8 ttl, __be16 df, bool xnet); int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto); + +#endif #endif /* __NET_IP_TUNNELS_H */ diff --git a/datapath/linux/compat/include/net/vxlan.h b/datapath/linux/compat/include/net/vxlan.h index 3ac816b51..414a49703 100644 --- a/datapath/linux/compat/include/net/vxlan.h +++ b/datapath/linux/compat/include/net/vxlan.h @@ -5,6 +5,11 @@ #include #include +#include +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0) +#include_next +#else + struct vxlan_sock; typedef void (vxlan_rcv_t)(struct vxlan_sock *vs, struct sk_buff *skb, __be32 key); @@ -20,7 +25,7 @@ struct vxlan_sock { struct vxlan_sock *vxlan_sock_add(struct net *net, __be16 port, vxlan_rcv_t *rcv, void *data, - bool no_share); + bool no_share, bool ipv6); void vxlan_sock_release(struct vxlan_sock *vs); @@ -31,4 +36,5 @@ int vxlan_xmit_skb(struct vxlan_sock *vs, __be16 vxlan_src_port(__u16 port_min, __u16 port_max, struct sk_buff *skb); +#endif /* 3.12 */ #endif diff --git a/datapath/linux/compat/ip_tunnels_core.c b/datapath/linux/compat/ip_tunnels_core.c index 66d5e0252..779075d1e 100644 --- a/datapath/linux/compat/ip_tunnels_core.c +++ b/datapath/linux/compat/ip_tunnels_core.c @@ -16,6 +16,9 @@ * 02110-1301, USA */ +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0) + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include @@ -37,7 +40,7 @@ int iptunnel_xmit(struct rtable *rt, struct sk_buff *skb, __be32 src, __be32 dst, __u8 proto, - __u8 tos, __u8 ttl, __be16 df) + __u8 tos, __u8 ttl, __be16 df, bool xnet) { int pkt_len = skb->len; struct iphdr *iph; @@ -108,3 +111,5 @@ int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto) skb->pkt_type = PACKET_HOST; return 0; } + +#endif /* 3.12 */ diff --git a/datapath/linux/compat/vxlan.c b/datapath/linux/compat/vxlan.c index 64877e069..848a3952b 100644 --- a/datapath/linux/compat/vxlan.c +++ b/datapath/linux/compat/vxlan.c @@ -18,6 +18,9 @@ * This code is derived from kernel vxlan module. */ +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0) + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include @@ -223,7 +226,7 @@ int vxlan_xmit_skb(struct vxlan_sock *vs, if (err) return err; - return iptunnel_xmit(rt, skb, src, dst, IPPROTO_UDP, tos, ttl, df); + return iptunnel_xmit(rt, skb, src, dst, IPPROTO_UDP, tos, ttl, df, false); } static void rcu_free_vs(struct rcu_head *rcu) @@ -298,7 +301,7 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, __be16 port, struct vxlan_sock *vxlan_sock_add(struct net *net, __be16 port, vxlan_rcv_t *rcv, void *data, - bool no_share) + bool no_share, bool ipv6) { return vxlan_socket_create(net, port, rcv, data); } @@ -310,3 +313,5 @@ void vxlan_sock_release(struct vxlan_sock *vs) queue_work(system_wq, &vs->del_work); } + +#endif /* 3.12 */ diff --git a/datapath/vport-gre.c b/datapath/vport-gre.c index 8737b63d7..86137565a 100644 --- a/datapath/vport-gre.c +++ b/datapath/vport-gre.c @@ -178,7 +178,7 @@ static int __send(struct vport *vport, struct sk_buff *skb, return iptunnel_xmit(rt, skb, saddr, OVS_CB(skb)->tun_key->ipv4_dst, IPPROTO_GRE, OVS_CB(skb)->tun_key->ipv4_tos, - OVS_CB(skb)->tun_key->ipv4_ttl, df); + OVS_CB(skb)->tun_key->ipv4_ttl, df, false); err_free_rt: ip_rt_put(rt); error: diff --git a/datapath/vport-lisp.c b/datapath/vport-lisp.c index c2698ae9d..e33cffea2 100644 --- a/datapath/vport-lisp.c +++ b/datapath/vport-lisp.c @@ -381,6 +381,8 @@ error: return ERR_PTR(err); } +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0) + static void lisp_fix_segment(struct sk_buff *skb) { struct udphdr *udph = udp_hdr(skb); @@ -388,13 +390,30 @@ static void lisp_fix_segment(struct sk_buff *skb) udph->len = htons(skb->len - skb_transport_offset(skb)); } -static void handle_offloads(struct sk_buff *skb) +static int handle_offloads(struct sk_buff *skb) { if (skb_is_gso(skb)) OVS_GSO_CB(skb)->fix_segment = lisp_fix_segment; else if (skb->ip_summed != CHECKSUM_PARTIAL) skb->ip_summed = CHECKSUM_NONE; + return 0; } +#else +static int handle_offloads(struct sk_buff *skb) +{ + if (skb_is_gso(skb)) { + int err = skb_unclone(skb, GFP_ATOMIC); + if (unlikely(err)) + return err; + + skb_shinfo(skb)->gso_type |= SKB_GSO_UDP_TUNNEL; + } else if (skb->ip_summed != CHECKSUM_PARTIAL) + skb->ip_summed = CHECKSUM_NONE; + + skb->encapsulation = 1; + return 0; +} +#endif static int lisp_send(struct vport *vport, struct sk_buff *skb) { @@ -455,7 +474,10 @@ static int lisp_send(struct vport *vport, struct sk_buff *skb) lisp_build_header(vport, skb); /* Offloading */ - handle_offloads(skb); + err = handle_offloads(skb); + if (err) + goto err_free_rt; + skb->local_df = 1; df = OVS_CB(skb)->tun_key->tun_flags & @@ -463,7 +485,7 @@ static int lisp_send(struct vport *vport, struct sk_buff *skb) sent_len = iptunnel_xmit(rt, skb, saddr, OVS_CB(skb)->tun_key->ipv4_dst, IPPROTO_UDP, OVS_CB(skb)->tun_key->ipv4_tos, - OVS_CB(skb)->tun_key->ipv4_ttl, df); + OVS_CB(skb)->tun_key->ipv4_ttl, df, false); return sent_len > 0 ? sent_len + network_offset : sent_len; diff --git a/datapath/vport-vxlan.c b/datapath/vport-vxlan.c index ab2b6f73f..d26478535 100644 --- a/datapath/vport-vxlan.c +++ b/datapath/vport-vxlan.c @@ -124,7 +124,7 @@ static struct vport *vxlan_tnl_create(const struct vport_parms *parms) vxlan_port = vxlan_vport(vport); strncpy(vxlan_port->name, parms->name, IFNAMSIZ); - vs = vxlan_sock_add(net, htons(dst_port), vxlan_rcv, vport, true); + vs = vxlan_sock_add(net, htons(dst_port), vxlan_rcv, vport, true, false); if (IS_ERR(vs)) { ovs_vport_free(vport); return (void *)vs; -- 2.43.0