geneve: change to use UDP socket GRO

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

diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 192631a..a9fbf17 100644 (file)
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -87,7 +87,6 @@ struct geneve_sock {
        struct socket           *sock;
        struct rcu_head         rcu;
        int                     refcnt;
-       struct udp_offload      udp_offloads;
        struct hlist_head       vni_list[VNI_HASH_SIZE];
        u32                     flags;
 };
@@ -409,14 +408,6 @@ static void geneve_notify_add_rx_port(struct geneve_sock *gs)
        struct net *net = sock_net(sk);
        sa_family_t sa_family = geneve_get_sk_family(gs);
        __be16 port = inet_sk(sk)->inet_sport;
-       int err;
-
-       if (sa_family == AF_INET) {
-               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) {
@@ -432,9 +423,9 @@ static int geneve_hlen(struct genevehdr *gh)
        return sizeof(*gh) + gh->opt_len * 4;
 }
 
-static struct sk_buff **geneve_gro_receive(struct sk_buff **head,
-                                          struct sk_buff *skb,
-                                          struct udp_offload *uoff)
+static struct sk_buff **geneve_gro_receive(struct sock *sk,
+                                          struct sk_buff **head,
+                                          struct sk_buff *skb)
 {
        struct sk_buff *p, **pp = NULL;
        struct genevehdr *gh, *gh2;
@@ -495,8 +486,8 @@ out:
        return pp;
 }
 
-static int geneve_gro_complete(struct sk_buff *skb, int nhoff,
-                              struct udp_offload *uoff)
+static int geneve_gro_complete(struct sock *sk, struct sk_buff *skb,
+                              int nhoff)
 {
        struct genevehdr *gh;
        struct packet_offload *ptype;
@@ -545,14 +536,14 @@ static struct geneve_sock *geneve_socket_create(struct net *net, __be16 port,
                INIT_HLIST_HEAD(&gs->vni_list[h]);
 
        /* Initialize the geneve udp offloads structure */
-       gs->udp_offloads.port = port;
-       gs->udp_offloads.callbacks.gro_receive  = geneve_gro_receive;
-       gs->udp_offloads.callbacks.gro_complete = geneve_gro_complete;
        geneve_notify_add_rx_port(gs);
 
        /* Mark socket as an encapsulation socket */
+       memset(&tunnel_cfg, 0, sizeof(tunnel_cfg));
        tunnel_cfg.sk_user_data = gs;
        tunnel_cfg.encap_type = 1;
+       tunnel_cfg.gro_receive = geneve_gro_receive;
+       tunnel_cfg.gro_complete = geneve_gro_complete;
        tunnel_cfg.encap_rcv = geneve_udp_encap_recv;
        tunnel_cfg.encap_destroy = NULL;
        setup_udp_tunnel_sock(net, sock, &tunnel_cfg);
@@ -576,9 +567,6 @@ static void geneve_notify_del_rx_port(struct geneve_sock *gs)
        }
 
        rcu_read_unlock();
-
-       if (sa_family == AF_INET)
-               udp_del_offload(&gs->udp_offloads);
 }
 
 static void __geneve_sock_release(struct geneve_sock *gs)
@@ -843,8 +831,8 @@ static struct dst_entry *geneve_get_v6_dst(struct sk_buff *skb,
        if (info) {
                fl6->daddr = info->key.u.ipv6.dst;
                fl6->saddr = info->key.u.ipv6.src;
-               fl6->flowi6_tos = RT_TOS(info->key.tos);
-               fl6->flowlabel = info->key.label;
+               fl6->flowlabel = ip6_make_flowinfo(RT_TOS(info->key.tos),
+                                                  info->key.label);
                dst_cache = &info->dst_cache;
        } else {
                prio = geneve->tos;
@@ -855,8 +843,8 @@ static struct dst_entry *geneve_get_v6_dst(struct sk_buff *skb,
                        use_cache = false;
                }
 
-               fl6->flowi6_tos = RT_TOS(prio);
-               fl6->flowlabel = geneve->label;
+               fl6->flowlabel = ip6_make_flowinfo(RT_TOS(prio),
+                                                  geneve->label);
                fl6->daddr = geneve->remote.sin6.sin6_addr;
                dst_cache = &geneve->dst_cache;
        }
@@ -1049,7 +1037,8 @@ static netdev_tx_t geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
                if (unlikely(err))
                        goto err;
 
-               prio = ip_tunnel_ecn_encap(fl6.flowi6_tos, iip, skb);
+               prio = ip_tunnel_ecn_encap(ip6_tclass(fl6.flowlabel),
+                                          iip, skb);
                ttl = geneve->ttl;
                if (!ttl && ipv6_addr_is_multicast(&fl6.daddr))
                        ttl = 1;