Merge tag 'char-misc-4.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[karo-tx-linux.git] / drivers / net / geneve.c

diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 199459bd69612478e596dc97248d2a40defd6db8..2bbda71818adb022853964dd6d51a14c26f7cd19 100644 (file)
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -45,9 +45,17 @@ struct geneve_net {
 
 static unsigned int geneve_net_id;
 
+struct geneve_dev_node {
+       struct hlist_node hlist;
+       struct geneve_dev *geneve;
+};
+
 /* Pseudo network device */
 struct geneve_dev {
-       struct hlist_node  hlist;       /* vni hash table */
+       struct geneve_dev_node hlist4;  /* vni hash table for IPv4 socket */
+#if IS_ENABLED(CONFIG_IPV6)
+       struct geneve_dev_node hlist6;  /* vni hash table for IPv6 socket */
+#endif
        struct net         *net;        /* netns for packet i/o */
        struct net_device  *dev;        /* netdev for geneve tunnel */
        struct ip_tunnel_info info;
@@ -123,16 +131,16 @@ static struct geneve_dev *geneve_lookup(struct geneve_sock *gs,
                                        __be32 addr, u8 vni[])
 {
        struct hlist_head *vni_list_head;
-       struct geneve_dev *geneve;
+       struct geneve_dev_node *node;
        __u32 hash;
 
        /* Find the device for this VNI */
        hash = geneve_net_vni_hash(vni);
        vni_list_head = &gs->vni_list[hash];
-       hlist_for_each_entry_rcu(geneve, vni_list_head, hlist) {
-               if (eq_tun_id_and_vni((u8 *)&geneve->info.key.tun_id, vni) &&
-                   addr == geneve->info.key.u.ipv4.dst)
-                       return geneve;
+       hlist_for_each_entry_rcu(node, vni_list_head, hlist) {
+               if (eq_tun_id_and_vni((u8 *)&node->geneve->info.key.tun_id, vni) &&
+                   addr == node->geneve->info.key.u.ipv4.dst)
+                       return node->geneve;
        }
        return NULL;
 }
@@ -142,16 +150,16 @@ static struct geneve_dev *geneve6_lookup(struct geneve_sock *gs,
                                         struct in6_addr addr6, u8 vni[])
 {
        struct hlist_head *vni_list_head;
-       struct geneve_dev *geneve;
+       struct geneve_dev_node *node;
        __u32 hash;
 
        /* Find the device for this VNI */
        hash = geneve_net_vni_hash(vni);
        vni_list_head = &gs->vni_list[hash];
-       hlist_for_each_entry_rcu(geneve, vni_list_head, hlist) {
-               if (eq_tun_id_and_vni((u8 *)&geneve->info.key.tun_id, vni) &&
-                   ipv6_addr_equal(&addr6, &geneve->info.key.u.ipv6.dst))
-                       return geneve;
+       hlist_for_each_entry_rcu(node, vni_list_head, hlist) {
+               if (eq_tun_id_and_vni((u8 *)&node->geneve->info.key.tun_id, vni) &&
+                   ipv6_addr_equal(&addr6, &node->geneve->info.key.u.ipv6.dst))
+                       return node->geneve;
        }
        return NULL;
 }
@@ -212,6 +220,7 @@ static void geneve_rx(struct geneve_dev *geneve, struct geneve_sock *gs,
        struct genevehdr *gnvh = geneve_hdr(skb);
        struct metadata_dst *tun_dst = NULL;
        struct pcpu_sw_netstats *stats;
+       unsigned int len;
        int err = 0;
        void *oiph;
 
@@ -225,8 +234,10 @@ static void geneve_rx(struct geneve_dev *geneve, struct geneve_sock *gs,
                tun_dst = udp_tun_rx_dst(skb, geneve_get_sk_family(gs), flags,
                                         vni_to_tunnel_id(gnvh->vni),
                                         gnvh->opt_len * 4);
-               if (!tun_dst)
+               if (!tun_dst) {
+                       geneve->dev->stats.rx_dropped++;
                        goto drop;
+               }
                /* Update tunnel dst according to Geneve options. */
                ip_tunnel_info_opts_set(&tun_dst->u.tun_info,
                                        gnvh->options, gnvh->opt_len * 4);
@@ -234,8 +245,11 @@ static void geneve_rx(struct geneve_dev *geneve, struct geneve_sock *gs,
                /* Drop packets w/ critical options,
                 * since we don't support any...
                 */
-               if (gnvh->critical)
+               if (gnvh->critical) {
+                       geneve->dev->stats.rx_frame_errors++;
+                       geneve->dev->stats.rx_errors++;
                        goto drop;
+               }
        }
 
        skb_reset_mac_header(skb);
@@ -246,8 +260,10 @@ static void geneve_rx(struct geneve_dev *geneve, struct geneve_sock *gs,
                skb_dst_set(skb, &tun_dst->dst);
 
        /* Ignore packet loops (and multicast echo) */
-       if (ether_addr_equal(eth_hdr(skb)->h_source, geneve->dev->dev_addr))
+       if (ether_addr_equal(eth_hdr(skb)->h_source, geneve->dev->dev_addr)) {
+               geneve->dev->stats.rx_errors++;
                goto drop;
+       }
 
        oiph = skb_network_header(skb);
        skb_reset_network_header(skb);
@@ -279,13 +295,15 @@ static void geneve_rx(struct geneve_dev *geneve, struct geneve_sock *gs,
                }
        }
 
-       stats = this_cpu_ptr(geneve->dev->tstats);
-       u64_stats_update_begin(&stats->syncp);
-       stats->rx_packets++;
-       stats->rx_bytes += skb->len;
-       u64_stats_update_end(&stats->syncp);
-
-       gro_cells_receive(&geneve->gro_cells, skb);
+       len = skb->len;
+       err = gro_cells_receive(&geneve->gro_cells, skb);
+       if (likely(err == NET_RX_SUCCESS)) {
+               stats = this_cpu_ptr(geneve->dev->tstats);
+               u64_stats_update_begin(&stats->syncp);
+               stats->rx_packets++;
+               stats->rx_bytes += len;
+               u64_stats_update_end(&stats->syncp);
+       }
        return;
 drop:
        /* Consume bad packet */
@@ -334,7 +352,7 @@ static int geneve_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
        struct geneve_sock *gs;
        int opts_len;
 
-       /* Need Geneve and inner Ethernet header to be present */
+       /* Need UDP and Geneve header to be present */
        if (unlikely(!pskb_may_pull(skb, GENEVE_BASE_HLEN)))
                goto drop;
 
@@ -357,8 +375,10 @@ static int geneve_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
        opts_len = geneveh->opt_len * 4;
        if (iptunnel_pull_header(skb, GENEVE_BASE_HLEN + opts_len,
                                 htons(ETH_P_TEB),
-                                !net_eq(geneve->net, dev_net(geneve->dev))))
+                                !net_eq(geneve->net, dev_net(geneve->dev)))) {
+               geneve->dev->stats.rx_dropped++;
                goto drop;
+       }
 
        geneve_rx(geneve, gs, skb);
        return 0;
@@ -579,6 +599,7 @@ static int geneve_sock_add(struct geneve_dev *geneve, bool ipv6)
 {
        struct net *net = geneve->net;
        struct geneve_net *gn = net_generic(net, geneve_net_id);
+       struct geneve_dev_node *node;
        struct geneve_sock *gs;
        __u8 vni[3];
        __u32 hash;
@@ -597,15 +618,20 @@ static int geneve_sock_add(struct geneve_dev *geneve, bool ipv6)
 out:
        gs->collect_md = geneve->collect_md;
 #if IS_ENABLED(CONFIG_IPV6)
-       if (ipv6)
+       if (ipv6) {
                rcu_assign_pointer(geneve->sock6, gs);
-       else
+               node = &geneve->hlist6;
+       } else
 #endif
+       {
                rcu_assign_pointer(geneve->sock4, gs);
+               node = &geneve->hlist4;
+       }
+       node->geneve = geneve;
 
        tunnel_id_to_vni(geneve->info.key.tun_id, vni);
        hash = geneve_net_vni_hash(vni);
-       hlist_add_head_rcu(&geneve->hlist, &gs->vni_list[hash]);
+       hlist_add_head_rcu(&node->hlist, &gs->vni_list[hash]);
        return 0;
 }
 
@@ -632,8 +658,10 @@ static int geneve_stop(struct net_device *dev)
 {
        struct geneve_dev *geneve = netdev_priv(dev);
 
-       if (!hlist_unhashed(&geneve->hlist))
-               hlist_del_rcu(&geneve->hlist);
+       hlist_del_init_rcu(&geneve->hlist4.hlist);
+#if IS_ENABLED(CONFIG_IPV6)
+       hlist_del_init_rcu(&geneve->hlist6.hlist);
+#endif
        geneve_sock_release(geneve);
        return 0;
 }
@@ -675,8 +703,7 @@ static int geneve_build_skb(struct dst_entry *dst, struct sk_buff *skb,
        if (err)
                goto free_dst;
 
-       gnvh = (struct genevehdr *)__skb_push(skb, sizeof(*gnvh) +
-                                                  info->options_len);
+       gnvh = __skb_push(skb, sizeof(*gnvh) + info->options_len);
        geneve_build_header(gnvh, info);
        skb_set_inner_protocol(skb, htons(ETH_P_TEB));
        return 0;
@@ -1047,7 +1074,8 @@ static const struct nla_policy geneve_policy[IFLA_GENEVE_MAX + 1] = {
        [IFLA_GENEVE_UDP_ZERO_CSUM6_RX] = { .type = NLA_U8 },
 };
 
-static int geneve_validate(struct nlattr *tb[], struct nlattr *data[])
+static int geneve_validate(struct nlattr *tb[], struct nlattr *data[],
+                          struct netlink_ext_ack *extack)
 {
        if (tb[IFLA_ADDRESS]) {
                if (nla_len(tb[IFLA_ADDRESS]) != ETH_ALEN)
@@ -1063,7 +1091,7 @@ static int geneve_validate(struct nlattr *tb[], struct nlattr *data[])
        if (data[IFLA_GENEVE_ID]) {
                __u32 vni =  nla_get_u32(data[IFLA_GENEVE_ID]);
 
-               if (vni >= GENEVE_VID_MASK)
+               if (vni >= GENEVE_N_VID)
                        return -ERANGE;
        }
 
@@ -1170,7 +1198,8 @@ static void init_tnl_info(struct ip_tunnel_info *info, __u16 dst_port)
 }
 
 static int geneve_newlink(struct net *net, struct net_device *dev,
-                         struct nlattr *tb[], struct nlattr *data[])
+                         struct nlattr *tb[], struct nlattr *data[],
+                         struct netlink_ext_ack *extack)
 {
        bool use_udp6_rx_checksums = false;
        struct ip_tunnel_info info;