UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: net_families __rcu annotations 

Use modern RCU API / annotations for net_families array.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2010-11-10 10:50:44 +00:00 committed by David S. Miller
parent e85eb11782
commit 190683a9d5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/socket.c
View File

@ -156,7 +156,7 @@ static const struct file_operations socket_file_ops = {
*/ */
static DEFINE_SPINLOCK(net_family_lock); static DEFINE_SPINLOCK(net_family_lock);
static const struct net_proto_family *net_families[NPROTO] __read_mostly; static const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
/* /*
* Statistics counters of the socket lists * Statistics counters of the socket lists
@ -1200,7 +1200,7 @@ int __sock_create(struct net *net, int family, int type, int protocol,
* requested real, full-featured networking support upon configuration. * requested real, full-featured networking support upon configuration.
* Otherwise module support will break! * Otherwise module support will break!
*/ */
if (net_families[family] == NULL) if (rcu_access_pointer(net_families[family]) == NULL)
request_module("net-pf-%d", family); request_module("net-pf-%d", family);
#endif #endif
@ -2332,10 +2332,11 @@ int sock_register(const struct net_proto_family *ops)
} }
spin_lock(&net_family_lock); spin_lock(&net_family_lock);
if (net_families[ops->family]) if (rcu_dereference_protected(net_families[ops->family],
lockdep_is_held(&net_family_lock)))
err = -EEXIST; err = -EEXIST;
else { else {
net_families[ops->family] = ops; rcu_assign_pointer(net_families[ops->family], ops);
err = 0; err = 0;
} }
spin_unlock(&net_family_lock); spin_unlock(&net_family_lock);
@ -2363,7 +2364,7 @@ void sock_unregister(int family)
BUG_ON(family < 0 || family >= NPROTO); BUG_ON(family < 0 || family >= NPROTO);
spin_lock(&net_family_lock); spin_lock(&net_family_lock);
net_families[family] = NULL; rcu_assign_pointer(net_families[family], NULL);
spin_unlock(&net_family_lock); spin_unlock(&net_family_lock);
synchronize_rcu(); synchronize_rcu();