iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: fib_notifier: move fib_notifier_ops from struct net into per-net struct

Browse Source 
No need for fib_notifier_ops to be in struct net. It is used only by
fib_notifier as a private data. Use net_generic to introduce per-net
fib_notifier struct and move fib_notifier_ops there.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2019-09-05 20:06:56 +02:00 committed by David S. Miller
parent 9b789f476e
commit 3dd97a0827
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/net_namespace.h
View File

@ -103,9 +103,6 @@ struct net {
/* core fib_rules */ /* core fib_rules */
struct list_head rules_ops; struct list_head rules_ops;
struct list_head fib_notifier_ops; /* Populated by
* register_pernet_subsys()
*/
struct net_device *loopback_dev; /* The loopback */ struct net_device *loopback_dev; /* The loopback */
struct netns_core core; struct netns_core core;
struct netns_mib mib; struct netns_mib mib;

29
net/core/fib_notifier.c
View File

@ -5,8 +5,15 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <net/net_namespace.h> #include <net/net_namespace.h>
#include <net/netns/generic.h>
#include <net/fib_notifier.h> #include <net/fib_notifier.h>
static unsigned int fib_notifier_net_id;
struct fib_notifier_net {
struct list_head fib_notifier_ops;
};
static ATOMIC_NOTIFIER_HEAD(fib_chain); static ATOMIC_NOTIFIER_HEAD(fib_chain);
int call_fib_notifier(struct notifier_block *nb, struct net *net, int call_fib_notifier(struct notifier_block *nb, struct net *net,
@ -34,6 +41,7 @@ EXPORT_SYMBOL(call_fib_notifiers);
static unsigned int fib_seq_sum(void) static unsigned int fib_seq_sum(void)
{ {
struct fib_notifier_net *fn_net;
struct fib_notifier_ops *ops; struct fib_notifier_ops *ops;
unsigned int fib_seq = 0; unsigned int fib_seq = 0;
struct net *net; struct net *net;
@ -41,8 +49,9 @@ static unsigned int fib_seq_sum(void)
rtnl_lock(); rtnl_lock();
down_read(&net_rwsem); down_read(&net_rwsem);
for_each_net(net) { for_each_net(net) {
fn_net = net_generic(net, fib_notifier_net_id);
rcu_read_lock(); rcu_read_lock();
list_for_each_entry_rcu(ops, &net->fib_notifier_ops, list) { list_for_each_entry_rcu(ops, &fn_net->fib_notifier_ops, list) {
if (!try_module_get(ops->owner)) if (!try_module_get(ops->owner))
continue; continue;
fib_seq += ops->fib_seq_read(net); fib_seq += ops->fib_seq_read(net);
@ -58,9 +67,10 @@ static unsigned int fib_seq_sum(void)
static int fib_net_dump(struct net *net, struct notifier_block *nb) static int fib_net_dump(struct net *net, struct notifier_block *nb)
{ {
struct fib_notifier_net *fn_net = net_generic(net, fib_notifier_net_id);
struct fib_notifier_ops *ops; struct fib_notifier_ops *ops;
list_for_each_entry_rcu(ops, &net->fib_notifier_ops, list) { list_for_each_entry_rcu(ops, &fn_net->fib_notifier_ops, list) {
int err; int err;
if (!try_module_get(ops->owner)) if (!try_module_get(ops->owner))
@ -127,12 +137,13 @@ EXPORT_SYMBOL(unregister_fib_notifier);
static int __fib_notifier_ops_register(struct fib_notifier_ops *ops, static int __fib_notifier_ops_register(struct fib_notifier_ops *ops,
struct net *net) struct net *net)
{ {
struct fib_notifier_net *fn_net = net_generic(net, fib_notifier_net_id);
struct fib_notifier_ops *o; struct fib_notifier_ops *o;
list_for_each_entry(o, &net->fib_notifier_ops, list) list_for_each_entry(o, &fn_net->fib_notifier_ops, list)
if (ops->family == o->family) if (ops->family == o->family)
return -EEXIST; return -EEXIST;
list_add_tail_rcu(&ops->list, &net->fib_notifier_ops); list_add_tail_rcu(&ops->list, &fn_net->fib_notifier_ops);
return 0; return 0;
} }
@ -167,18 +178,24 @@ EXPORT_SYMBOL(fib_notifier_ops_unregister);
static int __net_init fib_notifier_net_init(struct net *net) static int __net_init fib_notifier_net_init(struct net *net)
{ {
INIT_LIST_HEAD(&net->fib_notifier_ops); struct fib_notifier_net *fn_net = net_generic(net, fib_notifier_net_id);
INIT_LIST_HEAD(&fn_net->fib_notifier_ops);
return 0; return 0;
} }
static void __net_exit fib_notifier_net_exit(struct net *net) static void __net_exit fib_notifier_net_exit(struct net *net)
{ {
WARN_ON_ONCE(!list_empty(&net->fib_notifier_ops)); struct fib_notifier_net *fn_net = net_generic(net, fib_notifier_net_id);
WARN_ON_ONCE(!list_empty(&fn_net->fib_notifier_ops));
} }
static struct pernet_operations fib_notifier_net_ops = { static struct pernet_operations fib_notifier_net_ops = {
.init = fib_notifier_net_init, .init = fib_notifier_net_init,
.exit = fib_notifier_net_exit, .exit = fib_notifier_net_exit,
.id = &fib_notifier_net_id,
.size = sizeof(struct fib_notifier_net),
}; };
static int __init fib_notifier_init(void) static int __init fib_notifier_init(void)