net_sched: act: fetch hinfo from a->ops->hinfo

Every action ops has a pointer to hash info, so we don't need to
hard-code it in each module.

Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

10 files changed, 51 insertions, 58 deletions

diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index 35f89e9ce49c..b94825322d4d 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -62,8 +62,9 @@ int tcf_hash_release(struct tcf_common *p, int bind,
 EXPORT_SYMBOL(tcf_hash_release);
 
 static int tcf_dump_walker(struct sk_buff *skb, struct netlink_callback *cb,
-                           struct tc_action *a, struct tcf_hashinfo *hinfo)
+                           struct tc_action *a)
 {
+        struct tcf_hashinfo *hinfo = a->ops->hinfo;
         struct hlist_head *head;
         struct tcf_common *p;
         int err = 0, index = -1, i = 0, s_i = 0, n_i = 0;
@@ -109,9 +110,9 @@ nla_put_failure:
         goto done;
 }
 
-static int tcf_del_walker(struct sk_buff *skb, struct tc_action *a,
-                          struct tcf_hashinfo *hinfo)
+static int tcf_del_walker(struct sk_buff *skb, struct tc_action *a)
 {
+        struct tcf_hashinfo *hinfo = a->ops->hinfo;
         struct hlist_head *head;
         struct hlist_node *n;
         struct tcf_common *p;
@@ -145,12 +146,10 @@ nla_put_failure:
 static int tcf_generic_walker(struct sk_buff *skb, struct netlink_callback *cb,
                               int type, struct tc_action *a)
 {
-        struct tcf_hashinfo *hinfo = a->ops->hinfo;
-
         if (type == RTM_DELACTION) {
-                return tcf_del_walker(skb, a, hinfo);
+                return tcf_del_walker(skb, a);
         } else if (type == RTM_GETACTION) {
-                return tcf_dump_walker(skb, cb, a, hinfo);
+                return tcf_dump_walker(skb, cb, a);
         } else {
                 WARN(1, "tcf_generic_walker: unknown action %d\n", type);
                 return -EINVAL;
@@ -199,9 +198,9 @@ static int tcf_hash_search(struct tc_action *a, u32 index)
         return 0;
 }
 
-struct tcf_common *tcf_hash_check(u32 index, struct tc_action *a, int bind,
-                                  struct tcf_hashinfo *hinfo)
+struct tcf_common *tcf_hash_check(u32 index, struct tc_action *a, int bind)
 {
+        struct tcf_hashinfo *hinfo = a->ops->hinfo;
         struct tcf_common *p = NULL;
         if (index && (p = tcf_hash_lookup(index, hinfo)) != NULL) {
                 if (bind)
@@ -214,9 +213,9 @@ struct tcf_common *tcf_hash_check(u32 index, struct tc_action *a, int bind,
 EXPORT_SYMBOL(tcf_hash_check);
 
 struct tcf_common *tcf_hash_create(u32 index, struct nlattr *est,
-                                   struct tc_action *a, int size, int bind,
-                                   struct tcf_hashinfo *hinfo)
+                                   struct tc_action *a, int size, int bind)
 {
+        struct tcf_hashinfo *hinfo = a->ops->hinfo;
         struct tcf_common *p = kzalloc(size, GFP_KERNEL);
 
         if (unlikely(!p))
@@ -495,6 +494,7 @@ struct tc_action *tcf_action_init_1(struct net *net, struct nlattr *nla,
         if (a == NULL)
                 goto err_mod;
 
+        a->ops = a_o;
         INIT_LIST_HEAD(&a->list);
         /* backward compatibility for policer */
         if (name == NULL)
@@ -510,7 +510,6 @@ struct tc_action *tcf_action_init_1(struct net *net, struct nlattr *nla,
          */
         if (err != ACT_P_CREATED)
                 module_put(a_o->owner);
-        a->ops = a_o;
 
         return a;
 
diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
index 9d5c1d343fe2..2210187c45c2 100644
--- a/net/sched/act_csum.c
+++ b/net/sched/act_csum.c
@@ -63,17 +63,16 @@ static int tcf_csum_init(struct net *n, struct nlattr *nla, struct nlattr *est,
                 return -EINVAL;
         parm = nla_data(tb[TCA_CSUM_PARMS]);
 
-        pc = tcf_hash_check(parm->index, a, bind, &csum_hash_info);
+        pc = tcf_hash_check(parm->index, a, bind);
         if (!pc) {
-                pc = tcf_hash_create(parm->index, est, a, sizeof(*p), bind,
-                                     &csum_hash_info);
+                pc = tcf_hash_create(parm->index, est, a, sizeof(*p), bind);
                 if (IS_ERR(pc))
                         return PTR_ERR(pc);
                 ret = ACT_P_CREATED;
         } else {
                 if (bind)/* dont override defaults */
                         return 0;
-                tcf_hash_release(pc, bind, &csum_hash_info);
+                tcf_hash_release(pc, bind, a->ops->hinfo);
                 if (!ovr)
                         return -EEXIST;
         }
@@ -85,7 +84,7 @@ static int tcf_csum_init(struct net *n, struct nlattr *nla, struct nlattr *est,
         spin_unlock_bh(&p->tcf_lock);
 
         if (ret == ACT_P_CREATED)
-                tcf_hash_insert(pc, &csum_hash_info);
+                tcf_hash_insert(pc, a->ops->hinfo);
 
         return ret;
 }
diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
index 72c49de50616..a0eed30d5811 100644
--- a/net/sched/act_gact.c
+++ b/net/sched/act_gact.c
@@ -86,17 +86,16 @@ static int tcf_gact_init(struct net *net, struct nlattr *nla,
         }
 #endif
 
-        pc = tcf_hash_check(parm->index, a, bind, &gact_hash_info);
+        pc = tcf_hash_check(parm->index, a, bind);
         if (!pc) {
-                pc = tcf_hash_create(parm->index, est, a, sizeof(*gact),
-                                     bind, &gact_hash_info);
+                pc = tcf_hash_create(parm->index, est, a, sizeof(*gact), bind);
                 if (IS_ERR(pc))
                         return PTR_ERR(pc);
                 ret = ACT_P_CREATED;
         } else {
                 if (bind)/* dont override defaults */
                         return 0;
-                tcf_hash_release(pc, bind, &gact_hash_info);
+                tcf_hash_release(pc, bind, a->ops->hinfo);
                 if (!ovr)
                         return -EEXIST;
         }
@@ -114,7 +113,7 @@ static int tcf_gact_init(struct net *net, struct nlattr *nla,
 #endif
         spin_unlock_bh(&gact->tcf_lock);
         if (ret == ACT_P_CREATED)
-                tcf_hash_insert(pc, &gact_hash_info);
+                tcf_hash_insert(pc, a->ops->hinfo);
         return ret;
 }
 
@@ -123,7 +122,7 @@ static int tcf_gact_cleanup(struct tc_action *a, int bind)
         struct tcf_gact *gact = a->priv;
 
         if (gact)
-                return tcf_hash_release(&gact->common, bind, &gact_hash_info);
+                return tcf_hash_release(&gact->common, bind, a->ops->hinfo);
         return 0;
 }
 
diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index 67d701e0a2bd..0a6d62174027 100644
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -125,10 +125,9 @@ static int tcf_ipt_init(struct net *net, struct nlattr *nla, struct nlattr *est,
         if (tb[TCA_IPT_INDEX] != NULL)
                 index = nla_get_u32(tb[TCA_IPT_INDEX]);
 
-        pc = tcf_hash_check(index, a, bind, &ipt_hash_info);
+        pc = tcf_hash_check(index, a, bind);
         if (!pc) {
-                pc = tcf_hash_create(index, est, a, sizeof(*ipt), bind,
-                                     &ipt_hash_info);
+                pc = tcf_hash_create(index, est, a, sizeof(*ipt), bind);
                 if (IS_ERR(pc))
                         return PTR_ERR(pc);
                 ret = ACT_P_CREATED;
@@ -171,7 +170,7 @@ static int tcf_ipt_init(struct net *net, struct nlattr *nla, struct nlattr *est,
         ipt->tcfi_hook  = hook;
         spin_unlock_bh(&ipt->tcf_lock);
         if (ret == ACT_P_CREATED)
-                tcf_hash_insert(pc, &ipt_hash_info);
+                tcf_hash_insert(pc, a->ops->hinfo);
         return ret;
 
 err3:
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index 376234ee8514..0b2c6d39d396 100644
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -101,12 +101,11 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
                 dev = NULL;
         }
 
-        pc = tcf_hash_check(parm->index, a, bind, &mirred_hash_info);
+        pc = tcf_hash_check(parm->index, a, bind);
         if (!pc) {
                 if (dev == NULL)
                         return -EINVAL;
-                pc = tcf_hash_create(parm->index, est, a, sizeof(*m), bind,
-                                     &mirred_hash_info);
+                pc = tcf_hash_create(parm->index, est, a, sizeof(*m), bind);
                 if (IS_ERR(pc))
                         return PTR_ERR(pc);
                 ret = ACT_P_CREATED;
@@ -132,7 +131,7 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
         spin_unlock_bh(&m->tcf_lock);
         if (ret == ACT_P_CREATED) {
                 list_add(&m->tcfm_list, &mirred_list);
-                tcf_hash_insert(pc, &mirred_hash_info);
+                tcf_hash_insert(pc, a->ops->hinfo);
         }
 
         return ret;
diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c
index 46e1aa36b147..81f0404bb335 100644
--- a/net/sched/act_nat.c
+++ b/net/sched/act_nat.c
@@ -57,17 +57,16 @@ static int tcf_nat_init(struct net *net, struct nlattr *nla, struct nlattr *est,
                 return -EINVAL;
         parm = nla_data(tb[TCA_NAT_PARMS]);
 
-        pc = tcf_hash_check(parm->index, a, bind, &nat_hash_info);
+        pc = tcf_hash_check(parm->index, a, bind);
         if (!pc) {
-                pc = tcf_hash_create(parm->index, est, a, sizeof(*p), bind,
-                                     &nat_hash_info);
+                pc = tcf_hash_create(parm->index, est, a, sizeof(*p), bind);
                 if (IS_ERR(pc))
                         return PTR_ERR(pc);
                 ret = ACT_P_CREATED;
         } else {
                 if (bind)
                         return 0;
-                tcf_hash_release(pc, bind, &nat_hash_info);
+                tcf_hash_release(pc, bind, a->ops->hinfo);
                 if (!ovr)
                         return -EEXIST;
         }
@@ -83,7 +82,7 @@ static int tcf_nat_init(struct net *net, struct nlattr *nla, struct nlattr *est,
         spin_unlock_bh(&p->tcf_lock);
 
         if (ret == ACT_P_CREATED)
-                tcf_hash_insert(pc, &nat_hash_info);
+                tcf_hash_insert(pc, a->ops->hinfo);
 
         return ret;
 }
diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index 109265d7c14b..be3f0f6875bb 100644
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -57,12 +57,11 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,
         if (nla_len(tb[TCA_PEDIT_PARMS]) < sizeof(*parm) + ksize)
                 return -EINVAL;
 
-        pc = tcf_hash_check(parm->index, a, bind, &pedit_hash_info);
+        pc = tcf_hash_check(parm->index, a, bind);
         if (!pc) {
                 if (!parm->nkeys)
                         return -EINVAL;
-                pc = tcf_hash_create(parm->index, est, a, sizeof(*p), bind,
-                                     &pedit_hash_info);
+                pc = tcf_hash_create(parm->index, est, a, sizeof(*p), bind);
                 if (IS_ERR(pc))
                         return PTR_ERR(pc);
                 p = to_pedit(pc);
@@ -77,7 +76,7 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,
                 ret = ACT_P_CREATED;
         } else {
                 p = to_pedit(pc);
-                tcf_hash_release(pc, bind, &pedit_hash_info);
+                tcf_hash_release(pc, bind, a->ops->hinfo);
                 if (bind)
                         return 0;
                 if (!ovr)
@@ -101,7 +100,7 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,
         memcpy(p->tcfp_keys, parm->keys, ksize);
         spin_unlock_bh(&p->tcf_lock);
         if (ret == ACT_P_CREATED)
-                tcf_hash_insert(pc, &pedit_hash_info);
+                tcf_hash_insert(pc, a->ops->hinfo);
         return ret;
 }
 
diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index 85437ba5c64b..c7093896cf14 100644
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -59,17 +59,18 @@ struct tc_police_compat {
 static int tcf_act_police_walker(struct sk_buff *skb, struct netlink_callback *cb,
                               int type, struct tc_action *a)
 {
+        struct tcf_hashinfo *hinfo = a->ops->hinfo;
         struct hlist_head *head;
         struct tcf_common *p;
         int err = 0, index = -1, i = 0, s_i = 0, n_i = 0;
         struct nlattr *nest;
 
-        spin_lock_bh(&police_hash_info.lock);
+        spin_lock_bh(&hinfo->lock);
 
         s_i = cb->args[0];
 
         for (i = 0; i < (POL_TAB_MASK + 1); i++) {
-                head = &police_hash_info.htab[tcf_hash(i, POL_TAB_MASK)];
+                head = &hinfo->htab[tcf_hash(i, POL_TAB_MASK)];
 
                 hlist_for_each_entry_rcu(p, head, tcfc_head) {
                         index++;
@@ -94,7 +95,7 @@ static int tcf_act_police_walker(struct sk_buff *skb, struct netlink_callback *c
                 }
         }
 done:
-        spin_unlock_bh(&police_hash_info.lock);
+        spin_unlock_bh(&hinfo->lock);
         if (n_i)
                 cb->args[0] += n_i;
         return n_i;
@@ -121,6 +122,7 @@ static int tcf_act_police_locate(struct net *net, struct nlattr *nla,
         struct tc_police *parm;
         struct tcf_police *police;
         struct qdisc_rate_table *R_tab = NULL, *P_tab = NULL;
+        struct tcf_hashinfo *hinfo = a->ops->hinfo;
         int size;
 
         if (nla == NULL)
@@ -140,7 +142,7 @@ static int tcf_act_police_locate(struct net *net, struct nlattr *nla,
         if (parm->index) {
                 struct tcf_common *pc;
 
-                pc = tcf_hash_lookup(parm->index, &police_hash_info);
+                pc = tcf_hash_lookup(parm->index, hinfo);
                 if (pc != NULL) {
                         a->priv = pc;
                         police = to_police(pc);
@@ -236,11 +238,11 @@ override:
 
         police->tcfp_t_c = ktime_to_ns(ktime_get());
         police->tcf_index = parm->index ? parm->index :
-                tcf_hash_new_index(&police_hash_info);
+                tcf_hash_new_index(a->ops->hinfo);
         h = tcf_hash(police->tcf_index, POL_TAB_MASK);
-        spin_lock_bh(&police_hash_info.lock);
-        hlist_add_head(&police->tcf_head, &police_hash_info.htab[h]);
-        spin_unlock_bh(&police_hash_info.lock);
+        spin_lock_bh(&hinfo->lock);
+        hlist_add_head(&police->tcf_head, &hinfo->htab[h]);
+        spin_unlock_bh(&hinfo->lock);
 
         a->priv = police;
         return ret;
diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
index 92236daaac8d..8ef2f1fcbfba 100644
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
@@ -114,10 +114,9 @@ static int tcf_simp_init(struct net *net, struct nlattr *nla,
         parm = nla_data(tb[TCA_DEF_PARMS]);
         defdata = nla_data(tb[TCA_DEF_DATA]);
 
-        pc = tcf_hash_check(parm->index, a, bind, &simp_hash_info);
+        pc = tcf_hash_check(parm->index, a, bind);
         if (!pc) {
-                pc = tcf_hash_create(parm->index, est, a, sizeof(*d), bind,
-                                     &simp_hash_info);
+                pc = tcf_hash_create(parm->index, est, a, sizeof(*d), bind);
                 if (IS_ERR(pc))
                         return PTR_ERR(pc);
 
@@ -145,7 +144,7 @@ static int tcf_simp_init(struct net *net, struct nlattr *nla,
         }
 
         if (ret == ACT_P_CREATED)
-                tcf_hash_insert(pc, &simp_hash_info);
+                tcf_hash_insert(pc, a->ops->hinfo);
         return ret;
 }
 
diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c
index c36b5209bc15..98725080b5aa 100644
--- a/net/sched/act_skbedit.c
+++ b/net/sched/act_skbedit.c
@@ -100,10 +100,9 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
 
         parm = nla_data(tb[TCA_SKBEDIT_PARMS]);
 
-        pc = tcf_hash_check(parm->index, a, bind, &skbedit_hash_info);
+        pc = tcf_hash_check(parm->index, a, bind);
         if (!pc) {
-                pc = tcf_hash_create(parm->index, est, a, sizeof(*d), bind,
-                                     &skbedit_hash_info);
+                pc = tcf_hash_create(parm->index, est, a, sizeof(*d), bind);
                 if (IS_ERR(pc))
                         return PTR_ERR(pc);
 
@@ -113,7 +112,7 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
                 d = to_skbedit(pc);
                 if (bind)
                         return 0;
-                tcf_hash_release(pc, bind, &skbedit_hash_info);
+                tcf_hash_release(pc, bind, a->ops->hinfo);
                 if (!ovr)
                         return -EEXIST;
         }
@@ -133,7 +132,7 @@ static int tcf_skbedit_init(struct net *net, struct nlattr *nla,
         spin_unlock_bh(&d->tcf_lock);
 
         if (ret == ACT_P_CREATED)
-                tcf_hash_insert(pc, &skbedit_hash_info);
+                tcf_hash_insert(pc, a->ops->hinfo);
         return ret;
 }