geneve: Make dst-port configurable.

[firefly-linux-kernel-4.4.55.git] / drivers / net / geneve.c

diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 78d49d186e056fc278e59afaad5543f3b9717b84..0a6d9741d956c01b5e03fee39b8e7f8636573ffc 100644 (file)
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -49,6 +49,7 @@ struct geneve_dev {
        u8                 tos;         /* TOS override */
        struct sockaddr_in remote;      /* IPv4 address for link partner */
        struct list_head   next;        /* geneve's per namespace list */
+       __be16             dst_port;
 };
 
 static int geneve_net_id;
@@ -64,6 +65,7 @@ static inline __u32 geneve_net_vni_hash(u8 vni[3])
 /* geneve receive/decap routine */
 static void geneve_rx(struct geneve_sock *gs, struct sk_buff *skb)
 {
+       struct inet_sock *sk = inet_sk(gs->sock->sk);
        struct genevehdr *gnvh = geneve_hdr(skb);
        struct geneve_dev *dummy, *geneve = NULL;
        struct geneve_net *gn;
@@ -82,7 +84,8 @@ static void geneve_rx(struct geneve_sock *gs, struct sk_buff *skb)
        vni_list_head = &gn->vni_list[hash];
        hlist_for_each_entry_rcu(dummy, vni_list_head, hlist) {
                if (!memcmp(gnvh->vni, dummy->vni, sizeof(dummy->vni)) &&
-                   iph->saddr == dummy->remote.sin_addr.s_addr) {
+                   iph->saddr == dummy->remote.sin_addr.s_addr &&
+                   sk->inet_sport == dummy->dst_port) {
                        geneve = dummy;
                        break;
                }
@@ -157,7 +160,7 @@ static int geneve_open(struct net_device *dev)
        struct geneve_net *gn = net_generic(geneve->net, geneve_net_id);
        struct geneve_sock *gs;
 
-       gs = geneve_sock_add(net, htons(GENEVE_UDP_PORT), geneve_rx, gn,
+       gs = geneve_sock_add(net, geneve->dst_port, geneve_rx, gn,
                             false, false);
        if (IS_ERR(gs))
                return PTR_ERR(gs);
@@ -202,6 +205,9 @@ static netdev_tx_t geneve_xmit(struct sk_buff *skb, struct net_device *dev)
        memset(&fl4, 0, sizeof(fl4));
        fl4.flowi4_tos = RT_TOS(tos);
        fl4.daddr = geneve->remote.sin_addr.s_addr;
+       fl4.flowi4_mark = skb->mark;
+       fl4.flowi4_proto = IPPROTO_UDP;
+
        rt = ip_route_output_key(geneve->net, &fl4);
        if (IS_ERR(rt)) {
                netdev_dbg(dev, "no route to %pI4\n", &fl4.daddr);
@@ -225,7 +231,7 @@ static netdev_tx_t geneve_xmit(struct sk_buff *skb, struct net_device *dev)
        /* no need to handle local destination and encap bypass...yet... */
 
        err = geneve_xmit_skb(gs, rt, skb, fl4.saddr, fl4.daddr,
-                             tos, ttl, 0, sport, htons(GENEVE_UDP_PORT), 0,
+                             tos, ttl, 0, sport, geneve->dst_port, 0,
                              geneve->vni, 0, NULL, false,
                              !net_eq(geneve->net, dev_net(geneve->dev)));
        if (err < 0)
@@ -283,7 +289,6 @@ static void geneve_setup(struct net_device *dev)
 
        SET_NETDEV_DEVTYPE(dev, &geneve_type);
 
-       dev->tx_queue_len = 0;
        dev->features    |= NETIF_F_LLTX;
        dev->features    |= NETIF_F_SG | NETIF_F_HW_CSUM;
        dev->features    |= NETIF_F_RXCSUM;
@@ -297,7 +302,8 @@ static void geneve_setup(struct net_device *dev)
        dev->hw_features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX;
 
        netif_keep_dst(dev);
-       dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
+       dev->priv_flags |= IFF_LIVE_ADDR_CHANGE | IFF_NO_QUEUE;
+       eth_hw_addr_random(dev);
 }
 
 static const struct nla_policy geneve_policy[IFLA_GENEVE_MAX + 1] = {
@@ -305,6 +311,7 @@ static const struct nla_policy geneve_policy[IFLA_GENEVE_MAX + 1] = {
        [IFLA_GENEVE_REMOTE]            = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
        [IFLA_GENEVE_TTL]               = { .type = NLA_U8 },
        [IFLA_GENEVE_TOS]               = { .type = NLA_U8 },
+       [IFLA_GENEVE_PORT]              = { .type = NLA_U16 },
 };
 
 static int geneve_validate(struct nlattr *tb[], struct nlattr *data[])
@@ -338,6 +345,7 @@ static int geneve_newlink(struct net *net, struct net_device *dev,
        struct hlist_head *vni_list_head;
        struct sockaddr_in remote;      /* IPv4 address for link partner */
        __u32 vni, hash;
+       __be16 dst_port;
        int err;
 
        if (!data[IFLA_GENEVE_ID] || !data[IFLA_GENEVE_REMOTE])
@@ -356,18 +364,22 @@ static int geneve_newlink(struct net *net, struct net_device *dev,
        if (IN_MULTICAST(ntohl(geneve->remote.sin_addr.s_addr)))
                return -EINVAL;
 
+       if (data[IFLA_GENEVE_PORT])
+               dst_port = htons(nla_get_u16(data[IFLA_GENEVE_PORT]));
+       else
+               dst_port = htons(GENEVE_UDP_PORT);
+
        remote = geneve->remote;
        hash = geneve_net_vni_hash(geneve->vni);
        vni_list_head = &gn->vni_list[hash];
        hlist_for_each_entry_rcu(dummy, vni_list_head, hlist) {
                if (!memcmp(geneve->vni, dummy->vni, sizeof(dummy->vni)) &&
-                   !memcmp(&remote, &dummy->remote, sizeof(dummy->remote)))
+                   !memcmp(&remote, &dummy->remote, sizeof(dummy->remote)) &&
+                   dst_port == dummy->dst_port) {
                        return -EBUSY;
+               }
        }
 
-       if (tb[IFLA_ADDRESS] == NULL)
-               eth_hw_addr_random(dev);
-
        err = register_netdevice(dev);
        if (err)
                return err;
@@ -378,6 +390,7 @@ static int geneve_newlink(struct net *net, struct net_device *dev,
        if (data[IFLA_GENEVE_TOS])
                geneve->tos = nla_get_u8(data[IFLA_GENEVE_TOS]);
 
+       geneve->dst_port = dst_port;
        list_add(&geneve->next, &gn->geneve_list);
 
        hlist_add_head_rcu(&geneve->hlist, &gn->vni_list[hash]);
@@ -402,6 +415,7 @@ static size_t geneve_get_size(const struct net_device *dev)
                nla_total_size(sizeof(struct in_addr)) + /* IFLA_GENEVE_REMOTE */
                nla_total_size(sizeof(__u8)) +  /* IFLA_GENEVE_TTL */
                nla_total_size(sizeof(__u8)) +  /* IFLA_GENEVE_TOS */
+               nla_total_size(sizeof(__u16)) +  /* IFLA_GENEVE_PORT */
                0;
 }
 
@@ -422,6 +436,9 @@ static int geneve_fill_info(struct sk_buff *skb, const struct net_device *dev)
            nla_put_u8(skb, IFLA_GENEVE_TOS, geneve->tos))
                goto nla_put_failure;
 
+       if (nla_put_u16(skb, IFLA_GENEVE_PORT, ntohs(geneve->dst_port)))
+               goto nla_put_failure;
+
        return 0;
 
 nla_put_failure: