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

Commit 086c653f authored by Craig Gallek's avatar Craig Gallek Committed by David S. Miller
Browse files

sock: struct proto hash function may error 



In order to support fast reuseport lookups in TCP, the hash function
defined in struct proto must be capable of returning an error code.
This patch changes the function signature of all related hash functions
to return an integer and handles or propagates this return value at
all call sites.

Signed-off-by: default avatarCraig Gallek <kraig@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 30c1de08

include/net/inet_hashtables.h

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ void inet_hashinfo_init(struct inet_hashinfo *h); 
bool inet_ehash_insert(struct sock *sk, struct sock *osk);

bool inet_ehash_nolisten(struct sock *sk, struct sock *osk);

void __inet_hash(struct sock *sk, struct sock *osk);

void inet_hash(struct sock *sk);

int inet_hash(struct sock *sk);

void inet_unhash(struct sock *sk);



struct sock *__inet_lookup_listener(struct net *net,

include/net/phonet/phonet.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ void pn_sock_init(void); 
struct sock *pn_find_sock_by_sa(struct net *net, const struct sockaddr_pn *sa);

void pn_deliver_sock_broadcast(struct net *net, struct sk_buff *skb);

void phonet_get_local_port_range(int *min, int *max);

void pn_sock_hash(struct sock *sk);

int pn_sock_hash(struct sock *sk);

void pn_sock_unhash(struct sock *sk);

int pn_sock_get_port(struct sock *sk, unsigned short sport);

include/net/ping.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ struct pingfakehdr { 
};



int  ping_get_port(struct sock *sk, unsigned short ident);

void ping_hash(struct sock *sk);

int ping_hash(struct sock *sk);

void ping_unhash(struct sock *sk);



int  ping_init_sock(struct sock *sk);

include/net/raw.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ int raw_seq_open(struct inode *ino, struct file *file, 


#endif



void raw_hash_sk(struct sock *sk);

int raw_hash_sk(struct sock *sk);

void raw_unhash_sk(struct sock *sk);



struct raw_sock {

include/net/sock.h

+3 −3
Original line number Diff line number Diff line
@@ -984,7 +984,7 @@ struct proto { 
	void		(*release_cb)(struct sock *sk);



	/* Keeping track of sk's, looking them up, and port selection methods. */

	void			(*hash)(struct sock *sk);

	int			(*hash)(struct sock *sk);

	void			(*unhash)(struct sock *sk);

	void			(*rehash)(struct sock *sk);

	int			(*get_port)(struct sock *sk, unsigned short snum);
@@ -1194,10 +1194,10 @@ static inline void sock_prot_inuse_add(struct net *net, struct proto *prot, 
/* With per-bucket locks this operation is not-atomic, so that

 * this version is not worse.

 */

static inline void __sk_prot_rehash(struct sock *sk)

static inline int __sk_prot_rehash(struct sock *sk)

{

	sk->sk_prot->unhash(sk);

	sk->sk_prot->hash(sk);

	return sk->sk_prot->hash(sk);

}



void sk_prot_clear_portaddr_nulls(struct sock *sk, int size);