Commit 685ecfb1 authored by Kirill Tkhai's avatar Kirill Tkhai Committed by David S. Miller

net: Convert tc_action_net_init() and tc_action_net_exit() based pernet_operations

These pernet_operations are from net/sched directory, and they call only
tc_action_net_init() and tc_action_net_exit():

bpf_net_ops
connmark_net_ops
csum_net_ops
gact_net_ops
ife_net_ops
ipt_net_ops
xt_net_ops
mirred_net_ops
nat_net_ops
pedit_net_ops
police_net_ops
sample_net_ops
simp_net_ops
skbedit_net_ops
skbmod_net_ops
tunnel_key_net_ops
vlan_net_ops

1)tc_action_net_init() just allocates and initializes per-net memory.
2)There should not be in-flight packets at the time of tc_action_net_exit()
call, or another pernet_operations send packets to dying net (except
netlink). So, it seems they can be marked as async.
Signed-off-by: default avatarKirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5fcc8584
...@@ -413,6 +413,7 @@ static struct pernet_operations bpf_net_ops = { ...@@ -413,6 +413,7 @@ static struct pernet_operations bpf_net_ops = {
.exit_batch = bpf_exit_net, .exit_batch = bpf_exit_net,
.id = &bpf_net_id, .id = &bpf_net_id,
.size = sizeof(struct tc_action_net), .size = sizeof(struct tc_action_net),
.async = true,
}; };
static int __init bpf_init_module(void) static int __init bpf_init_module(void)
......
...@@ -222,6 +222,7 @@ static struct pernet_operations connmark_net_ops = { ...@@ -222,6 +222,7 @@ static struct pernet_operations connmark_net_ops = {
.exit_batch = connmark_exit_net, .exit_batch = connmark_exit_net,
.id = &connmark_net_id, .id = &connmark_net_id,
.size = sizeof(struct tc_action_net), .size = sizeof(struct tc_action_net),
.async = true,
}; };
static int __init connmark_init_module(void) static int __init connmark_init_module(void)
......
...@@ -677,6 +677,7 @@ static struct pernet_operations csum_net_ops = { ...@@ -677,6 +677,7 @@ static struct pernet_operations csum_net_ops = {
.exit_batch = csum_exit_net, .exit_batch = csum_exit_net,
.id = &csum_net_id, .id = &csum_net_id,
.size = sizeof(struct tc_action_net), .size = sizeof(struct tc_action_net),
.async = true,
}; };
MODULE_DESCRIPTION("Checksum updating actions"); MODULE_DESCRIPTION("Checksum updating actions");
......
...@@ -247,6 +247,7 @@ static struct pernet_operations gact_net_ops = { ...@@ -247,6 +247,7 @@ static struct pernet_operations gact_net_ops = {
.exit_batch = gact_exit_net, .exit_batch = gact_exit_net,
.id = &gact_net_id, .id = &gact_net_id,
.size = sizeof(struct tc_action_net), .size = sizeof(struct tc_action_net),
.async = true,
}; };
MODULE_AUTHOR("Jamal Hadi Salim(2002-4)"); MODULE_AUTHOR("Jamal Hadi Salim(2002-4)");
......
...@@ -870,6 +870,7 @@ static struct pernet_operations ife_net_ops = { ...@@ -870,6 +870,7 @@ static struct pernet_operations ife_net_ops = {
.exit_batch = ife_exit_net, .exit_batch = ife_exit_net,
.id = &ife_net_id, .id = &ife_net_id,
.size = sizeof(struct tc_action_net), .size = sizeof(struct tc_action_net),
.async = true,
}; };
static int __init ife_init_module(void) static int __init ife_init_module(void)
......
...@@ -349,6 +349,7 @@ static struct pernet_operations ipt_net_ops = { ...@@ -349,6 +349,7 @@ static struct pernet_operations ipt_net_ops = {
.exit_batch = ipt_exit_net, .exit_batch = ipt_exit_net,
.id = &ipt_net_id, .id = &ipt_net_id,
.size = sizeof(struct tc_action_net), .size = sizeof(struct tc_action_net),
.async = true,
}; };
static int tcf_xt_walker(struct net *net, struct sk_buff *skb, static int tcf_xt_walker(struct net *net, struct sk_buff *skb,
...@@ -399,6 +400,7 @@ static struct pernet_operations xt_net_ops = { ...@@ -399,6 +400,7 @@ static struct pernet_operations xt_net_ops = {
.exit_batch = xt_exit_net, .exit_batch = xt_exit_net,
.id = &xt_net_id, .id = &xt_net_id,
.size = sizeof(struct tc_action_net), .size = sizeof(struct tc_action_net),
.async = true,
}; };
MODULE_AUTHOR("Jamal Hadi Salim(2002-13)"); MODULE_AUTHOR("Jamal Hadi Salim(2002-13)");
......
...@@ -353,6 +353,7 @@ static struct pernet_operations mirred_net_ops = { ...@@ -353,6 +353,7 @@ static struct pernet_operations mirred_net_ops = {
.exit_batch = mirred_exit_net, .exit_batch = mirred_exit_net,
.id = &mirred_net_id, .id = &mirred_net_id,
.size = sizeof(struct tc_action_net), .size = sizeof(struct tc_action_net),
.async = true,
}; };
MODULE_AUTHOR("Jamal Hadi Salim(2002)"); MODULE_AUTHOR("Jamal Hadi Salim(2002)");
......
...@@ -323,6 +323,7 @@ static struct pernet_operations nat_net_ops = { ...@@ -323,6 +323,7 @@ static struct pernet_operations nat_net_ops = {
.exit_batch = nat_exit_net, .exit_batch = nat_exit_net,
.id = &nat_net_id, .id = &nat_net_id,
.size = sizeof(struct tc_action_net), .size = sizeof(struct tc_action_net),
.async = true,
}; };
MODULE_DESCRIPTION("Stateless NAT actions"); MODULE_DESCRIPTION("Stateless NAT actions");
......
...@@ -465,6 +465,7 @@ static struct pernet_operations pedit_net_ops = { ...@@ -465,6 +465,7 @@ static struct pernet_operations pedit_net_ops = {
.exit_batch = pedit_exit_net, .exit_batch = pedit_exit_net,
.id = &pedit_net_id, .id = &pedit_net_id,
.size = sizeof(struct tc_action_net), .size = sizeof(struct tc_action_net),
.async = true,
}; };
MODULE_AUTHOR("Jamal Hadi Salim(2002-4)"); MODULE_AUTHOR("Jamal Hadi Salim(2002-4)");
......
...@@ -347,6 +347,7 @@ static struct pernet_operations police_net_ops = { ...@@ -347,6 +347,7 @@ static struct pernet_operations police_net_ops = {
.exit_batch = police_exit_net, .exit_batch = police_exit_net,
.id = &police_net_id, .id = &police_net_id,
.size = sizeof(struct tc_action_net), .size = sizeof(struct tc_action_net),
.async = true,
}; };
static int __init police_init_module(void) static int __init police_init_module(void)
......
...@@ -248,6 +248,7 @@ static struct pernet_operations sample_net_ops = { ...@@ -248,6 +248,7 @@ static struct pernet_operations sample_net_ops = {
.exit_batch = sample_exit_net, .exit_batch = sample_exit_net,
.id = &sample_net_id, .id = &sample_net_id,
.size = sizeof(struct tc_action_net), .size = sizeof(struct tc_action_net),
.async = true,
}; };
static int __init sample_init_module(void) static int __init sample_init_module(void)
......
...@@ -216,6 +216,7 @@ static struct pernet_operations simp_net_ops = { ...@@ -216,6 +216,7 @@ static struct pernet_operations simp_net_ops = {
.exit_batch = simp_exit_net, .exit_batch = simp_exit_net,
.id = &simp_net_id, .id = &simp_net_id,
.size = sizeof(struct tc_action_net), .size = sizeof(struct tc_action_net),
.async = true,
}; };
MODULE_AUTHOR("Jamal Hadi Salim(2005)"); MODULE_AUTHOR("Jamal Hadi Salim(2005)");
......
...@@ -253,6 +253,7 @@ static struct pernet_operations skbedit_net_ops = { ...@@ -253,6 +253,7 @@ static struct pernet_operations skbedit_net_ops = {
.exit_batch = skbedit_exit_net, .exit_batch = skbedit_exit_net,
.id = &skbedit_net_id, .id = &skbedit_net_id,
.size = sizeof(struct tc_action_net), .size = sizeof(struct tc_action_net),
.async = true,
}; };
MODULE_AUTHOR("Alexander Duyck, <alexander.h.duyck@intel.com>"); MODULE_AUTHOR("Alexander Duyck, <alexander.h.duyck@intel.com>");
......
...@@ -278,6 +278,7 @@ static struct pernet_operations skbmod_net_ops = { ...@@ -278,6 +278,7 @@ static struct pernet_operations skbmod_net_ops = {
.exit_batch = skbmod_exit_net, .exit_batch = skbmod_exit_net,
.id = &skbmod_net_id, .id = &skbmod_net_id,
.size = sizeof(struct tc_action_net), .size = sizeof(struct tc_action_net),
.async = true,
}; };
MODULE_AUTHOR("Jamal Hadi Salim, <jhs@mojatatu.com>"); MODULE_AUTHOR("Jamal Hadi Salim, <jhs@mojatatu.com>");
......
...@@ -337,6 +337,7 @@ static struct pernet_operations tunnel_key_net_ops = { ...@@ -337,6 +337,7 @@ static struct pernet_operations tunnel_key_net_ops = {
.exit_batch = tunnel_key_exit_net, .exit_batch = tunnel_key_exit_net,
.id = &tunnel_key_net_id, .id = &tunnel_key_net_id,
.size = sizeof(struct tc_action_net), .size = sizeof(struct tc_action_net),
.async = true,
}; };
static int __init tunnel_key_init_module(void) static int __init tunnel_key_init_module(void)
......
...@@ -313,6 +313,7 @@ static struct pernet_operations vlan_net_ops = { ...@@ -313,6 +313,7 @@ static struct pernet_operations vlan_net_ops = {
.exit_batch = vlan_exit_net, .exit_batch = vlan_exit_net,
.id = &vlan_net_id, .id = &vlan_net_id,
.size = sizeof(struct tc_action_net), .size = sizeof(struct tc_action_net),
.async = true,
}; };
static int __init vlan_init_module(void) static int __init vlan_init_module(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment