ip6ip6: Support for GSO/GRO

[karo-tx-linux.git] / net / ipv6 / ip6_tunnel.c

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 64ddbeaca371ddcd1887bf02821752114586a943..d26d2269abec035eebc072b7c010f27c84c3466a 100644 (file)
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1242,6 +1242,11 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
        if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)
                fl6.flowi6_mark = skb->mark;
 
+       if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
+               return -1;
+
+       skb_set_inner_ipproto(skb, IPPROTO_IPV6);
+
        err = ip6_tnl_xmit(skb, dev, dsfield, &fl6, encap_limit, &mtu,
                           IPPROTO_IPV6);
        if (err != 0) {
@@ -1640,6 +1645,11 @@ static const struct net_device_ops ip6_tnl_netdev_ops = {
        .ndo_get_iflink = ip6_tnl_get_iflink,
 };
 
+#define IPXIPX_FEATURES (NETIF_F_SG |          \
+                        NETIF_F_FRAGLIST |     \
+                        NETIF_F_HIGHDMA |      \
+                        NETIF_F_GSO_SOFTWARE | \
+                        NETIF_F_HW_CSUM)
 
 /**
  * ip6_tnl_dev_setup - setup virtual tunnel device
@@ -1659,6 +1669,10 @@ static void ip6_tnl_dev_setup(struct net_device *dev)
        dev->addr_len = sizeof(struct in6_addr);
        dev->features |= NETIF_F_LLTX;
        netif_keep_dst(dev);
+
+       dev->features           |= IPXIPX_FEATURES;
+       dev->hw_features        |= IPXIPX_FEATURES;
+
        /* This perm addr will be used as interface identifier by IPv6 */
        dev->addr_assign_type = NET_ADDR_RANDOM;
        eth_random_addr(dev->perm_addr);
@@ -1797,13 +1811,55 @@ static void ip6_tnl_netlink_parms(struct nlattr *data[],
                parms->proto = nla_get_u8(data[IFLA_IPTUN_PROTO]);
 }
 
+static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],
+                                       struct ip_tunnel_encap *ipencap)
+{
+       bool ret = false;
+
+       memset(ipencap, 0, sizeof(*ipencap));
+
+       if (!data)
+               return ret;
+
+       if (data[IFLA_IPTUN_ENCAP_TYPE]) {
+               ret = true;
+               ipencap->type = nla_get_u16(data[IFLA_IPTUN_ENCAP_TYPE]);
+       }
+
+       if (data[IFLA_IPTUN_ENCAP_FLAGS]) {
+               ret = true;
+               ipencap->flags = nla_get_u16(data[IFLA_IPTUN_ENCAP_FLAGS]);
+       }
+
+       if (data[IFLA_IPTUN_ENCAP_SPORT]) {
+               ret = true;
+               ipencap->sport = nla_get_be16(data[IFLA_IPTUN_ENCAP_SPORT]);
+       }
+
+       if (data[IFLA_IPTUN_ENCAP_DPORT]) {
+               ret = true;
+               ipencap->dport = nla_get_be16(data[IFLA_IPTUN_ENCAP_DPORT]);
+       }
+
+       return ret;
+}
+
 static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev,
                           struct nlattr *tb[], struct nlattr *data[])
 {
        struct net *net = dev_net(dev);
        struct ip6_tnl *nt, *t;
+       struct ip_tunnel_encap ipencap;
 
        nt = netdev_priv(dev);
+
+       if (ip6_tnl_netlink_encap_parms(data, &ipencap)) {
+               int err = ip6_tnl_encap_setup(nt, &ipencap);
+
+               if (err < 0)
+                       return err;
+       }
+
        ip6_tnl_netlink_parms(data, &nt->parms);
 
        t = ip6_tnl_locate(net, &nt->parms, 0);
@@ -1820,10 +1876,17 @@ static int ip6_tnl_changelink(struct net_device *dev, struct nlattr *tb[],
        struct __ip6_tnl_parm p;
        struct net *net = t->net;
        struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);
+       struct ip_tunnel_encap ipencap;
 
        if (dev == ip6n->fb_tnl_dev)
                return -EINVAL;
 
+       if (ip6_tnl_netlink_encap_parms(data, &ipencap)) {
+               int err = ip6_tnl_encap_setup(t, &ipencap);
+
+               if (err < 0)
+                       return err;
+       }
        ip6_tnl_netlink_parms(data, &p);
 
        t = ip6_tnl_locate(net, &p, 0);
@@ -1864,6 +1927,14 @@ static size_t ip6_tnl_get_size(const struct net_device *dev)
                nla_total_size(4) +
                /* IFLA_IPTUN_PROTO */
                nla_total_size(1) +
+               /* IFLA_IPTUN_ENCAP_TYPE */
+               nla_total_size(2) +
+               /* IFLA_IPTUN_ENCAP_FLAGS */
+               nla_total_size(2) +
+               /* IFLA_IPTUN_ENCAP_SPORT */
+               nla_total_size(2) +
+               /* IFLA_IPTUN_ENCAP_DPORT */
+               nla_total_size(2) +
                0;
 }
 
@@ -1881,6 +1952,17 @@ static int ip6_tnl_fill_info(struct sk_buff *skb, const struct net_device *dev)
            nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
            nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto))
                goto nla_put_failure;
+
+       if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE,
+                       tunnel->encap.type) ||
+       nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT,
+                    tunnel->encap.sport) ||
+       nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT,
+                    tunnel->encap.dport) ||
+       nla_put_u16(skb, IFLA_IPTUN_ENCAP_FLAGS,
+                   tunnel->encap.flags))
+               goto nla_put_failure;
+
        return 0;
 
 nla_put_failure:
@@ -1904,6 +1986,10 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
        [IFLA_IPTUN_FLOWINFO]           = { .type = NLA_U32 },
        [IFLA_IPTUN_FLAGS]              = { .type = NLA_U32 },
        [IFLA_IPTUN_PROTO]              = { .type = NLA_U8 },
+       [IFLA_IPTUN_ENCAP_TYPE]         = { .type = NLA_U16 },
+       [IFLA_IPTUN_ENCAP_FLAGS]        = { .type = NLA_U16 },
+       [IFLA_IPTUN_ENCAP_SPORT]        = { .type = NLA_U16 },
+       [IFLA_IPTUN_ENCAP_DPORT]        = { .type = NLA_U16 },
 };
 
 static struct rtnl_link_ops ip6_link_ops __read_mostly = {