/*
- * Copyright (c) 2011 Nicira, Inc.
- * Copyright (c) 2012 Cisco Systems, Inc.
+ * Copyright (c) 2013 Nicira, Inc.
+ * Copyright (c) 2013 Cisco Systems, 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
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
#include <linux/in.h>
#include <linux/ip.h>
#include <net/ip.h>
#include <net/udp.h>
#include <net/ip_tunnels.h>
-#include <net/udp.h>
#include <net/rtnetlink.h>
#include <net/route.h>
#include <net/dsfield.h>
#include <net/vxlan.h>
#include "datapath.h"
-#include "tunnel.h"
#include "vport.h"
-#define OVS_VXLAN_RCV_PRIORITY 8
-
/**
* struct vxlan_port - Keeps track of open UDP ports
- * @vh: vxlan_handler created for the port.
+ * @vs: vxlan_sock created for the port.
* @name: vport name.
*/
struct vxlan_port {
- struct vxlan_handler *vh;
+ struct vxlan_sock *vs;
char name[IFNAMSIZ];
};
}
/* Called with rcu_read_lock and BH disabled. */
-static int vxlan_rcv(struct vxlan_handler *vh, struct sk_buff *skb, __be32 vx_vni)
+static void vxlan_rcv(struct vxlan_sock *vs, struct sk_buff *skb, __be32 vx_vni)
{
- struct vport *vport = vh->data;
+ struct ovs_tunnel_info tun_info;
+ struct vport *vport = vs->data;
struct iphdr *iph;
- struct ovs_key_ipv4_tunnel tun_key;
__be64 key;
/* Save outer tunnel values */
iph = ip_hdr(skb);
key = cpu_to_be64(ntohl(vx_vni) >> 8);
- tnl_tun_key_init(&tun_key, iph, key, TUNNEL_KEY);
+ ovs_flow_tun_info_init(&tun_info, iph,
+ udp_hdr(skb)->source, udp_hdr(skb)->dest,
+ key, TUNNEL_KEY, NULL, 0);
- ovs_vport_receive(vport, skb, &tun_key);
- return PACKET_RCVD;
+ ovs_vport_receive(vport, skb, &tun_info);
}
static int vxlan_get_options(const struct vport *vport, struct sk_buff *skb)
{
struct vxlan_port *vxlan_port = vxlan_vport(vport);
- __be16 dst_port = inet_sport(vxlan_port->vh->vs->sock->sk);
+ __be16 dst_port = inet_sport(vxlan_port->vs->sock->sk);
if (nla_put_u16(skb, OVS_TUNNEL_ATTR_DST_PORT, ntohs(dst_port)))
return -EMSGSIZE;
{
struct vxlan_port *vxlan_port = vxlan_vport(vport);
- vxlan_handler_put(vxlan_port->vh);
+ vxlan_sock_release(vxlan_port->vs);
ovs_vport_deferred_free(vport);
}
struct net *net = ovs_dp_get_net(parms->dp);
struct nlattr *options = parms->options;
struct vxlan_port *vxlan_port;
- struct vxlan_handler *vh;
+ struct vxlan_sock *vs;
struct vport *vport;
struct nlattr *a;
u16 dst_port;
vxlan_port = vxlan_vport(vport);
strncpy(vxlan_port->name, parms->name, IFNAMSIZ);
- vh = vxlan_handler_add(net, htons(dst_port), vxlan_rcv,
- vport, OVS_VXLAN_RCV_PRIORITY, true);
- if (IS_ERR(vh)) {
+ vs = vxlan_sock_add(net, htons(dst_port), vxlan_rcv, vport, true, false);
+ if (IS_ERR(vs)) {
ovs_vport_free(vport);
- return (void *)vh;
+ return (void *)vs;
}
- vxlan_port->vh = vh;
+ vxlan_port->vs = vs;
return vport;
static int vxlan_tnl_send(struct vport *vport, struct sk_buff *skb)
{
- struct vxlan_port *vxlan_port = vxlan_vport(vport);
- __be16 dst_port = inet_sport(vxlan_port->vh->vs->sock->sk);
+ struct ovs_key_ipv4_tunnel *tun_key;
struct net *net = ovs_dp_get_net(vport->dp);
+ struct vxlan_port *vxlan_port = vxlan_vport(vport);
+ __be16 dst_port = inet_sport(vxlan_port->vs->sock->sk);
struct rtable *rt;
__be16 src_port;
__be32 saddr;
__be16 df;
- int port_min;
- int port_max;
int err;
- if (unlikely(!OVS_CB(skb)->tun_key)) {
+ if (unlikely(!OVS_CB(skb)->egress_tun_info)) {
err = -EINVAL;
goto error;
}
- forward_ip_summed(skb, true);
+ tun_key = &OVS_CB(skb)->egress_tun_info->tunnel;
/* Route lookup */
- saddr = OVS_CB(skb)->tun_key->ipv4_src;
+ saddr = tun_key->ipv4_src;
rt = find_route(ovs_dp_get_net(vport->dp),
- &saddr,
- OVS_CB(skb)->tun_key->ipv4_dst,
- IPPROTO_UDP,
- OVS_CB(skb)->tun_key->ipv4_tos,
- skb_get_mark(skb));
+ &saddr, tun_key->ipv4_dst,
+ IPPROTO_UDP, tun_key->ipv4_tos,
+ skb->mark);
if (IS_ERR(rt)) {
err = PTR_ERR(rt);
goto error;
}
- df = OVS_CB(skb)->tun_key->tun_flags & TUNNEL_DONT_FRAGMENT ?
- htons(IP_DF) : 0;
+ df = tun_key->tun_flags & TUNNEL_DONT_FRAGMENT ? htons(IP_DF) : 0;
+ skb->ignore_df = 1;
- skb->local_df = 1;
+ src_port = udp_flow_src_port(net, skb, 0, 0, true);
- inet_get_local_port_range(&port_min, &port_max);
- src_port = vxlan_src_port(port_min, port_max, skb);
-
- err = vxlan_xmit_skb(net, vxlan_port->vh, rt, skb,
- saddr, OVS_CB(skb)->tun_key->ipv4_dst,
- OVS_CB(skb)->tun_key->ipv4_tos,
- OVS_CB(skb)->tun_key->ipv4_ttl, df,
+ err = vxlan_xmit_skb(vxlan_port->vs, rt, skb,
+ saddr, tun_key->ipv4_dst,
+ tun_key->ipv4_tos,
+ tun_key->ipv4_ttl, df,
src_port, dst_port,
- htonl(be64_to_cpu(OVS_CB(skb)->tun_key->tun_id) << 8));
+ htonl(be64_to_cpu(tun_key->tun_id) << 8));
if (err < 0)
ip_rt_put(rt);
+ return err;
error:
+ kfree_skb(skb);
return err;
}
+static int vxlan_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 vxlan_port *vxlan_port = vxlan_vport(vport);
+ __be16 dst_port = inet_sport(vxlan_port->vs->sock->sk);
+ __be16 src_port;
+
+ src_port = udp_flow_src_port(net, skb, 0, 0, true);
+
+ return ovs_tunnel_get_egress_info(egress_tun_info, net,
+ OVS_CB(skb)->egress_tun_info,
+ IPPROTO_UDP, skb->mark,
+ src_port, dst_port);
+}
+
static const char *vxlan_get_name(const struct vport *vport)
{
struct vxlan_port *vxlan_port = vxlan_vport(vport);
}
const struct vport_ops ovs_vxlan_vport_ops = {
- .type = OVS_VPORT_TYPE_VXLAN,
- .create = vxlan_tnl_create,
- .destroy = vxlan_tnl_destroy,
- .get_name = vxlan_get_name,
- .get_options = vxlan_get_options,
- .send = vxlan_tnl_send,
+ .type = OVS_VPORT_TYPE_VXLAN,
+ .create = vxlan_tnl_create,
+ .destroy = vxlan_tnl_destroy,
+ .get_name = vxlan_get_name,
+ .get_options = vxlan_get_options,
+ .send = vxlan_tnl_send,
+ .get_egress_tun_info = vxlan_get_egress_tun_info,
};
-#else
-#warning VXLAN tunneling will not be available on kernels before 2.6.26
-#endif /* Linux kernel < 2.6.26 */
projects / cascardo / ovs.git / blobdiff