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

Pull networking updates from David Miller:

 1) BPF debugger and asm tool by Daniel Borkmann.

 2) Speed up create/bind in AF_PACKET, also from Daniel Borkmann.

 3) Correct reciprocal_divide and update users, from Hannes Frederic
    Sowa and Daniel Borkmann.

 4) Currently we only have a "set" operation for the hw timestamp socket
    ioctl, add a "get" operation to match.  From Ben Hutchings.

 5) Add better trace events for debugging driver datapath problems, also
    from Ben Hutchings.

 6) Implement auto corking in TCP, from Eric Dumazet.  Basically, if we
    have a small send and a previous packet is already in the qdisc or
    device queue, defer until TX completion or we get more data.

 7) Allow userspace to manage ipv6 temporary addresses, from Jiri Pirko.

 8) Add a qdisc bypass option for AF_PACKET sockets, from Daniel
    Borkmann.

 9) Share IP header compression code between Bluetooth and IEEE802154
    layers, from Jukka Rissanen.

10) Fix ipv6 router reachability probing, from Jiri Benc.

11) Allow packets to be captured on macvtap devices, from Vlad Yasevich.

12) Support tunneling in GRO layer, from Jerry Chu.

13) Allow bonding to be configured fully using netlink, from Scott
    Feldman.

14) Allow AF_PACKET users to obtain the VLAN TPID, just like they can
    already get the TCI.  From Atzm Watanabe.

15) New "Heavy Hitter" qdisc, from Terry Lam.

16) Significantly improve the IPSEC support in pktgen, from Fan Du.

17) Allow ipv4 tunnels to cache routes, just like sockets.  From Tom
    Herbert.

18) Add Proportional Integral Enhanced packet scheduler, from Vijay
    Subramanian.

19) Allow openvswitch to mmap'd netlink, from Thomas Graf.

20) Key TCP metrics blobs also by source address, not just destination
    address.  From Christoph Paasch.

21) Support 10G in generic phylib.  From Andy Fleming.

22) Try to short-circuit GRO flow compares using device provided RX
    hash, if provided.  From Tom Herbert.

The wireless and netfilter folks have been busy little bees too.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (2064 commits)
  net/cxgb4: Fix referencing freed adapter
  ipv6: reallocate addrconf router for ipv6 address when lo device up
  fib_frontend: fix possible NULL pointer dereference
  rtnetlink: remove IFLA_BOND_SLAVE definition
  rtnetlink: remove check for fill_slave_info in rtnl_have_link_slave_info
  qlcnic: update version to 5.3.55
  qlcnic: Enhance logic to calculate msix vectors.
  qlcnic: Refactor interrupt coalescing code for all adapters.
  qlcnic: Update poll controller code path
  qlcnic: Interrupt code cleanup
  qlcnic: Enhance Tx timeout debugging.
  qlcnic: Use bool for rx_mac_learn.
  bonding: fix u64 division
  rtnetlink: add missing IFLA_BOND_AD_INFO_UNSPEC
  sfc: Use the correct maximum TX DMA ring size for SFC9100
  Add Shradha Shah as the sfc driver maintainer.
  net/vxlan: Share RX skb de-marking and checksum checks with ovs
  tulip: cleanup by using ARRAY_SIZE()
  ip_tunnel: clear IPCB in ip_tunnel_xmit() in case dst_link_failure() is called
  net/cxgb4: Don't retrieve stats during recovery
  ...

1 files changed, 60 insertions, 70 deletions

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 8e118af90973..29a30a14c315 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -31,8 +31,7 @@
 #include <net/pkt_cls.h>
 
 /* The list of all installed classifier types */
-
-static struct tcf_proto_ops *tcf_proto_base __read_mostly;
+static LIST_HEAD(tcf_proto_base);
 
 /* Protects list of registered TC modules. It is pure SMP lock. */
 static DEFINE_RWLOCK(cls_mod_lock);
@@ -41,36 +40,35 @@ static DEFINE_RWLOCK(cls_mod_lock);
 
 static const struct tcf_proto_ops *tcf_proto_lookup_ops(struct nlattr *kind)
 {
-        const struct tcf_proto_ops *t = NULL;
+        const struct tcf_proto_ops *t, *res = NULL;
 
         if (kind) {
                 read_lock(&cls_mod_lock);
-                for (t = tcf_proto_base; t; t = t->next) {
+                list_for_each_entry(t, &tcf_proto_base, head) {
                         if (nla_strcmp(kind, t->kind) == 0) {
-                                if (!try_module_get(t->owner))
-                                        t = NULL;
+                                if (try_module_get(t->owner))
+                                        res = t;
                                 break;
                         }
                 }
                 read_unlock(&cls_mod_lock);
         }
-        return t;
+        return res;
 }
 
 /* Register(unregister) new classifier type */
 
 int register_tcf_proto_ops(struct tcf_proto_ops *ops)
 {
-        struct tcf_proto_ops *t, **tp;
+        struct tcf_proto_ops *t;
         int rc = -EEXIST;
 
         write_lock(&cls_mod_lock);
-        for (tp = &tcf_proto_base; (t = *tp) != NULL; tp = &t->next)
+        list_for_each_entry(t, &tcf_proto_base, head)
                 if (!strcmp(ops->kind, t->kind))
                         goto out;
 
-        ops->next = NULL;
-        *tp = ops;
+        list_add_tail(&ops->head, &tcf_proto_base);
         rc = 0;
 out:
         write_unlock(&cls_mod_lock);
@@ -80,19 +78,17 @@ EXPORT_SYMBOL(register_tcf_proto_ops);
 
 int unregister_tcf_proto_ops(struct tcf_proto_ops *ops)
 {
-        struct tcf_proto_ops *t, **tp;
+        struct tcf_proto_ops *t;
         int rc = -ENOENT;
 
         write_lock(&cls_mod_lock);
-        for (tp = &tcf_proto_base; (t = *tp) != NULL; tp = &t->next)
-                if (t == ops)
+        list_for_each_entry(t, &tcf_proto_base, head) {
+                if (t == ops) {
+                        list_del(&t->head);
+                        rc = 0;
                         break;
-
-        if (!t)
-                goto out;
-        *tp = t->next;
-        rc = 0;
-out:
+                }
+        }
         write_unlock(&cls_mod_lock);
         return rc;
 }
@@ -344,7 +340,7 @@ errout:
         return err;
 }
 
-static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp,
+static int tcf_fill_node(struct net *net, struct sk_buff *skb, struct tcf_proto *tp,
                          unsigned long fh, u32 portid, u32 seq, u16 flags, int event)
 {
         struct tcmsg *tcm;
@@ -366,7 +362,7 @@ static int tcf_fill_node(struct sk_buff *skb, struct tcf_proto *tp,
         tcm->tcm_handle = fh;
         if (RTM_DELTFILTER != event) {
                 tcm->tcm_handle = 0;
-                if (tp->ops->dump && tp->ops->dump(tp, fh, skb, tcm) < 0)
+                if (tp->ops->dump && tp->ops->dump(net, tp, fh, skb, tcm) < 0)
                         goto nla_put_failure;
         }
         nlh->nlmsg_len = skb_tail_pointer(skb) - b;
@@ -389,7 +385,7 @@ static int tfilter_notify(struct net *net, struct sk_buff *oskb,
         if (!skb)
                 return -ENOBUFS;
 
-        if (tcf_fill_node(skb, tp, fh, portid, n->nlmsg_seq, 0, event) <= 0) {
+        if (tcf_fill_node(net, skb, tp, fh, portid, n->nlmsg_seq, 0, event) <= 0) {
                 kfree_skb(skb);
                 return -EINVAL;
         }
@@ -408,8 +404,9 @@ static int tcf_node_dump(struct tcf_proto *tp, unsigned long n,
                          struct tcf_walker *arg)
 {
         struct tcf_dump_args *a = (void *)arg;
+        struct net *net = sock_net(a->skb->sk);
 
-        return tcf_fill_node(a->skb, tp, n, NETLINK_CB(a->cb->skb).portid,
+        return tcf_fill_node(net, a->skb, tp, n, NETLINK_CB(a->cb->skb).portid,
                              a->cb->nlh->nlmsg_seq, NLM_F_MULTI, RTM_NEWTFILTER);
 }
 
@@ -467,7 +464,7 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb)
                 if (t > s_t)
                         memset(&cb->args[1], 0, sizeof(cb->args)-sizeof(cb->args[0]));
                 if (cb->args[1] == 0) {
-                        if (tcf_fill_node(skb, tp, 0, NETLINK_CB(cb->skb).portid,
+                        if (tcf_fill_node(net, skb, tp, 0, NETLINK_CB(cb->skb).portid,
                                           cb->nlh->nlmsg_seq, NLM_F_MULTI,
                                           RTM_NEWTFILTER) <= 0)
                                 break;
@@ -500,46 +497,41 @@ out:
 void tcf_exts_destroy(struct tcf_proto *tp, struct tcf_exts *exts)
 {
 #ifdef CONFIG_NET_CLS_ACT
-        if (exts->action) {
-                tcf_action_destroy(exts->action, TCA_ACT_UNBIND);
-                exts->action = NULL;
-        }
+        tcf_action_destroy(&exts->actions, TCA_ACT_UNBIND);
+        INIT_LIST_HEAD(&exts->actions);
 #endif
 }
 EXPORT_SYMBOL(tcf_exts_destroy);
 
 int tcf_exts_validate(struct net *net, struct tcf_proto *tp, struct nlattr **tb,
-                  struct nlattr *rate_tlv, struct tcf_exts *exts,
-                  const struct tcf_ext_map *map)
+                  struct nlattr *rate_tlv, struct tcf_exts *exts)
 {
-        memset(exts, 0, sizeof(*exts));
-
 #ifdef CONFIG_NET_CLS_ACT
         {
                 struct tc_action *act;
 
-                if (map->police && tb[map->police]) {
-                        act = tcf_action_init_1(net, tb[map->police], rate_tlv,
+                INIT_LIST_HEAD(&exts->actions);
+                if (exts->police && tb[exts->police]) {
+                        act = tcf_action_init_1(net, tb[exts->police], rate_tlv,
                                                 "police", TCA_ACT_NOREPLACE,
                                                 TCA_ACT_BIND);
                         if (IS_ERR(act))
                                 return PTR_ERR(act);
 
-                        act->type = TCA_OLD_COMPAT;
-                        exts->action = act;
-                } else if (map->action && tb[map->action]) {
-                        act = tcf_action_init(net, tb[map->action], rate_tlv,
+                        act->type = exts->type = TCA_OLD_COMPAT;
+                        list_add(&act->list, &exts->actions);
+                } else if (exts->action && tb[exts->action]) {
+                        int err;
+                        err = tcf_action_init(net, tb[exts->action], rate_tlv,
                                               NULL, TCA_ACT_NOREPLACE,
-                                              TCA_ACT_BIND);
-                        if (IS_ERR(act))
-                                return PTR_ERR(act);
-
-                        exts->action = act;
+                                              TCA_ACT_BIND, &exts->actions);
+                        if (err)
+                                return err;
                 }
         }
 #else
-        if ((map->action && tb[map->action]) ||
-            (map->police && tb[map->police]))
+        if ((exts->action && tb[exts->action]) ||
+            (exts->police && tb[exts->police]))
                 return -EOPNOTSUPP;
 #endif
 
@@ -551,43 +543,44 @@ void tcf_exts_change(struct tcf_proto *tp, struct tcf_exts *dst,
                      struct tcf_exts *src)
 {
 #ifdef CONFIG_NET_CLS_ACT
-        if (src->action) {
-                struct tc_action *act;
+        if (!list_empty(&src->actions)) {
+                LIST_HEAD(tmp);
                 tcf_tree_lock(tp);
-                act = dst->action;
-                dst->action = src->action;
+                list_splice_init(&dst->actions, &tmp);
+                list_splice(&src->actions, &dst->actions);
                 tcf_tree_unlock(tp);
-                if (act)
-                        tcf_action_destroy(act, TCA_ACT_UNBIND);
+                tcf_action_destroy(&tmp, TCA_ACT_UNBIND);
         }
 #endif
 }
 EXPORT_SYMBOL(tcf_exts_change);
 
-int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts,
-                  const struct tcf_ext_map *map)
+#define tcf_exts_first_act(ext) \
+                list_first_entry(&(exts)->actions, struct tc_action, list)
+
+int tcf_exts_dump(struct sk_buff *skb, struct tcf_exts *exts)
 {
 #ifdef CONFIG_NET_CLS_ACT
-        if (map->action && exts->action) {
+        if (exts->action && !list_empty(&exts->actions)) {
                 /*
                  * again for backward compatible mode - we want
                  * to work with both old and new modes of entering
                  * tc data even if iproute2  was newer - jhs
                  */
                 struct nlattr *nest;
-
-                if (exts->action->type != TCA_OLD_COMPAT) {
-                        nest = nla_nest_start(skb, map->action);
+                if (exts->type != TCA_OLD_COMPAT) {
+                        nest = nla_nest_start(skb, exts->action);
                         if (nest == NULL)
                                 goto nla_put_failure;
-                        if (tcf_action_dump(skb, exts->action, 0, 0) < 0)
+                        if (tcf_action_dump(skb, &exts->actions, 0, 0) < 0)
                                 goto nla_put_failure;
                         nla_nest_end(skb, nest);
-                } else if (map->police) {
-                        nest = nla_nest_start(skb, map->police);
-                        if (nest == NULL)
+                } else if (exts->police) {
+                        struct tc_action *act = tcf_exts_first_act(exts);
+                        nest = nla_nest_start(skb, exts->police);
+                        if (nest == NULL || !act)
                                 goto nla_put_failure;
-                        if (tcf_action_dump_old(skb, exts->action, 0, 0) < 0)
+                        if (tcf_action_dump_old(skb, act, 0, 0) < 0)
                                 goto nla_put_failure;
                         nla_nest_end(skb, nest);
                 }
@@ -600,17 +593,14 @@ nla_put_failure: __attribute__ ((unused))
 EXPORT_SYMBOL(tcf_exts_dump);
 
 
-int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts,
-                        const struct tcf_ext_map *map)
+int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts)
 {
 #ifdef CONFIG_NET_CLS_ACT
-        if (exts->action)
-                if (tcf_action_copy_stats(skb, exts->action, 1) < 0)
-                        goto nla_put_failure;
+        struct tc_action *a = tcf_exts_first_act(exts);
+        if (tcf_action_copy_stats(skb, a, 1) < 0)
+                return -1;
 #endif
         return 0;
-nla_put_failure: __attribute__ ((unused))
-        return -1;
 }
 EXPORT_SYMBOL(tcf_exts_dump_stats);