#include <linux/in.h>
#include <linux/ip.h>
#include <linux/net.h>
+#include <linux/module.h>
#include <linux/rculist.h>
#include <linux/udp.h>
#include <net/ip.h>
#include <net/route.h>
#include <net/udp.h>
+#include <net/udp_tunnel.h>
#include <net/xfrm.h>
#include "datapath.h"
};
static LIST_HEAD(lisp_ports);
+static struct vport_ops ovs_lisp_vport_ops;
static inline struct lisp_port *lisp_vport(const struct vport *vport)
{
int low;
if (!hash) {
- struct sw_flow_key *pkt_key = OVS_CB(skb)->pkt_key;
-
- if (skb->protocol == htons(ETH_P_IP))
- hash = jhash2((const u32 *)&pkt_key->ipv4.addr,
- sizeof(pkt_key->ipv4.addr) / sizeof(u32), 0);
- else if (skb->protocol == htons(ETH_P_IPV6))
- hash = jhash2((const u32 *)&pkt_key->ipv6.addr,
- sizeof(pkt_key->ipv6.addr) / sizeof(u32), 0);
- else
+ if (skb->protocol == htons(ETH_P_IP)) {
+ struct iphdr *iph;
+ int size = (sizeof(iph->saddr) * 2) / sizeof(u32);
+
+ iph = (struct iphdr *) skb_network_header(skb);
+ hash = jhash2((const u32 *)&iph->saddr, size, 0);
+ } else if (skb->protocol == htons(ETH_P_IPV6)) {
+ struct ipv6hdr *ipv6hdr;
+
+ ipv6hdr = (struct ipv6hdr *) skb_network_header(skb);
+ hash = jhash2((const u32 *)&ipv6hdr->saddr,
+ (sizeof(struct in6_addr) * 2) / sizeof(u32), 0);
+ } else {
pr_warn_once("LISP inner protocol is not IP when "
"calculating hash.\n");
+ }
}
inet_get_local_port_range(net, &low, &high);
return (((u64) hash * range) >> 32) + low;
}
-static void lisp_build_header(const struct vport *vport,
- struct sk_buff *skb)
+static void lisp_build_header(struct sk_buff *skb)
{
- struct net *net = ovs_dp_get_net(vport->dp);
- struct lisp_port *lisp_port = lisp_vport(vport);
- struct udphdr *udph = udp_hdr(skb);
- struct lisphdr *lisph = (struct lisphdr *)(udph + 1);
- const struct ovs_key_ipv4_tunnel *tun_key = &OVS_CB(skb)->tun_info->tunnel;
+ struct lisphdr *lisph;
+ const struct ovs_key_ipv4_tunnel *tun_key;
- udph->dest = lisp_port->dst_port;
- udph->source = htons(get_src_port(net, skb));
- udph->check = 0;
- udph->len = htons(skb->len - skb_transport_offset(skb));
+ tun_key = &OVS_CB(skb)->egress_tun_info->tunnel;
+ lisph = (struct lisphdr *)__skb_push(skb, sizeof(struct lisphdr));
lisph->nonce_present = 0; /* We don't support echo nonce algorithm */
lisph->locator_status_bits_present = 1; /* Set LSB */
lisph->solicit_echo_nonce = 0; /* No echo noncing */
struct ethhdr *ethh;
__be16 protocol;
- lisp_port = lisp_find_port(dev_net(skb->dev), udp_hdr(skb)->dest);
+ lisp_port = rcu_dereference_sk_user_data(sk);
if (unlikely(!lisp_port))
goto error;
/* Save outer tunnel values */
iph = ip_hdr(skb);
- ovs_flow_tun_info_init(&tun_info, iph, key, TUNNEL_KEY, NULL, 0);
+ ovs_flow_tun_info_init(&tun_info, iph,
+ udp_hdr(skb)->source, udp_hdr(skb)->dest,
+ key, TUNNEL_KEY, NULL, 0);
/* Drop non-IP inner packets */
inner_iph = (struct iphdr *)(lisph + 1);
return 0;
}
-/* Arbitrary value. Irrelevant as long as it's not 0 since we set the handler. */
-#define UDP_ENCAP_LISP 1
static int lisp_socket_init(struct lisp_port *lisp_port, struct net *net)
{
- struct sockaddr_in sin;
+ struct udp_port_cfg udp_conf;
+ struct udp_tunnel_sock_cfg tunnel_cfg;
int err;
- err = sock_create_kern(AF_INET, SOCK_DGRAM, 0,
- &lisp_port->lisp_rcv_socket);
- if (err)
- goto error;
-
- /* release net ref. */
- sk_change_net(lisp_port->lisp_rcv_socket->sk, net);
+ memset(&udp_conf, 0, sizeof(udp_conf));
- sin.sin_family = AF_INET;
- sin.sin_addr.s_addr = htonl(INADDR_ANY);
- sin.sin_port = lisp_port->dst_port;
+ udp_conf.family = AF_INET;
+ udp_conf.local_ip.s_addr = htonl(INADDR_ANY);
+ udp_conf.local_udp_port = lisp_port->dst_port;
- err = kernel_bind(lisp_port->lisp_rcv_socket, (struct sockaddr *)&sin,
- sizeof(struct sockaddr_in));
- if (err)
- goto error_sock;
+ err = udp_sock_create(net, &udp_conf, &lisp_port->lisp_rcv_socket);
+ if (err < 0) {
+ pr_warn("cannot register lisp protocol handler: %d\n", err);
+ return err;
+ }
- udp_sk(lisp_port->lisp_rcv_socket->sk)->encap_type = UDP_ENCAP_LISP;
- udp_sk(lisp_port->lisp_rcv_socket->sk)->encap_rcv = lisp_rcv;
+ tunnel_cfg.sk_user_data = lisp_port;
+ tunnel_cfg.encap_type = 1;
+ tunnel_cfg.encap_rcv = lisp_rcv;
+ tunnel_cfg.encap_destroy = NULL;
- udp_encap_enable();
+ setup_udp_tunnel_sock(net, lisp_port->lisp_rcv_socket, &tunnel_cfg);
return 0;
-
-error_sock:
- sk_release_kernel(lisp_port->lisp_rcv_socket->sk);
-error:
- pr_warn("cannot register lisp protocol handler: %d\n", err);
- return err;
}
static int lisp_get_options(const struct vport *vport, struct sk_buff *skb)
struct lisp_port *lisp_port = lisp_vport(vport);
list_del_rcu(&lisp_port->list);
- /* Release socket */
- sk_release_kernel(lisp_port->lisp_rcv_socket->sk);
-
+ udp_tunnel_sock_release(lisp_port->lisp_rcv_socket);
ovs_vport_deferred_free(vport);
}
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);
-
- udph->len = htons(skb->len - skb_transport_offset(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)
{
struct ovs_key_ipv4_tunnel *tun_key;
+ struct lisp_port *lisp_port = lisp_vport(vport);
+ struct net *net = ovs_dp_get_net(vport->dp);
int network_offset = skb_network_offset(skb);
struct rtable *rt;
int min_headroom;
__be32 saddr;
+ __be16 src_port, dst_port;
__be16 df;
int sent_len;
int err;
- if (unlikely(!OVS_CB(skb)->tun_info))
- return -EINVAL;
+ if (unlikely(!OVS_CB(skb)->egress_tun_info)) {
+ err = -EINVAL;
+ goto error;
+ }
- tun_key = &OVS_CB(skb)->tun_info->tunnel;
+ tun_key = &OVS_CB(skb)->egress_tun_info->tunnel;
if (skb->protocol != htons(ETH_P_IP) &&
skb->protocol != htons(ETH_P_IPV6)) {
- kfree_skb(skb);
- return 0;
+ err = 0;
+ goto error;
}
/* Route lookup */
skb_reset_mac_header(skb);
vlan_set_tci(skb, 0);
- skb_reset_inner_headers(skb);
+ skb = udp_tunnel_handle_offloads(skb, false, false);
+ if (IS_ERR(skb)) {
+ err = PTR_ERR(skb);
+ skb = NULL;
+ goto err_free_rt;
+ }
- __skb_push(skb, LISP_HLEN);
- skb_reset_transport_header(skb);
+ src_port = htons(get_src_port(net, skb));
+ dst_port = lisp_port->dst_port;
- lisp_build_header(vport, skb);
+ lisp_build_header(skb);
- /* Offloading */
- err = handle_offloads(skb);
- if (err)
- goto err_free_rt;
+ skb->ignore_df = 1;
- skb->local_df = 1;
+ ovs_skb_set_inner_protocol(skb, skb->protocol);
df = tun_key->tun_flags & TUNNEL_DONT_FRAGMENT ? htons(IP_DF) : 0;
- sent_len = iptunnel_xmit(rt, skb,
- saddr, tun_key->ipv4_dst,
- IPPROTO_UDP, tun_key->ipv4_tos,
- tun_key->ipv4_ttl, df, false);
+ sent_len = udp_tunnel_xmit_skb(rt, lisp_port->lisp_rcv_socket->sk, skb,
+ saddr, tun_key->ipv4_dst,
+ tun_key->ipv4_tos, tun_key->ipv4_ttl,
+ df, src_port, dst_port, false, true);
return sent_len > 0 ? sent_len + network_offset : sent_len;
err_free_rt:
ip_rt_put(rt);
error:
+ kfree_skb(skb);
return err;
}
return lisp_port->name;
}
-const struct vport_ops ovs_lisp_vport_ops = {
- .type = OVS_VPORT_TYPE_LISP,
- .create = lisp_tnl_create,
- .destroy = lisp_tnl_destroy,
- .get_name = lisp_get_name,
- .get_options = lisp_get_options,
- .send = lisp_send,
+static int lisp_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
+ struct ovs_tunnel_info *egress_tun_info)
+{
+ struct net *net = ovs_dp_get_net(vport->dp);
+ struct lisp_port *lisp_port = lisp_vport(vport);
+
+ if (skb->protocol != htons(ETH_P_IP) &&
+ skb->protocol != htons(ETH_P_IPV6)) {
+ return -EINVAL;
+ }
+
+ /*
+ * Get tp_src and tp_dst, refert to lisp_build_header().
+ */
+ return ovs_tunnel_get_egress_info(egress_tun_info, net,
+ OVS_CB(skb)->egress_tun_info,
+ IPPROTO_UDP, skb->mark,
+ htons(get_src_port(net, skb)),
+ lisp_port->dst_port);
+}
+
+static struct vport_ops ovs_lisp_vport_ops = {
+ .type = OVS_VPORT_TYPE_LISP,
+ .create = lisp_tnl_create,
+ .destroy = lisp_tnl_destroy,
+ .get_name = lisp_get_name,
+ .get_options = lisp_get_options,
+ .send = lisp_send,
+ .get_egress_tun_info = lisp_get_egress_tun_info,
+ .owner = THIS_MODULE,
};
+
+static int __init ovs_lisp_tnl_init(void)
+{
+ return ovs_vport_ops_register(&ovs_lisp_vport_ops);
+}
+
+static void __exit ovs_lisp_tnl_exit(void)
+{
+ ovs_vport_ops_unregister(&ovs_lisp_vport_ops);
+}
+
+module_init(ovs_lisp_tnl_init);
+module_exit(ovs_lisp_tnl_exit);
+
+MODULE_DESCRIPTION("OVS: LISP switching port");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("vport-type-105");
projects / cascardo / ovs.git / blobdiff