Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 172036
b: refs/heads/master
c: f875bae
h: refs/heads/master
v: v3
  • Loading branch information
Eric W. Biederman authored and David S. Miller committed Dec 2, 2009
1 parent 871c678 commit cce443b
Show file tree
Hide file tree
Showing 3 changed files with 127 additions and 91 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2b035b39970740722598f7a9d548835f9bdd730f
refs/heads/master: f875bae065334907796da12523f9df85c89f5712
28 changes: 24 additions & 4 deletions trunk/include/net/net_namespace.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,8 @@ struct pernet_operations {
struct list_head list;
int (*init)(struct net *net);
void (*exit)(struct net *net);
int *id;
size_t size;
};

/*
Expand All @@ -259,12 +261,30 @@ struct pernet_operations {
*/
extern int register_pernet_subsys(struct pernet_operations *);
extern void unregister_pernet_subsys(struct pernet_operations *);
extern int register_pernet_gen_subsys(int *id, struct pernet_operations *);
extern void unregister_pernet_gen_subsys(int id, struct pernet_operations *);
extern int register_pernet_device(struct pernet_operations *);
extern void unregister_pernet_device(struct pernet_operations *);
extern int register_pernet_gen_device(int *id, struct pernet_operations *);
extern void unregister_pernet_gen_device(int id, struct pernet_operations *);

static inline int register_pernet_gen_subsys(int *id, struct pernet_operations *ops)
{
ops->id = id;
return register_pernet_subsys(ops);
}

static inline void unregister_pernet_gen_subsys(int id, struct pernet_operations *ops)
{
return unregister_pernet_subsys(ops);
}

static inline int register_pernet_gen_device(int *id, struct pernet_operations *ops)
{
ops->id = id;
return register_pernet_device(ops);
}

static inline void unregister_pernet_gen_device(int id, struct pernet_operations *ops)
{
return unregister_pernet_device(ops);
}

struct ctl_path;
struct ctl_table;
Expand Down
188 changes: 102 additions & 86 deletions trunk/net/core/net_namespace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,40 @@ static void unregister_netdevices(struct net *net, struct list_head *list)
}
}

static int ops_init(const struct pernet_operations *ops, struct net *net)
{
int err;
if (ops->id && ops->size) {
void *data = kzalloc(ops->size, GFP_KERNEL);
if (!data)
return -ENOMEM;

err = net_assign_generic(net, *ops->id, data);
if (err) {
kfree(data);
return err;
}
}
if (ops->init)
return ops->init(net);
return 0;
}

static void ops_free(const struct pernet_operations *ops, struct net *net)
{
if (ops->id && ops->size) {
int id = *ops->id;
kfree(net_generic(net, id));
}
}

/*
* setup_net runs the initializers for the network namespace object.
*/
static __net_init int setup_net(struct net *net)
{
/* Must be called with net_mutex held */
struct pernet_operations *ops;
const struct pernet_operations *ops, *saved_ops;
int error = 0;

atomic_set(&net->count, 1);
Expand All @@ -59,11 +86,9 @@ static __net_init int setup_net(struct net *net)
#endif

list_for_each_entry(ops, &pernet_list, list) {
if (ops->init) {
error = ops->init(net);
if (error < 0)
goto out_undo;
}
error = ops_init(ops, net);
if (error < 0)
goto out_undo;
}
out:
return error;
Expand All @@ -72,6 +97,7 @@ static __net_init int setup_net(struct net *net)
/* Walk through the list backwards calling the exit functions
* for the pernet modules whose init functions did not fail.
*/
saved_ops = ops;
list_for_each_entry_continue_reverse(ops, &pernet_list, list) {
if (ops->exit)
ops->exit(net);
Expand All @@ -83,6 +109,9 @@ static __net_init int setup_net(struct net *net)
rtnl_unlock();
}
}
ops = saved_ops;
list_for_each_entry_continue_reverse(ops, &pernet_list, list)
ops_free(ops, net);

rcu_barrier();
goto out;
Expand Down Expand Up @@ -175,7 +204,7 @@ static LIST_HEAD(cleanup_list); /* Must hold cleanup_list_lock to touch */

static void cleanup_net(struct work_struct *work)
{
struct pernet_operations *ops;
const struct pernet_operations *ops;
struct net *net, *tmp;
LIST_HEAD(net_kill_list);

Expand Down Expand Up @@ -214,6 +243,13 @@ static void cleanup_net(struct work_struct *work)
rtnl_unlock();
}
}
/* Free the net generic variables */
list_for_each_entry_reverse(ops, &pernet_list, list) {
if (ops->size && ops->id) {
list_for_each_entry(net, &net_kill_list, cleanup_list)
ops_free(ops, net);
}
}

mutex_unlock(&net_mutex);

Expand Down Expand Up @@ -309,16 +345,16 @@ static int __init net_ns_init(void)
pure_initcall(net_ns_init);

#ifdef CONFIG_NET_NS
static int register_pernet_operations(struct list_head *list,
struct pernet_operations *ops)
static int __register_pernet_operations(struct list_head *list,
struct pernet_operations *ops)
{
struct net *net, *undo_net;
int error;

list_add_tail(&ops->list, list);
if (ops->init) {
if (ops->init || (ops->id && ops->size)) {
for_each_net(net) {
error = ops->init(net);
error = ops_init(ops, net);
if (error)
goto out_undo;
}
Expand All @@ -336,38 +372,85 @@ static int register_pernet_operations(struct list_head *list,
}
}
undone:
if (ops->size && ops->id) {
for_each_net(undo_net) {
if (net_eq(undo_net, net))
goto freed;
ops_free(ops, undo_net);
}
}
freed:
return error;
}

static void unregister_pernet_operations(struct pernet_operations *ops)
static void __unregister_pernet_operations(struct pernet_operations *ops)
{
struct net *net;

list_del(&ops->list);
if (ops->exit)
for_each_net(net)
ops->exit(net);
if (ops->id && ops->size)
for_each_net(net)
ops_free(ops, net);
}

#else

static int register_pernet_operations(struct list_head *list,
struct pernet_operations *ops)
static int __register_pernet_operations(struct list_head *list,
struct pernet_operations *ops)
{
if (ops->init == NULL)
return 0;
return ops->init(&init_net);
int err = 0;
err = ops_init(ops, &init_net);
if (err)
ops_free(ops, &init_net);
return err;

}

static void unregister_pernet_operations(struct pernet_operations *ops)
static void __unregister_pernet_operations(struct pernet_operations *ops)
{
if (ops->exit)
ops->exit(&init_net);
ops_free(ops, &init_net);
}
#endif

#endif /* CONFIG_NET_NS */

static DEFINE_IDA(net_generic_ids);

static int register_pernet_operations(struct list_head *list,
struct pernet_operations *ops)
{
int error;

if (ops->id) {
again:
error = ida_get_new_above(&net_generic_ids, 1, ops->id);
if (error < 0) {
if (error == -EAGAIN) {
ida_pre_get(&net_generic_ids, GFP_KERNEL);
goto again;
}
return error;
}
}
error = __register_pernet_operations(list, ops);
if (error && ops->id)
ida_remove(&net_generic_ids, *ops->id);

return error;
}

static void unregister_pernet_operations(struct pernet_operations *ops)
{

__unregister_pernet_operations(ops);
if (ops->id)
ida_remove(&net_generic_ids, *ops->id);
}

/**
* register_pernet_subsys - register a network namespace subsystem
* @ops: pernet operations structure for the subsystem
Expand Down Expand Up @@ -414,38 +497,6 @@ void unregister_pernet_subsys(struct pernet_operations *module)
}
EXPORT_SYMBOL_GPL(unregister_pernet_subsys);

int register_pernet_gen_subsys(int *id, struct pernet_operations *ops)
{
int rv;

mutex_lock(&net_mutex);
again:
rv = ida_get_new_above(&net_generic_ids, 1, id);
if (rv < 0) {
if (rv == -EAGAIN) {
ida_pre_get(&net_generic_ids, GFP_KERNEL);
goto again;
}
goto out;
}
rv = register_pernet_operations(first_device, ops);
if (rv < 0)
ida_remove(&net_generic_ids, *id);
out:
mutex_unlock(&net_mutex);
return rv;
}
EXPORT_SYMBOL_GPL(register_pernet_gen_subsys);

void unregister_pernet_gen_subsys(int id, struct pernet_operations *ops)
{
mutex_lock(&net_mutex);
unregister_pernet_operations(ops);
ida_remove(&net_generic_ids, id);
mutex_unlock(&net_mutex);
}
EXPORT_SYMBOL_GPL(unregister_pernet_gen_subsys);

/**
* register_pernet_device - register a network namespace device
* @ops: pernet operations structure for the subsystem
Expand Down Expand Up @@ -477,30 +528,6 @@ int register_pernet_device(struct pernet_operations *ops)
}
EXPORT_SYMBOL_GPL(register_pernet_device);

int register_pernet_gen_device(int *id, struct pernet_operations *ops)
{
int error;
mutex_lock(&net_mutex);
again:
error = ida_get_new_above(&net_generic_ids, 1, id);
if (error) {
if (error == -EAGAIN) {
ida_pre_get(&net_generic_ids, GFP_KERNEL);
goto again;
}
goto out;
}
error = register_pernet_operations(&pernet_list, ops);
if (error)
ida_remove(&net_generic_ids, *id);
else if (first_device == &pernet_list)
first_device = &ops->list;
out:
mutex_unlock(&net_mutex);
return error;
}
EXPORT_SYMBOL_GPL(register_pernet_gen_device);

/**
* unregister_pernet_device - unregister a network namespace netdevice
* @ops: pernet operations structure to manipulate
Expand All @@ -520,17 +547,6 @@ void unregister_pernet_device(struct pernet_operations *ops)
}
EXPORT_SYMBOL_GPL(unregister_pernet_device);

void unregister_pernet_gen_device(int id, struct pernet_operations *ops)
{
mutex_lock(&net_mutex);
if (&ops->list == first_device)
first_device = first_device->next;
unregister_pernet_operations(ops);
ida_remove(&net_generic_ids, id);
mutex_unlock(&net_mutex);
}
EXPORT_SYMBOL_GPL(unregister_pernet_gen_device);

static void net_generic_release(struct rcu_head *rcu)
{
struct net_generic *ng;
Expand Down

0 comments on commit cce443b

Please sign in to comment.