net_sched: switch to exit_batch for action pernet ops

Since we now hold RTNL lock in tc_action_net_exit(), it is good to
batch them to speedup tc action dismantle.

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

diff --git a/include/net/act_api.h b/include/net/act_api.h
index 02bf409140d018d91769ed1ab63f126708f065c7..6ed9692f20bdd02e9c7cab528d50281b21990d0a 100644 (file)
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -120,12 +120,19 @@ int tc_action_net_init(struct tc_action_net *tn,
 void tcf_idrinfo_destroy(const struct tc_action_ops *ops,
                         struct tcf_idrinfo *idrinfo);
 
-static inline void tc_action_net_exit(struct tc_action_net *tn)
+static inline void tc_action_net_exit(struct list_head *net_list,
+                                     unsigned int id)
 {
+       struct net *net;
+
        rtnl_lock();
-       tcf_idrinfo_destroy(tn->ops, tn->idrinfo);
+       list_for_each_entry(net, net_list, exit_list) {
+               struct tc_action_net *tn = net_generic(net, id);
+
+               tcf_idrinfo_destroy(tn->ops, tn->idrinfo);
+               kfree(tn->idrinfo);
+       }
        rtnl_unlock();
-       kfree(tn->idrinfo);
 }
 
 int tcf_generic_walker(struct tc_action_net *tn, struct sk_buff *skb,

diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c
index e6c477fa9ca51cd8e6fb5a4fa4b1a63795c45e05..b3f2c15affa7b2d1b533163b6d88b3d518635d7d 100644 (file)
--- a/net/sched/act_bpf.c
+++ b/net/sched/act_bpf.c
@@ -401,16 +401,14 @@ static __net_init int bpf_init_net(struct net *net)
        return tc_action_net_init(tn, &act_bpf_ops);
 }
 
-static void __net_exit bpf_exit_net(struct net *net)
+static void __net_exit bpf_exit_net(struct list_head *net_list)
 {
-       struct tc_action_net *tn = net_generic(net, bpf_net_id);
-
-       tc_action_net_exit(tn);
+       tc_action_net_exit(net_list, bpf_net_id);
 }
 
 static struct pernet_operations bpf_net_ops = {
        .init = bpf_init_net,
-       .exit = bpf_exit_net,
+       .exit_batch = bpf_exit_net,
        .id   = &bpf_net_id,
        .size = sizeof(struct tc_action_net),
 };

diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c
index 10b7a8855a6c754640c66b21af3df1e4b17de63d..2b15ba84e0c8ecb23abdf6330f4b03a268af921f 100644 (file)
--- a/net/sched/act_connmark.c
+++ b/net/sched/act_connmark.c
@@ -209,16 +209,14 @@ static __net_init int connmark_init_net(struct net *net)
        return tc_action_net_init(tn, &act_connmark_ops);
 }
 
-static void __net_exit connmark_exit_net(struct net *net)
+static void __net_exit connmark_exit_net(struct list_head *net_list)
 {
-       struct tc_action_net *tn = net_generic(net, connmark_net_id);
-
-       tc_action_net_exit(tn);
+       tc_action_net_exit(net_list, connmark_net_id);
 }
 
 static struct pernet_operations connmark_net_ops = {
        .init = connmark_init_net,
-       .exit = connmark_exit_net,
+       .exit_batch = connmark_exit_net,
        .id   = &connmark_net_id,
        .size = sizeof(struct tc_action_net),
 };

diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c
index d836f998117b2417548b22a73940300405ce65b8..af4b8ec60d9a90cf2a624eceba27350625012424 100644 (file)
--- a/net/sched/act_csum.c
+++ b/net/sched/act_csum.c
@@ -635,16 +635,14 @@ static __net_init int csum_init_net(struct net *net)
        return tc_action_net_init(tn, &act_csum_ops);
 }
 
-static void __net_exit csum_exit_net(struct net *net)
+static void __net_exit csum_exit_net(struct list_head *net_list)
 {
-       struct tc_action_net *tn = net_generic(net, csum_net_id);
-
-       tc_action_net_exit(tn);
+       tc_action_net_exit(net_list, csum_net_id);
 }
 
 static struct pernet_operations csum_net_ops = {
        .init = csum_init_net,
-       .exit = csum_exit_net,
+       .exit_batch = csum_exit_net,
        .id   = &csum_net_id,
        .size = sizeof(struct tc_action_net),
 };

diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
index e29a48ef7fc348aefdc720cf08d1509ac5b53559..9d632e92cad0d2368bfacd492457e22406b586e0 100644 (file)
--- a/net/sched/act_gact.c
+++ b/net/sched/act_gact.c
@@ -235,16 +235,14 @@ static __net_init int gact_init_net(struct net *net)
        return tc_action_net_init(tn, &act_gact_ops);
 }
 
-static void __net_exit gact_exit_net(struct net *net)
+static void __net_exit gact_exit_net(struct list_head *net_list)
 {
-       struct tc_action_net *tn = net_generic(net, gact_net_id);
-
-       tc_action_net_exit(tn);
+       tc_action_net_exit(net_list, gact_net_id);
 }
 
 static struct pernet_operations gact_net_ops = {
        .init = gact_init_net,
-       .exit = gact_exit_net,
+       .exit_batch = gact_exit_net,
        .id   = &gact_net_id,
        .size = sizeof(struct tc_action_net),
 };

diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c
index dee9cf22686cd7b6938606a7c6f300e80d04493e..5954e992685a0cc1d573a97ee62849261586b84e 100644 (file)
--- a/net/sched/act_ife.c
+++ b/net/sched/act_ife.c
@@ -858,16 +858,14 @@ static __net_init int ife_init_net(struct net *net)
        return tc_action_net_init(tn, &act_ife_ops);
 }
 
-static void __net_exit ife_exit_net(struct net *net)
+static void __net_exit ife_exit_net(struct list_head *net_list)
 {
-       struct tc_action_net *tn = net_generic(net, ife_net_id);
-
-       tc_action_net_exit(tn);
+       tc_action_net_exit(net_list, ife_net_id);
 }
 
 static struct pernet_operations ife_net_ops = {
        .init = ife_init_net,
-       .exit = ife_exit_net,
+       .exit_batch = ife_exit_net,
        .id   = &ife_net_id,
        .size = sizeof(struct tc_action_net),
 };

diff --git a/net/sched/act_ipt.c b/net/sched/act_ipt.c
index 2479b255dc1d11c9a2eac1279f23d676fd2fbc04..06e380ae09283fe57ce6131b42b72393540f392e 100644 (file)
--- a/net/sched/act_ipt.c
+++ b/net/sched/act_ipt.c
@@ -337,16 +337,14 @@ static __net_init int ipt_init_net(struct net *net)
        return tc_action_net_init(tn, &act_ipt_ops);
 }
 
-static void __net_exit ipt_exit_net(struct net *net)
+static void __net_exit ipt_exit_net(struct list_head *net_list)
 {
-       struct tc_action_net *tn = net_generic(net, ipt_net_id);
-
-       tc_action_net_exit(tn);
+       tc_action_net_exit(net_list, ipt_net_id);
 }
 
 static struct pernet_operations ipt_net_ops = {
        .init = ipt_init_net,
-       .exit = ipt_exit_net,
+       .exit_batch = ipt_exit_net,
        .id   = &ipt_net_id,
        .size = sizeof(struct tc_action_net),
 };
@@ -387,16 +385,14 @@ static __net_init int xt_init_net(struct net *net)
        return tc_action_net_init(tn, &act_xt_ops);
 }
 
-static void __net_exit xt_exit_net(struct net *net)
+static void __net_exit xt_exit_net(struct list_head *net_list)
 {
-       struct tc_action_net *tn = net_generic(net, xt_net_id);
-
-       tc_action_net_exit(tn);
+       tc_action_net_exit(net_list, xt_net_id);
 }
 
 static struct pernet_operations xt_net_ops = {
        .init = xt_init_net,
-       .exit = xt_exit_net,
+       .exit_batch = xt_exit_net,
        .id   = &xt_net_id,
        .size = sizeof(struct tc_action_net),
 };

diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index cee2d413bf5738eab5dff0b6b1a0a8de6f9a9bd5..37e5e4decbd630483c57bb40bddf5a5178bda6a5 100644 (file)
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -334,16 +334,14 @@ static __net_init int mirred_init_net(struct net *net)
        return tc_action_net_init(tn, &act_mirred_ops);
 }
 
-static void __net_exit mirred_exit_net(struct net *net)
+static void __net_exit mirred_exit_net(struct list_head *net_list)
 {
-       struct tc_action_net *tn = net_generic(net, mirred_net_id);
-
-       tc_action_net_exit(tn);
+       tc_action_net_exit(net_list, mirred_net_id);
 }
 
 static struct pernet_operations mirred_net_ops = {
        .init = mirred_init_net,
-       .exit = mirred_exit_net,
+       .exit_batch = mirred_exit_net,
        .id   = &mirred_net_id,
        .size = sizeof(struct tc_action_net),
 };

diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c
index c365d01b99c8b7892c16e43742a88744d7d84e54..98c6a4b2f5238c2b46113df9bd8276068ccff2bc 100644 (file)
--- a/net/sched/act_nat.c
+++ b/net/sched/act_nat.c
@@ -310,16 +310,14 @@ static __net_init int nat_init_net(struct net *net)
        return tc_action_net_init(tn, &act_nat_ops);
 }
 
-static void __net_exit nat_exit_net(struct net *net)
+static void __net_exit nat_exit_net(struct list_head *net_list)
 {
-       struct tc_action_net *tn = net_generic(net, nat_net_id);
-
-       tc_action_net_exit(tn);
+       tc_action_net_exit(net_list, nat_net_id);
 }
 
 static struct pernet_operations nat_net_ops = {
        .init = nat_init_net,
-       .exit = nat_exit_net,
+       .exit_batch = nat_exit_net,
        .id   = &nat_net_id,
        .size = sizeof(struct tc_action_net),
 };

diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index dba996bcd6dcff18f9d3a1d0ef8db58a54b992fe..349beaffb29e4ae1dec0c9c25005f69197513603 100644 (file)
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -453,16 +453,14 @@ static __net_init int pedit_init_net(struct net *net)
        return tc_action_net_init(tn, &act_pedit_ops);
 }
 
-static void __net_exit pedit_exit_net(struct net *net)
+static void __net_exit pedit_exit_net(struct list_head *net_list)
 {
-       struct tc_action_net *tn = net_generic(net, pedit_net_id);
-
-       tc_action_net_exit(tn);
+       tc_action_net_exit(net_list, pedit_net_id);
 }
 
 static struct pernet_operations pedit_net_ops = {
        .init = pedit_init_net,
-       .exit = pedit_exit_net,
+       .exit_batch = pedit_exit_net,
        .id   = &pedit_net_id,
        .size = sizeof(struct tc_action_net),
 };

diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index 3bb2ebf9e9aec2743033ecdc4f5763ce601bf653..bf483db993a1e3a414c8ba54f1bf10f0501a8cd9 100644 (file)
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -334,16 +334,14 @@ static __net_init int police_init_net(struct net *net)
        return tc_action_net_init(tn, &act_police_ops);
 }
 
-static void __net_exit police_exit_net(struct net *net)
+static void __net_exit police_exit_net(struct list_head *net_list)
 {
-       struct tc_action_net *tn = net_generic(net, police_net_id);
-
-       tc_action_net_exit(tn);
+       tc_action_net_exit(net_list, police_net_id);
 }
 
 static struct pernet_operations police_net_ops = {
        .init = police_init_net,
-       .exit = police_exit_net,
+       .exit_batch = police_exit_net,
        .id   = &police_net_id,
        .size = sizeof(struct tc_action_net),
 };

diff --git a/net/sched/act_sample.c b/net/sched/act_sample.c
index 859a93903339539a6652f3bbf80bd77df2820b05..1ba0df23875624e360acf4cc8131dcce8bc67ac4 100644 (file)
--- a/net/sched/act_sample.c
+++ b/net/sched/act_sample.c
@@ -236,16 +236,14 @@ static __net_init int sample_init_net(struct net *net)
        return tc_action_net_init(tn, &act_sample_ops);
 }
 
-static void __net_exit sample_exit_net(struct net *net)
+static void __net_exit sample_exit_net(struct list_head *net_list)
 {
-       struct tc_action_net *tn = net_generic(net, sample_net_id);
-
-       tc_action_net_exit(tn);
+       tc_action_net_exit(net_list, sample_net_id);
 }
 
 static struct pernet_operations sample_net_ops = {
        .init = sample_init_net,
-       .exit = sample_exit_net,
+       .exit_batch = sample_exit_net,
        .id   = &sample_net_id,
        .size = sizeof(struct tc_action_net),
 };

diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c
index eda57b47a6b6ef55449abef140c176dc52b9a9ff..425eac11f6da0859f7dac97b0ef64fd7a6dc6181 100644 (file)
--- a/net/sched/act_simple.c
+++ b/net/sched/act_simple.c
@@ -204,16 +204,14 @@ static __net_init int simp_init_net(struct net *net)
        return tc_action_net_init(tn, &act_simp_ops);
 }
 
-static void __net_exit simp_exit_net(struct net *net)
+static void __net_exit simp_exit_net(struct list_head *net_list)
 {
-       struct tc_action_net *tn = net_generic(net, simp_net_id);
-
-       tc_action_net_exit(tn);
+       tc_action_net_exit(net_list, simp_net_id);
 }
 
 static struct pernet_operations simp_net_ops = {
        .init = simp_init_net,
-       .exit = simp_exit_net,
+       .exit_batch = simp_exit_net,
        .id   = &simp_net_id,
        .size = sizeof(struct tc_action_net),
 };

diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c
index 59949d61f20da1031b8b47712f817c991c6bed60..5a3f691bb5455ff14672a277353ef28d7ac6f9ea 100644 (file)
--- a/net/sched/act_skbedit.c
+++ b/net/sched/act_skbedit.c
@@ -241,16 +241,14 @@ static __net_init int skbedit_init_net(struct net *net)
        return tc_action_net_init(tn, &act_skbedit_ops);
 }
 
-static void __net_exit skbedit_exit_net(struct net *net)
+static void __net_exit skbedit_exit_net(struct list_head *net_list)
 {
-       struct tc_action_net *tn = net_generic(net, skbedit_net_id);
-
-       tc_action_net_exit(tn);
+       tc_action_net_exit(net_list, skbedit_net_id);
 }
 
 static struct pernet_operations skbedit_net_ops = {
        .init = skbedit_init_net,
-       .exit = skbedit_exit_net,
+       .exit_batch = skbedit_exit_net,
        .id   = &skbedit_net_id,
        .size = sizeof(struct tc_action_net),
 };

diff --git a/net/sched/act_skbmod.c b/net/sched/act_skbmod.c
index f090bba1a79ec0531af9ac5f5ccff5e8d576a036..fa975262dbacf19013a3d3b0390c3a49837bfa15 100644 (file)
--- a/net/sched/act_skbmod.c
+++ b/net/sched/act_skbmod.c
@@ -266,16 +266,14 @@ static __net_init int skbmod_init_net(struct net *net)
        return tc_action_net_init(tn, &act_skbmod_ops);
 }
 
-static void __net_exit skbmod_exit_net(struct net *net)
+static void __net_exit skbmod_exit_net(struct list_head *net_list)
 {
-       struct tc_action_net *tn = net_generic(net, skbmod_net_id);
-
-       tc_action_net_exit(tn);
+       tc_action_net_exit(net_list, skbmod_net_id);
 }
 
 static struct pernet_operations skbmod_net_ops = {
        .init = skbmod_init_net,
-       .exit = skbmod_exit_net,
+       .exit_batch = skbmod_exit_net,
        .id   = &skbmod_net_id,
        .size = sizeof(struct tc_action_net),
 };

diff --git a/net/sched/act_tunnel_key.c b/net/sched/act_tunnel_key.c
index 57b63bdec3ae98786e0641d38be76cf6fb2f9542..0e23aac09ad63aa3a5edc1b7db6bda958182559d 100644 (file)
--- a/net/sched/act_tunnel_key.c
+++ b/net/sched/act_tunnel_key.c
@@ -325,16 +325,14 @@ static __net_init int tunnel_key_init_net(struct net *net)
        return tc_action_net_init(tn, &act_tunnel_key_ops);
 }
 
-static void __net_exit tunnel_key_exit_net(struct net *net)
+static void __net_exit tunnel_key_exit_net(struct list_head *net_list)
 {
-       struct tc_action_net *tn = net_generic(net, tunnel_key_net_id);
-
-       tc_action_net_exit(tn);
+       tc_action_net_exit(net_list, tunnel_key_net_id);
 }
 
 static struct pernet_operations tunnel_key_net_ops = {
        .init = tunnel_key_init_net,
-       .exit = tunnel_key_exit_net,
+       .exit_batch = tunnel_key_exit_net,
        .id   = &tunnel_key_net_id,
        .size = sizeof(struct tc_action_net),
 };

diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c
index 41f0878ad26ed1bdce77a1cb19ef656fa80c0406..e1a1b3f3983a61adc3fb471713b27899fb7688b6 100644 (file)
--- a/net/sched/act_vlan.c
+++ b/net/sched/act_vlan.c
@@ -301,16 +301,14 @@ static __net_init int vlan_init_net(struct net *net)
        return tc_action_net_init(tn, &act_vlan_ops);
 }
 
-static void __net_exit vlan_exit_net(struct net *net)
+static void __net_exit vlan_exit_net(struct list_head *net_list)
 {
-       struct tc_action_net *tn = net_generic(net, vlan_net_id);
-
-       tc_action_net_exit(tn);
+       tc_action_net_exit(net_list, vlan_net_id);
 }
 
 static struct pernet_operations vlan_net_ops = {
        .init = vlan_init_net,
-       .exit = vlan_exit_net,
+       .exit_batch = vlan_exit_net,
        .id   = &vlan_net_id,
        .size = sizeof(struct tc_action_net),
 };