| Message ID | 1410574920-16486-2-git-send-email-azhou@nicira.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, Sep 12, 2014 at 7:21 PM, Andy Zhou <azhou@nicira.com> wrote: > Add ip6_udp_tunnel.c for ipv6 UDP tunnel functions to avoid ifdefs > in udp_tunnel.c > > Signed-off-by: Andy Zhou <azhou@nicira.com> > --- > include/net/udp_tunnel.h | 28 +++++++++- > net/ipv4/udp_tunnel.c | 136 ++++++++++++++++++++++++--------------------- > net/ipv6/Makefile | 1 + > net/ipv6/ip6_udp_tunnel.c | 63 +++++++++++++++++++++ > 4 files changed, 162 insertions(+), 66 deletions(-) > create mode 100644 net/ipv6/ip6_udp_tunnel.c > > diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h > index ffd69cb..0b9e017 100644 > --- a/include/net/udp_tunnel.h > +++ b/include/net/udp_tunnel.h > @@ -26,7 +26,31 @@ struct udp_port_cfg { > use_udp6_rx_checksums:1; > }; > > -int udp_sock_create(struct net *net, struct udp_port_cfg *cfg, > - struct socket **sockp); > +int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg, > + struct socket **sockp); > + > +#if IS_ENABLED(CONFIG_IPV6) > +int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg, > + struct socket **sockp); > +#else > +static inline int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg, > + struct socket **sockp) > +{ > + return 0; > +} > +#endif > + > +static inline int udp_sock_create(struct net *net, > + struct udp_port_cfg *cfg, > + struct socket **sockp) > +{ > + if (cfg->family == AF_INET) > + return udp_sock_create4(net, cfg, sockp); > + > + if (cfg->family == AF_INET6) > + return udp_sock_create6(net, cfg, sockp); > + > + return -EPFNOSUPPORT; > +} > > #endif > diff --git a/net/ipv4/udp_tunnel.c b/net/ipv4/udp_tunnel.c > index 61ec1a6..93ef133 100644 > --- a/net/ipv4/udp_tunnel.c > +++ b/net/ipv4/udp_tunnel.c > @@ -8,83 +8,40 @@ > #include <net/udp_tunnel.h> > #include <net/net_namespace.h> > > -int udp_sock_create(struct net *net, struct udp_port_cfg *cfg, > - struct socket **sockp) > +int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg, > + struct socket **sockp) > { > int err = -EINVAL; > struct socket *sock = NULL; > + struct sockaddr_in udp_addr; > > -#if IS_ENABLED(CONFIG_IPV6) > - if (cfg->family == AF_INET6) { > - struct sockaddr_in6 udp6_addr; > + err = sock_create_kern(AF_INET, SOCK_DGRAM, 0, &sock); > + if (err < 0) > + goto error; > > - err = sock_create_kern(AF_INET6, SOCK_DGRAM, 0, &sock); > - if (err < 0) > - goto error; > - > - sk_change_net(sock->sk, net); > - > - udp6_addr.sin6_family = AF_INET6; > - memcpy(&udp6_addr.sin6_addr, &cfg->local_ip6, > - sizeof(udp6_addr.sin6_addr)); > - udp6_addr.sin6_port = cfg->local_udp_port; > - err = kernel_bind(sock, (struct sockaddr *)&udp6_addr, > - sizeof(udp6_addr)); > - if (err < 0) > - goto error; > - > - if (cfg->peer_udp_port) { > - udp6_addr.sin6_family = AF_INET6; > - memcpy(&udp6_addr.sin6_addr, &cfg->peer_ip6, > - sizeof(udp6_addr.sin6_addr)); > - udp6_addr.sin6_port = cfg->peer_udp_port; > - err = kernel_connect(sock, > - (struct sockaddr *)&udp6_addr, > - sizeof(udp6_addr), 0); > - } > - if (err < 0) > - goto error; > + sk_change_net(sock->sk, net); > > - udp_set_no_check6_tx(sock->sk, !cfg->use_udp6_tx_checksums); > - udp_set_no_check6_rx(sock->sk, !cfg->use_udp6_rx_checksums); > - } else > -#endif > - if (cfg->family == AF_INET) { > - struct sockaddr_in udp_addr; > - > - err = sock_create_kern(AF_INET, SOCK_DGRAM, 0, &sock); > - if (err < 0) > - goto error; > - > - sk_change_net(sock->sk, net); > + udp_addr.sin_family = AF_INET; > + udp_addr.sin_addr = cfg->local_ip; > + udp_addr.sin_port = cfg->local_udp_port; > + err = kernel_bind(sock, (struct sockaddr *)&udp_addr, > + sizeof(udp_addr)); > + if (err < 0) > + goto error; > > + if (cfg->peer_udp_port) { > udp_addr.sin_family = AF_INET; > - udp_addr.sin_addr = cfg->local_ip; > - udp_addr.sin_port = cfg->local_udp_port; > - err = kernel_bind(sock, (struct sockaddr *)&udp_addr, > - sizeof(udp_addr)); > + udp_addr.sin_addr = cfg->peer_ip; > + udp_addr.sin_port = cfg->peer_udp_port; > + err = kernel_connect(sock, (struct sockaddr *)&udp_addr, > + sizeof(udp_addr), 0); > if (err < 0) > goto error; > - > - if (cfg->peer_udp_port) { > - udp_addr.sin_family = AF_INET; > - udp_addr.sin_addr = cfg->peer_ip; > - udp_addr.sin_port = cfg->peer_udp_port; > - err = kernel_connect(sock, > - (struct sockaddr *)&udp_addr, > - sizeof(udp_addr), 0); > - if (err < 0) > - goto error; > - } > - > - sock->sk->sk_no_check_tx = !cfg->use_udp_checksums; > - } else { > - return -EPFNOSUPPORT; > } > > + sock->sk->sk_no_check_tx = !cfg->use_udp_checksums; > > *sockp = sock; > - > return 0; > > error: > @@ -95,6 +52,57 @@ error: > *sockp = NULL; > return err; > } > -EXPORT_SYMBOL(udp_sock_create); > +EXPORT_SYMBOL(udp_sock_create4); > + > +void setup_udp_tunnel_sock(struct net *net, struct udp_tunnel_sock_cfg *cfg) > +{ > + struct socket *sock = cfg->sock; > + struct sock *sk = sock->sk; sock should be a parameter, not field in configuration. > + > + /* Disable multicast loopback */ > + inet_sk(sk)->mc_loop = 0; > + > + /* Enable CHECKSUM_UNNECESSAY to CHECSUM_COMPLETE conversion */ Typo. > + udp_set_convert_csum(sk, true); > + > + rcu_assign_sk_user_data(sk, cfg->sk_user_data); > + > + udp_sk(sk)->encap_type = cfg->encap_type; > + udp_sk(sk)->encap_rcv = cfg->encap_rcv; > + udp_sk(sk)->encap_destroy = cfg->encap_destroy; > + > + udp_tunnel_encap_enable(sock); > +} > +EXPORT_SYMBOL_GPL(setup_udp_tunnel_sock); > + > +int udp_tunnel_xmit_skb(struct socket *sock, struct rtable *rt, > + struct sk_buff *skb, __be32 src, __be32 dst, > + __u8 tos, __u8 ttl, __be16 df, __be16 src_port, > + __be16 dst_port, bool xnet) > +{ > + struct udphdr *uh; > + > + __skb_push(skb, sizeof(*uh)); > + skb_reset_transport_header(skb); > + uh = udp_hdr(skb); > + > + uh->dest = dst_port; > + uh->source = src_port; > + uh->len = htons(skb->len); > + > + udp_set_csum(sock->sk->sk_no_check_tx, skb, src, dst, skb->len); > + > + return iptunnel_xmit(sock->sk, rt, skb, src, dst, IPPROTO_UDP, > + tos, ttl, df, xnet); > +} > +EXPORT_SYMBOL_GPL(udp_tunnel_xmit_skb); > + > +void udp_tunnel_sock_release(struct socket *sock) > +{ > + rcu_assign_sk_user_data(sock->sk, NULL); > + kernel_sock_shutdown(sock, SHUT_RDWR); > + sk_release_kernel(sock->sk); > +} > +EXPORT_SYMBOL_GPL(udp_tunnel_sock_release); > > MODULE_LICENSE("GPL"); > diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile > index 2fe6836..45f830e 100644 > --- a/net/ipv6/Makefile > +++ b/net/ipv6/Makefile > @@ -35,6 +35,7 @@ obj-$(CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION) += xfrm6_mode_ro.o > obj-$(CONFIG_INET6_XFRM_MODE_BEET) += xfrm6_mode_beet.o > obj-$(CONFIG_IPV6_MIP6) += mip6.o > obj-$(CONFIG_NETFILTER) += netfilter/ > +obj-$(CONFIG_NET_UDP_TUNNEL) += ip6_udp_tunnel.o > > obj-$(CONFIG_IPV6_VTI) += ip6_vti.o > obj-$(CONFIG_IPV6_SIT) += sit.o > diff --git a/net/ipv6/ip6_udp_tunnel.c b/net/ipv6/ip6_udp_tunnel.c > new file mode 100644 > index 0000000..bcfbb4b > --- /dev/null > +++ b/net/ipv6/ip6_udp_tunnel.c > @@ -0,0 +1,63 @@ > +#include <linux/module.h> > +#include <linux/errno.h> > +#include <linux/socket.h> > +#include <linux/udp.h> > +#include <linux/types.h> > +#include <linux/kernel.h> > +#include <linux/in6.h> > +#include <net/udp.h> > +#include <net/udp_tunnel.h> > +#include <net/net_namespace.h> > +#include <net/netns/generic.h> > +#include <net/ip6_tunnel.h> > +#include <net/ip6_checksum.h> > + > +int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg, > + struct socket **sockp) > +{ > + struct sockaddr_in6 udp6_addr; > + int err; > + struct socket *sock = NULL; > + > + err = sock_create_kern(AF_INET6, SOCK_DGRAM, 0, &sock); > + if (err < 0) > + goto error; > + > + sk_change_net(sock->sk, net); > + > + udp6_addr.sin6_family = AF_INET6; > + memcpy(&udp6_addr.sin6_addr, &cfg->local_ip6, > + sizeof(udp6_addr.sin6_addr)); > + udp6_addr.sin6_port = cfg->local_udp_port; > + err = kernel_bind(sock, (struct sockaddr *)&udp6_addr, > + sizeof(udp6_addr)); > + if (err < 0) > + goto error; > + > + if (cfg->peer_udp_port) { > + udp6_addr.sin6_family = AF_INET6; > + memcpy(&udp6_addr.sin6_addr, &cfg->peer_ip6, > + sizeof(udp6_addr.sin6_addr)); > + udp6_addr.sin6_port = cfg->peer_udp_port; > + err = kernel_connect(sock, > + (struct sockaddr *)&udp6_addr, > + sizeof(udp6_addr), 0); > + } > + if (err < 0) > + goto error; > + > + udp_set_no_check6_tx(sock->sk, !cfg->use_udp6_tx_checksums); > + udp_set_no_check6_rx(sock->sk, !cfg->use_udp6_rx_checksums); > + > + *sockp = sock; > + return 0; > + > +error: > + if (sock) { > + kernel_sock_shutdown(sock, SHUT_RDWR); > + sk_release_kernel(sock->sk); > + } > + *sockp = NULL; > + return err; > +} > +EXPORT_SYMBOL_GPL(udp_sock_create6); > -- > 1.7.9.5 > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h index ffd69cb..0b9e017 100644 --- a/include/net/udp_tunnel.h +++ b/include/net/udp_tunnel.h @@ -26,7 +26,31 @@ struct udp_port_cfg { use_udp6_rx_checksums:1; }; -int udp_sock_create(struct net *net, struct udp_port_cfg *cfg, - struct socket **sockp); +int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg, + struct socket **sockp); + +#if IS_ENABLED(CONFIG_IPV6) +int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg, + struct socket **sockp); +#else +static inline int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg, + struct socket **sockp) +{ + return 0; +} +#endif + +static inline int udp_sock_create(struct net *net, + struct udp_port_cfg *cfg, + struct socket **sockp) +{ + if (cfg->family == AF_INET) + return udp_sock_create4(net, cfg, sockp); + + if (cfg->family == AF_INET6) + return udp_sock_create6(net, cfg, sockp); + + return -EPFNOSUPPORT; +} #endif diff --git a/net/ipv4/udp_tunnel.c b/net/ipv4/udp_tunnel.c index 61ec1a6..93ef133 100644 --- a/net/ipv4/udp_tunnel.c +++ b/net/ipv4/udp_tunnel.c @@ -8,83 +8,40 @@ #include <net/udp_tunnel.h> #include <net/net_namespace.h> -int udp_sock_create(struct net *net, struct udp_port_cfg *cfg, - struct socket **sockp) +int udp_sock_create4(struct net *net, struct udp_port_cfg *cfg, + struct socket **sockp) { int err = -EINVAL; struct socket *sock = NULL; + struct sockaddr_in udp_addr; -#if IS_ENABLED(CONFIG_IPV6) - if (cfg->family == AF_INET6) { - struct sockaddr_in6 udp6_addr; + err = sock_create_kern(AF_INET, SOCK_DGRAM, 0, &sock); + if (err < 0) + goto error; - err = sock_create_kern(AF_INET6, SOCK_DGRAM, 0, &sock); - if (err < 0) - goto error; - - sk_change_net(sock->sk, net); - - udp6_addr.sin6_family = AF_INET6; - memcpy(&udp6_addr.sin6_addr, &cfg->local_ip6, - sizeof(udp6_addr.sin6_addr)); - udp6_addr.sin6_port = cfg->local_udp_port; - err = kernel_bind(sock, (struct sockaddr *)&udp6_addr, - sizeof(udp6_addr)); - if (err < 0) - goto error; - - if (cfg->peer_udp_port) { - udp6_addr.sin6_family = AF_INET6; - memcpy(&udp6_addr.sin6_addr, &cfg->peer_ip6, - sizeof(udp6_addr.sin6_addr)); - udp6_addr.sin6_port = cfg->peer_udp_port; - err = kernel_connect(sock, - (struct sockaddr *)&udp6_addr, - sizeof(udp6_addr), 0); - } - if (err < 0) - goto error; + sk_change_net(sock->sk, net); - udp_set_no_check6_tx(sock->sk, !cfg->use_udp6_tx_checksums); - udp_set_no_check6_rx(sock->sk, !cfg->use_udp6_rx_checksums); - } else -#endif - if (cfg->family == AF_INET) { - struct sockaddr_in udp_addr; - - err = sock_create_kern(AF_INET, SOCK_DGRAM, 0, &sock); - if (err < 0) - goto error; - - sk_change_net(sock->sk, net); + udp_addr.sin_family = AF_INET; + udp_addr.sin_addr = cfg->local_ip; + udp_addr.sin_port = cfg->local_udp_port; + err = kernel_bind(sock, (struct sockaddr *)&udp_addr, + sizeof(udp_addr)); + if (err < 0) + goto error; + if (cfg->peer_udp_port) { udp_addr.sin_family = AF_INET; - udp_addr.sin_addr = cfg->local_ip; - udp_addr.sin_port = cfg->local_udp_port; - err = kernel_bind(sock, (struct sockaddr *)&udp_addr, - sizeof(udp_addr)); + udp_addr.sin_addr = cfg->peer_ip; + udp_addr.sin_port = cfg->peer_udp_port; + err = kernel_connect(sock, (struct sockaddr *)&udp_addr, + sizeof(udp_addr), 0); if (err < 0) goto error; - - if (cfg->peer_udp_port) { - udp_addr.sin_family = AF_INET; - udp_addr.sin_addr = cfg->peer_ip; - udp_addr.sin_port = cfg->peer_udp_port; - err = kernel_connect(sock, - (struct sockaddr *)&udp_addr, - sizeof(udp_addr), 0); - if (err < 0) - goto error; - } - - sock->sk->sk_no_check_tx = !cfg->use_udp_checksums; - } else { - return -EPFNOSUPPORT; } + sock->sk->sk_no_check_tx = !cfg->use_udp_checksums; *sockp = sock; - return 0; error: @@ -95,6 +52,57 @@ error: *sockp = NULL; return err; } -EXPORT_SYMBOL(udp_sock_create); +EXPORT_SYMBOL(udp_sock_create4); + +void setup_udp_tunnel_sock(struct net *net, struct udp_tunnel_sock_cfg *cfg) +{ + struct socket *sock = cfg->sock; + struct sock *sk = sock->sk; + + /* Disable multicast loopback */ + inet_sk(sk)->mc_loop = 0; + + /* Enable CHECKSUM_UNNECESSAY to CHECSUM_COMPLETE conversion */ + udp_set_convert_csum(sk, true); + + rcu_assign_sk_user_data(sk, cfg->sk_user_data); + + udp_sk(sk)->encap_type = cfg->encap_type; + udp_sk(sk)->encap_rcv = cfg->encap_rcv; + udp_sk(sk)->encap_destroy = cfg->encap_destroy; + + udp_tunnel_encap_enable(sock); +} +EXPORT_SYMBOL_GPL(setup_udp_tunnel_sock); + +int udp_tunnel_xmit_skb(struct socket *sock, struct rtable *rt, + struct sk_buff *skb, __be32 src, __be32 dst, + __u8 tos, __u8 ttl, __be16 df, __be16 src_port, + __be16 dst_port, bool xnet) +{ + struct udphdr *uh; + + __skb_push(skb, sizeof(*uh)); + skb_reset_transport_header(skb); + uh = udp_hdr(skb); + + uh->dest = dst_port; + uh->source = src_port; + uh->len = htons(skb->len); + + udp_set_csum(sock->sk->sk_no_check_tx, skb, src, dst, skb->len); + + return iptunnel_xmit(sock->sk, rt, skb, src, dst, IPPROTO_UDP, + tos, ttl, df, xnet); +} +EXPORT_SYMBOL_GPL(udp_tunnel_xmit_skb); + +void udp_tunnel_sock_release(struct socket *sock) +{ + rcu_assign_sk_user_data(sock->sk, NULL); + kernel_sock_shutdown(sock, SHUT_RDWR); + sk_release_kernel(sock->sk); +} +EXPORT_SYMBOL_GPL(udp_tunnel_sock_release); MODULE_LICENSE("GPL"); diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile index 2fe6836..45f830e 100644 --- a/net/ipv6/Makefile +++ b/net/ipv6/Makefile @@ -35,6 +35,7 @@ obj-$(CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION) += xfrm6_mode_ro.o obj-$(CONFIG_INET6_XFRM_MODE_BEET) += xfrm6_mode_beet.o obj-$(CONFIG_IPV6_MIP6) += mip6.o obj-$(CONFIG_NETFILTER) += netfilter/ +obj-$(CONFIG_NET_UDP_TUNNEL) += ip6_udp_tunnel.o obj-$(CONFIG_IPV6_VTI) += ip6_vti.o obj-$(CONFIG_IPV6_SIT) += sit.o diff --git a/net/ipv6/ip6_udp_tunnel.c b/net/ipv6/ip6_udp_tunnel.c new file mode 100644 index 0000000..bcfbb4b --- /dev/null +++ b/net/ipv6/ip6_udp_tunnel.c @@ -0,0 +1,63 @@ +#include <linux/module.h> +#include <linux/errno.h> +#include <linux/socket.h> +#include <linux/udp.h> +#include <linux/types.h> +#include <linux/kernel.h> +#include <linux/in6.h> +#include <net/udp.h> +#include <net/udp_tunnel.h> +#include <net/net_namespace.h> +#include <net/netns/generic.h> +#include <net/ip6_tunnel.h> +#include <net/ip6_checksum.h> + +int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg, + struct socket **sockp) +{ + struct sockaddr_in6 udp6_addr; + int err; + struct socket *sock = NULL; + + err = sock_create_kern(AF_INET6, SOCK_DGRAM, 0, &sock); + if (err < 0) + goto error; + + sk_change_net(sock->sk, net); + + udp6_addr.sin6_family = AF_INET6; + memcpy(&udp6_addr.sin6_addr, &cfg->local_ip6, + sizeof(udp6_addr.sin6_addr)); + udp6_addr.sin6_port = cfg->local_udp_port; + err = kernel_bind(sock, (struct sockaddr *)&udp6_addr, + sizeof(udp6_addr)); + if (err < 0) + goto error; + + if (cfg->peer_udp_port) { + udp6_addr.sin6_family = AF_INET6; + memcpy(&udp6_addr.sin6_addr, &cfg->peer_ip6, + sizeof(udp6_addr.sin6_addr)); + udp6_addr.sin6_port = cfg->peer_udp_port; + err = kernel_connect(sock, + (struct sockaddr *)&udp6_addr, + sizeof(udp6_addr), 0); + } + if (err < 0) + goto error; + + udp_set_no_check6_tx(sock->sk, !cfg->use_udp6_tx_checksums); + udp_set_no_check6_rx(sock->sk, !cfg->use_udp6_rx_checksums); + + *sockp = sock; + return 0; + +error: + if (sock) { + kernel_sock_shutdown(sock, SHUT_RDWR); + sk_release_kernel(sock->sk); + } + *sockp = NULL; + return err; +} +EXPORT_SYMBOL_GPL(udp_sock_create6);
Add ip6_udp_tunnel.c for ipv6 UDP tunnel functions to avoid ifdefs in udp_tunnel.c Signed-off-by: Andy Zhou <azhou@nicira.com> --- include/net/udp_tunnel.h | 28 +++++++++- net/ipv4/udp_tunnel.c | 136 ++++++++++++++++++++++++--------------------- net/ipv6/Makefile | 1 + net/ipv6/ip6_udp_tunnel.c | 63 +++++++++++++++++++++ 4 files changed, 162 insertions(+), 66 deletions(-) create mode 100644 net/ipv6/ip6_udp_tunnel.c