/*
- * Copyright (c) 2007-2012 Nicira, Inc.
+ * Copyright (c) 2007-2015 Nicira, 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
#include <linux/kconfig.h>
#if IS_ENABLED(CONFIG_NET_IPGRE_DEMUX)
+
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/if.h>
#include <linux/if_tunnel.h>
#include <linux/if_vlan.h>
#include <linux/in.h>
-#include <linux/if_vlan.h>
-#include <linux/in.h>
#include <linux/in_route.h>
#include <linux/inetdevice.h>
#include <linux/jhash.h>
#include <linux/list.h>
#include <linux/kernel.h>
+#include <linux/module.h>
#include <linux/workqueue.h>
#include <linux/rculist.h>
#include <net/route.h>
#include <net/xfrm.h>
-
#include <net/icmp.h>
#include <net/ip.h>
#include <net/ip_tunnels.h>
#include <net/gre.h>
+#include <net/net_namespace.h>
+#include <net/netns/generic.h>
#include <net/protocol.h>
#include "datapath.h"
-#include "tunnel.h"
#include "vport.h"
+static struct vport_ops ovs_gre_vport_ops;
+
/* Returns the least-significant 32 bits of a __be64. */
static __be32 be64_get_low32(__be64 x)
{
}
static struct sk_buff *__build_header(struct sk_buff *skb,
- int tunnel_hlen,
- __be32 seq, __be16 gre64_flag)
+ int tunnel_hlen)
{
- const struct ovs_key_ipv4_tunnel *tun_key = OVS_CB(skb)->tun_key;
struct tnl_ptk_info tpi;
+ const struct ovs_key_ipv4_tunnel *tun_key;
+
+ tun_key = &OVS_CB(skb)->egress_tun_info->tunnel;
skb = gre_handle_offloads(skb, !!(tun_key->tun_flags & TUNNEL_CSUM));
if (IS_ERR(skb))
- return NULL;
-
- tpi.flags = filter_tnl_flags(tun_key->tun_flags) | gre64_flag;
+ return skb;
+ tpi.flags = filter_tnl_flags(tun_key->tun_flags);
tpi.proto = htons(ETH_P_TEB);
tpi.key = be64_get_low32(tun_key->tun_id);
- tpi.seq = seq;
+ tpi.seq = 0;
gre_build_header(skb, &tpi, tunnel_hlen);
return skb;
static int gre_rcv(struct sk_buff *skb,
const struct tnl_ptk_info *tpi)
{
- struct ovs_key_ipv4_tunnel tun_key;
+ struct ovs_tunnel_info tun_info;
struct ovs_net *ovs_net;
struct vport *vport;
__be64 key;
ovs_net = net_generic(dev_net(skb->dev), ovs_net_id);
- if ((tpi->flags & TUNNEL_KEY) && (tpi->flags & TUNNEL_SEQ))
- vport = rcu_dereference(ovs_net->vport_net.gre64_vport);
- else
- vport = rcu_dereference(ovs_net->vport_net.gre_vport);
+ vport = rcu_dereference(ovs_net->vport_net.gre_vport);
if (unlikely(!vport))
return PACKET_REJECT;
key = key_to_tunnel_id(tpi->key, tpi->seq);
- tnl_tun_key_init(&tun_key, ip_hdr(skb), key, filter_tnl_flags(tpi->flags));
+ ovs_flow_tun_info_init(&tun_info, ip_hdr(skb), 0, 0, key,
+ filter_tnl_flags(tpi->flags), NULL, 0);
- ovs_vport_receive(vport, skb, &tun_key);
+ ovs_vport_receive(vport, skb, &tun_info);
return PACKET_RCVD;
}
-static int __send(struct vport *vport, struct sk_buff *skb,
- int tunnel_hlen,
- __be32 seq, __be16 gre64_flag)
+/* Called with rcu_read_lock and BH disabled. */
+static int gre_err(struct sk_buff *skb, u32 info,
+ const struct tnl_ptk_info *tpi)
{
- struct net *net = ovs_dp_get_net(vport->dp);
+ struct ovs_net *ovs_net;
+ struct vport *vport;
+
+ ovs_net = net_generic(dev_net(skb->dev), ovs_net_id);
+ vport = rcu_dereference(ovs_net->vport_net.gre_vport);
+
+ if (unlikely(!vport))
+ return PACKET_REJECT;
+ else
+ return PACKET_RCVD;
+}
+
+static int gre_tnl_send(struct vport *vport, struct sk_buff *skb)
+{
+ const struct ovs_key_ipv4_tunnel *tun_key;
struct rtable *rt;
int min_headroom;
__be16 df;
+ int tunnel_hlen;
__be32 saddr;
int err;
- forward_ip_summed(skb, true);
+ if (unlikely(!OVS_CB(skb)->egress_tun_info)) {
+ err = -EINVAL;
+ goto err_free_skb;
+ }
- /* Route lookup */
- saddr = OVS_CB(skb)->tun_key->ipv4_src;
+ tun_key = &OVS_CB(skb)->egress_tun_info->tunnel;
+ saddr = tun_key->ipv4_src;
rt = find_route(ovs_dp_get_net(vport->dp),
- &saddr,
- OVS_CB(skb)->tun_key->ipv4_dst,
- IPPROTO_GRE,
- OVS_CB(skb)->tun_key->ipv4_tos,
- skb_get_mark(skb));
+ &saddr, tun_key->ipv4_dst,
+ IPPROTO_GRE, tun_key->ipv4_tos,
+ skb->mark);
if (IS_ERR(rt)) {
err = PTR_ERR(rt);
- goto error;
+ goto err_free_skb;
}
+ tunnel_hlen = ip_gre_calc_hlen(tun_key->tun_flags);
+
min_headroom = LL_RESERVED_SPACE(rt_dst(rt).dev) + rt_dst(rt).header_len
+ tunnel_hlen + sizeof(struct iphdr)
- + (vlan_tx_tag_present(skb) ? VLAN_HLEN : 0);
-
+ + (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0);
if (skb_headroom(skb) < min_headroom || skb_header_cloned(skb)) {
int head_delta = SKB_DATA_ALIGN(min_headroom -
skb_headroom(skb) +
goto err_free_rt;
}
- if (unlikely(vlan_deaccel_tag(skb))) {
+ skb = vlan_hwaccel_push_inside(skb);
+ if (unlikely(!skb)) {
err = -ENOMEM;
goto err_free_rt;
}
/* Push Tunnel header. */
- skb = __build_header(skb, tunnel_hlen, seq, gre64_flag);
- if (unlikely(!skb)) {
- err = 0;
+ skb = __build_header(skb, tunnel_hlen);
+ if (IS_ERR(skb)) {
+ err = PTR_ERR(skb);
+ skb = NULL;
goto err_free_rt;
}
- df = OVS_CB(skb)->tun_key->tun_flags & TUNNEL_DONT_FRAGMENT ?
+ df = tun_key->tun_flags & TUNNEL_DONT_FRAGMENT ?
htons(IP_DF) : 0;
- skb->local_df = 1;
+ skb->ignore_df = 1;
- return iptunnel_xmit(net, 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);
+ return iptunnel_xmit(skb->sk, rt, skb, saddr,
+ tun_key->ipv4_dst, IPPROTO_GRE,
+ tun_key->ipv4_tos, tun_key->ipv4_ttl, df, false);
err_free_rt:
ip_rt_put(rt);
-error:
+err_free_skb:
+ kfree_skb(skb);
return err;
}
static struct gre_cisco_protocol gre_protocol = {
- .handler = gre_rcv,
- .priority = 1,
+ .handler = gre_rcv,
+ .err_handler = gre_err,
+ .priority = 1,
};
static int gre_ports;
ovs_net = net_generic(net, ovs_net_id);
- rcu_assign_pointer(ovs_net->vport_net.gre_vport, NULL);
+ RCU_INIT_POINTER(ovs_net->vport_net.gre_vport, NULL);
ovs_vport_deferred_free(vport);
gre_exit();
}
-static int gre_send(struct vport *vport, struct sk_buff *skb)
+static int gre_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
+ struct ovs_tunnel_info *egress_tun_info)
{
- int hlen;
-
- if (unlikely(!OVS_CB(skb)->tun_key))
- return -EINVAL;
-
- hlen = ip_gre_calc_hlen(OVS_CB(skb)->tun_key->tun_flags);
-
- return __send(vport, skb, hlen, 0, 0);
+ return ovs_tunnel_get_egress_info(egress_tun_info,
+ ovs_dp_get_net(vport->dp),
+ OVS_CB(skb)->egress_tun_info,
+ IPPROTO_GRE, skb->mark, 0, 0);
}
-const struct vport_ops ovs_gre_vport_ops = {
+static struct vport_ops ovs_gre_vport_ops = {
.type = OVS_VPORT_TYPE_GRE,
.create = gre_create,
.destroy = gre_tnl_destroy,
.get_name = gre_get_name,
- .send = gre_send,
+ .send = gre_tnl_send,
+ .get_egress_tun_info = gre_get_egress_tun_info,
+ .owner = THIS_MODULE,
};
-/* GRE64 vport. */
-static struct vport *gre64_create(const struct vport_parms *parms)
-{
- struct net *net = ovs_dp_get_net(parms->dp);
- struct ovs_net *ovs_net;
- struct vport *vport;
- int err;
-
- err = gre_init();
- if (err)
- return ERR_PTR(err);
-
- ovs_net = net_generic(net, ovs_net_id);
- if (ovsl_dereference(ovs_net->vport_net.gre64_vport)) {
- vport = ERR_PTR(-EEXIST);
- goto error;
- }
-
- vport = ovs_vport_alloc(IFNAMSIZ, &ovs_gre64_vport_ops, parms);
- if (IS_ERR(vport))
- goto error;
-
- strncpy(vport_priv(vport), parms->name, IFNAMSIZ);
- rcu_assign_pointer(ovs_net->vport_net.gre64_vport, vport);
- return vport;
-error:
- gre_exit();
- return vport;
-}
-
-static void gre64_tnl_destroy(struct vport *vport)
+static int __init ovs_gre_tnl_init(void)
{
- struct net *net = ovs_dp_get_net(vport->dp);
- struct ovs_net *ovs_net;
-
- ovs_net = net_generic(net, ovs_net_id);
-
- rcu_assign_pointer(ovs_net->vport_net.gre64_vport, NULL);
- ovs_vport_deferred_free(vport);
- gre_exit();
+ return ovs_vport_ops_register(&ovs_gre_vport_ops);
}
-static __be32 be64_get_high32(__be64 x)
+static void __exit ovs_gre_tnl_exit(void)
{
-#ifdef __BIG_ENDIAN
- return (__force __be32)((__force u64)x >> 32);
-#else
- return (__force __be32)x;
-#endif
+ ovs_vport_ops_unregister(&ovs_gre_vport_ops);
}
-static int gre64_send(struct vport *vport, struct sk_buff *skb)
-{
- int hlen;
- __be32 seq;
-
- if (unlikely(!OVS_CB(skb)->tun_key))
- return -EINVAL;
-
- hlen = ip_gre_calc_hlen(OVS_CB(skb)->tun_key->tun_flags)
- + GRE_HEADER_SECTION;
+module_init(ovs_gre_tnl_init);
+module_exit(ovs_gre_tnl_exit);
- seq = be64_get_high32(OVS_CB(skb)->tun_key->tun_id);
- return __send(vport, skb, hlen, seq, TUNNEL_SEQ);
-}
-
-const struct vport_ops ovs_gre64_vport_ops = {
- .type = OVS_VPORT_TYPE_GRE64,
- .create = gre64_create,
- .destroy = gre64_tnl_destroy,
- .get_name = gre_get_name,
- .send = gre64_send,
-};
+MODULE_DESCRIPTION("OVS: GRE switching port");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("vport-type-3");
#endif
projects / cascardo / ovs.git / blobdiff