net: Allow fib_rule_unregister to batch
Refactor the code so fib_rules_register always takes a template instead of the actual fib_rules_ops structure that will be used. This is required for network namespace support so 2 out of the 3 callers already do this, it allows the error handling to be made common, and it allows fib_rules_unregister to free the template for hte caller. Modify fib_rules_unregister to use call_rcu instead of syncrhonize_rcu to allw multiple namespaces to be cleaned up in the same rcu grace period. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

gecommit door
David S. Miller

bovenliggende
3a765edadb
commit
e9c5158ac2
@@ -301,13 +301,9 @@ int __net_init fib4_rules_init(struct net *net)
|
||||
int err;
|
||||
struct fib_rules_ops *ops;
|
||||
|
||||
ops = kmemdup(&fib4_rules_ops_template, sizeof(*ops), GFP_KERNEL);
|
||||
if (ops == NULL)
|
||||
return -ENOMEM;
|
||||
INIT_LIST_HEAD(&ops->rules_list);
|
||||
ops->fro_net = net;
|
||||
|
||||
fib_rules_register(ops);
|
||||
ops = fib_rules_register(&fib4_rules_ops_template, net);
|
||||
if (IS_ERR(ops))
|
||||
return PTR_ERR(ops);
|
||||
|
||||
err = fib_default_rules_init(ops);
|
||||
if (err < 0)
|
||||
@@ -318,12 +314,10 @@ int __net_init fib4_rules_init(struct net *net)
|
||||
fail:
|
||||
/* also cleans all rules already added */
|
||||
fib_rules_unregister(ops);
|
||||
kfree(ops);
|
||||
return err;
|
||||
}
|
||||
|
||||
void __net_exit fib4_rules_exit(struct net *net)
|
||||
{
|
||||
fib_rules_unregister(net->ipv4.rules_ops);
|
||||
kfree(net->ipv4.rules_ops);
|
||||
}
|
||||
|
Verwijs in nieuw issue
Block a user