Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0ad61ec authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: add __rcu annotations to protocol 



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: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1c31720a

include/net/protocol.h

+2 −2
Original line number Diff line number Diff line
@@ -89,10 +89,10 @@ struct inet_protosw { 
#define INET_PROTOSW_PERMANENT 0x02  /* Permanent protocols are unremovable. */

#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)

extern const struct inet6_protocol *inet6_protos[MAX_INET_PROTOS];

extern const struct inet6_protocol __rcu *inet6_protos[MAX_INET_PROTOS];

#endif



extern int	inet_add_protocol(const struct net_protocol *prot, unsigned char num);

net/ipv4/protocol.c

+5 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/spinlock.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
@@ -38,7 +38,8 @@ int inet_add_protocol(const struct net_protocol *prot, unsigned char protocol) 
{

	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);
@@ -50,7 +51,8 @@ int inet_del_protocol(const struct net_protocol *prot, unsigned char protocol) 
{

	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();

net/ipv6/protocol.c

+5 −3
Original line number Diff line number Diff line
@@ -25,13 +25,14 @@ 
#include <linux/spinlock.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 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);
@@ -43,7 +44,8 @@ int inet6_del_protocol(const struct inet6_protocol *prot, unsigned char protocol 
{

	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();