lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: add __rcu annotations to protocol

Browse Source 
Add __rcu annotations to :
        struct net_protocol *inet_protos
        struct net_protocol *inet6_protos

And use appropriate casts to reduce sparse warnings if
CONFIG_SPARSE_RCU_POINTER=y

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-10-25 21:02:28 +00:00
committed by David S. Miller
parent 1c31720a74
commit e0ad61ec86
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/protocol.h
View File

@@ -89,10 +89,10 @@ struct inet_protosw {
#define INET_PROTOSW_PERMANENT 0x02 /* Permanent protocols are unremovable. */ #define INET_PROTOSW_PERMANENT 0x02 /* Permanent protocols are unremovable. */
#define INET_PROTOSW_ICSK 0x04 /* Is this an inet_connection_sock? */ #define INET_PROTOSW_ICSK 0x04 /* Is this an inet_connection_sock? */
extern const struct net_protocol *inet_protos[MAX_INET_PROTOS]; extern const struct net_protocol __rcu *inet_protos[MAX_INET_PROTOS];
#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
extern const struct inet6_protocol *inet6_protos[MAX_INET_PROTOS]; extern const struct inet6_protocol __rcu *inet6_protos[MAX_INET_PROTOS];
#endif #endif
extern int inet_add_protocol(const struct net_protocol *prot, unsigned char num); extern int inet_add_protocol(const struct net_protocol *prot, unsigned char num);

8
net/ipv4/protocol.c
View File

@@ -28,7 +28,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <net/protocol.h> #include <net/protocol.h>
const struct net_protocol *inet_protos[MAX_INET_PROTOS] __read_mostly; const struct net_protocol __rcu *inet_protos[MAX_INET_PROTOS] __read_mostly;
/* /*
* Add a protocol handler to the hash tables * Add a protocol handler to the hash tables
@@ -38,7 +38,8 @@ int inet_add_protocol(const struct net_protocol *prot, unsigned char protocol)
{ {
int hash = protocol & (MAX_INET_PROTOS - 1); int hash = protocol & (MAX_INET_PROTOS - 1);
return !cmpxchg(&inet_protos[hash], NULL, prot) ? 0 : -1; return !cmpxchg((const struct net_protocol **)&inet_protos[hash],
NULL, prot) ? 0 : -1;
} }
EXPORT_SYMBOL(inet_add_protocol); EXPORT_SYMBOL(inet_add_protocol);
@@ -50,7 +51,8 @@ int inet_del_protocol(const struct net_protocol *prot, unsigned char protocol)
{ {
int ret, hash = protocol & (MAX_INET_PROTOS - 1); int ret, hash = protocol & (MAX_INET_PROTOS - 1);
ret = (cmpxchg(&inet_protos[hash], prot, NULL) == prot) ? 0 : -1; ret = (cmpxchg((const struct net_protocol **)&inet_protos[hash],
prot, NULL) == prot) ? 0 : -1;
synchronize_net(); synchronize_net();

8
net/ipv6/protocol.c
View File

@@ -25,13 +25,14 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <net/protocol.h> #include <net/protocol.h>
const struct inet6_protocol *inet6_protos[MAX_INET_PROTOS] __read_mostly; const struct inet6_protocol __rcu *inet6_protos[MAX_INET_PROTOS] __read_mostly;
int inet6_add_protocol(const struct inet6_protocol *prot, unsigned char protocol) int inet6_add_protocol(const struct inet6_protocol *prot, unsigned char protocol)
{ {
int hash = protocol & (MAX_INET_PROTOS - 1); int hash = protocol & (MAX_INET_PROTOS - 1);
return !cmpxchg(&inet6_protos[hash], NULL, prot) ? 0 : -1; return !cmpxchg((const struct inet6_protocol **)&inet6_protos[hash],
NULL, prot) ? 0 : -1;
} }
EXPORT_SYMBOL(inet6_add_protocol); EXPORT_SYMBOL(inet6_add_protocol);
@@ -43,7 +44,8 @@ int inet6_del_protocol(const struct inet6_protocol *prot, unsigned char protocol
{ {
int ret, hash = protocol & (MAX_INET_PROTOS - 1); int ret, hash = protocol & (MAX_INET_PROTOS - 1);
ret = (cmpxchg(&inet6_protos[hash], prot, NULL) == prot) ? 0 : -1; ret = (cmpxchg((const struct inet6_protocol **)&inet6_protos[hash],
prot, NULL) == prot) ? 0 : -1;
synchronize_net(); synchronize_net();