Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / drivers / net / geneve.c

diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 0750d7a..7456569 100644 (file)
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -380,16 +380,27 @@ static struct socket *geneve_create_sock(struct net *net, bool ipv6,
 
 static void geneve_notify_add_rx_port(struct geneve_sock *gs)
 {
+       struct net_device *dev;
        struct sock *sk = gs->sock->sk;
+       struct net *net = sock_net(sk);
        sa_family_t sa_family = sk->sk_family;
+       __be16 port = inet_sk(sk)->inet_sport;
        int err;
 
        if (sa_family == AF_INET) {
-               err = udp_add_offload(&gs->udp_offloads);
+               err = udp_add_offload(sock_net(sk), &gs->udp_offloads);
                if (err)
                        pr_warn("geneve: udp_add_offload failed with status %d\n",
                                err);
        }
+
+       rcu_read_lock();
+       for_each_netdev_rcu(net, dev) {
+               if (dev->netdev_ops->ndo_add_geneve_port)
+                       dev->netdev_ops->ndo_add_geneve_port(dev, sa_family,
+                                                            port);
+       }
+       rcu_read_unlock();
 }
 
 static int geneve_hlen(struct genevehdr *gh)
@@ -530,8 +541,20 @@ static struct geneve_sock *geneve_socket_create(struct net *net, __be16 port,
 
 static void geneve_notify_del_rx_port(struct geneve_sock *gs)
 {
+       struct net_device *dev;
        struct sock *sk = gs->sock->sk;
+       struct net *net = sock_net(sk);
        sa_family_t sa_family = sk->sk_family;
+       __be16 port = inet_sk(sk)->inet_sport;
+
+       rcu_read_lock();
+       for_each_netdev_rcu(net, dev) {
+               if (dev->netdev_ops->ndo_del_geneve_port)
+                       dev->netdev_ops->ndo_del_geneve_port(dev, sa_family,
+                                                            port);
+       }
+
+       rcu_read_unlock();
 
        if (sa_family == AF_INET)
                udp_del_offload(&gs->udp_offloads);
@@ -895,12 +918,11 @@ static netdev_tx_t geneve_xmit_skb(struct sk_buff *skb, struct net_device *dev,
                ttl = ttl ? : ip4_dst_hoplimit(&rt->dst);
                df = 0;
        }
-       err = udp_tunnel_xmit_skb(rt, gs4->sock->sk, skb, fl4.saddr, fl4.daddr,
-                                 tos, ttl, df, sport, geneve->dst_port,
-                                 !net_eq(geneve->net, dev_net(geneve->dev)),
-                                 !(flags & GENEVE_F_UDP_CSUM));
+       udp_tunnel_xmit_skb(rt, gs4->sock->sk, skb, fl4.saddr, fl4.daddr,
+                           tos, ttl, df, sport, geneve->dst_port,
+                           !net_eq(geneve->net, dev_net(geneve->dev)),
+                           !(flags & GENEVE_F_UDP_CSUM));
 
-       iptunnel_xmit_stats(err, &dev->stats, dev->tstats);
        return NETDEV_TX_OK;
 
 tx_error:
@@ -982,12 +1004,10 @@ static netdev_tx_t geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
                        ttl = 1;
                ttl = ttl ? : ip6_dst_hoplimit(dst);
        }
-       err = udp_tunnel6_xmit_skb(dst, gs6->sock->sk, skb, dev,
-                                  &fl6.saddr, &fl6.daddr, prio, ttl,
-                                  sport, geneve->dst_port,
-                                  !!(flags & GENEVE_F_UDP_ZERO_CSUM6_TX));
-
-       iptunnel_xmit_stats(err, &dev->stats, dev->tstats);
+       udp_tunnel6_xmit_skb(dst, gs6->sock->sk, skb, dev,
+                            &fl6.saddr, &fl6.daddr, prio, ttl,
+                            sport, geneve->dst_port,
+                            !!(flags & GENEVE_F_UDP_ZERO_CSUM6_TX));
        return NETDEV_TX_OK;
 
 tx_error:
@@ -1086,6 +1106,30 @@ static struct device_type geneve_type = {
        .name = "geneve",
 };
 
+/* Calls the ndo_add_geneve_port of the caller in order to
+ * supply the listening GENEVE udp ports. Callers are expected
+ * to implement the ndo_add_geneve_port.
+ */
+void geneve_get_rx_port(struct net_device *dev)
+{
+       struct net *net = dev_net(dev);
+       struct geneve_net *gn = net_generic(net, geneve_net_id);
+       struct geneve_sock *gs;
+       sa_family_t sa_family;
+       struct sock *sk;
+       __be16 port;
+
+       rcu_read_lock();
+       list_for_each_entry_rcu(gs, &gn->sock_list, list) {
+               sk = gs->sock->sk;
+               sa_family = sk->sk_family;
+               port = inet_sk(sk)->inet_sport;
+               dev->netdev_ops->ndo_add_geneve_port(dev, sa_family, port);
+       }
+       rcu_read_unlock();
+}
+EXPORT_SYMBOL_GPL(geneve_get_rx_port);
+
 /* Initialize the device structure. */
 static void geneve_setup(struct net_device *dev)
 {
@@ -1179,7 +1223,7 @@ static int geneve_configure(struct net *net, struct net_device *dev,
        struct geneve_net *gn = net_generic(net, geneve_net_id);
        struct geneve_dev *t, *geneve = netdev_priv(dev);
        bool tun_collect_md, tun_on_same_port;
-       int err;
+       int err, encap_len;
 
        if (!remote)
                return -EINVAL;
@@ -1212,6 +1256,14 @@ static int geneve_configure(struct net *net, struct net_device *dev,
        if (t)
                return -EBUSY;
 
+       /* make enough headroom for basic scenario */
+       encap_len = GENEVE_BASE_HLEN + ETH_HLEN;
+       if (remote->sa.sa_family == AF_INET)
+               encap_len += sizeof(struct iphdr);
+       else
+               encap_len += sizeof(struct ipv6hdr);
+       dev->needed_headroom = encap_len + ETH_HLEN;
+
        if (metadata) {
                if (tun_on_same_port)
                        return -EPERM;