diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-04-15 03:36:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-04-15 03:36:08 -0400 |
commit | dec827d174d7f76c457238800183ca864a639365 (patch) | |
tree | ca7c04e35eda9956afef94678a2a863c3e75e2ed /include/net | |
parent | c93cf61fd1d5378134f9b06703f7078067542e00 (diff) |
[NETNS]: The generic per-net pointers.
Add the elastic array of void * pointer to the struct net.
The access rules are simple:
1. register the ops with register_pernet_gen_device to get
the id of your private pointer
2. call net_assign_generic() to put the private data on the
struct net (most preferably this should be done in the
->init callback of the ops registered)
3. do not store any private reference on the net_generic array;
4. do not change this pointer while the net is alive;
5. use the net_generic() to get the pointer.
When adding a new pointer, I copy the old array, replace it
with a new one and schedule the old for kfree after an RCU
grace period.
Since the net_generic explores the net->gen array inside rcu
read section and once set the net->gen->ptr[x] pointer never
changes, this grants us a safe access to generic pointers.
Quoting Paul: "... RCU is protecting -only- the net_generic
structure that net_generic() is traversing, and the [pointer]
returned by net_generic() is protected by a reference counter
in the upper-level struct net."
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/net_namespace.h | 2 | ||||
-rw-r--r-- | include/net/netns/generic.h | 49 |
2 files changed, 51 insertions, 0 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 72fad1a0956b..f880b0f9f107 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
@@ -20,6 +20,7 @@ struct proc_dir_entry; | |||
20 | struct net_device; | 20 | struct net_device; |
21 | struct sock; | 21 | struct sock; |
22 | struct ctl_table_header; | 22 | struct ctl_table_header; |
23 | struct net_generic; | ||
23 | 24 | ||
24 | struct net { | 25 | struct net { |
25 | atomic_t count; /* To decided when the network | 26 | atomic_t count; /* To decided when the network |
@@ -61,6 +62,7 @@ struct net { | |||
61 | #ifdef CONFIG_NETFILTER | 62 | #ifdef CONFIG_NETFILTER |
62 | struct netns_xt xt; | 63 | struct netns_xt xt; |
63 | #endif | 64 | #endif |
65 | struct net_generic *gen; | ||
64 | }; | 66 | }; |
65 | 67 | ||
66 | 68 | ||
diff --git a/include/net/netns/generic.h b/include/net/netns/generic.h new file mode 100644 index 000000000000..0c04fd2a700b --- /dev/null +++ b/include/net/netns/generic.h | |||
@@ -0,0 +1,49 @@ | |||
1 | /* | ||
2 | * generic net pointers | ||
3 | */ | ||
4 | |||
5 | #ifndef __NET_GENERIC_H__ | ||
6 | #define __NET_GENERIC_H__ | ||
7 | |||
8 | #include <linux/rcupdate.h> | ||
9 | |||
10 | /* | ||
11 | * Generic net pointers are to be used by modules to put some private | ||
12 | * stuff on the struct net without explicit struct net modification | ||
13 | * | ||
14 | * The rules are simple: | ||
15 | * 1. register the ops with register_pernet_gen_device to get the id | ||
16 | * of your private pointer; | ||
17 | * 2. call net_assign_generic() to put the private data on the struct | ||
18 | * net (most preferably this should be done in the ->init callback | ||
19 | * of the ops registered); | ||
20 | * 3. do not change this pointer while the net is alive; | ||
21 | * 4. do not try to have any private reference on the net_generic object. | ||
22 | * | ||
23 | * After accomplishing all of the above, the private pointer can be | ||
24 | * accessed with the net_generic() call. | ||
25 | */ | ||
26 | |||
27 | struct net_generic { | ||
28 | unsigned int len; | ||
29 | struct rcu_head rcu; | ||
30 | |||
31 | void *ptr[0]; | ||
32 | }; | ||
33 | |||
34 | static inline void *net_generic(struct net *net, int id) | ||
35 | { | ||
36 | struct net_generic *ng; | ||
37 | void *ptr; | ||
38 | |||
39 | rcu_read_lock(); | ||
40 | ng = rcu_dereference(net->gen); | ||
41 | BUG_ON(id == 0 || id > ng->len); | ||
42 | ptr = ng->ptr[id - 1]; | ||
43 | rcu_read_unlock(); | ||
44 | |||
45 | return ptr; | ||
46 | } | ||
47 | |||
48 | extern int net_assign_generic(struct net *net, int id, void *data); | ||
49 | #endif | ||