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

Commit 53083773 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[INET]: Uninline the __inet_inherit_port call. 



This deblats ~200 bytes when ipv6 and dccp are 'y'.

Besides, this will ease compilation issues for patches
I'm working on to make inet hash tables more scalable 
wrt net namespaces.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e56d8b8a

include/net/inet_hashtables.h

+1 −13
Original line number Diff line number Diff line
@@ -221,19 +221,7 @@ static inline int inet_sk_listen_hashfn(const struct sock *sk) 
}



/* Caller must disable local BH processing. */

static inline void __inet_inherit_port(struct sock *sk, struct sock *child)

{

	struct inet_hashinfo *table = sk->sk_prot->h.hashinfo;

	const int bhash = inet_bhashfn(inet_sk(child)->num, table->bhash_size);

	struct inet_bind_hashbucket *head = &table->bhash[bhash];

	struct inet_bind_bucket *tb;



	spin_lock(&head->lock);

	tb = inet_csk(sk)->icsk_bind_hash;

	sk_add_bind_node(child, &tb->owners);

	inet_csk(child)->icsk_bind_hash = tb;

	spin_unlock(&head->lock);

}

extern void __inet_inherit_port(struct sock *sk, struct sock *child);



extern void inet_put_port(struct sock *sk);

net/ipv4/inet_hashtables.c

+16 −0
Original line number Diff line number Diff line
@@ -92,6 +92,22 @@ void inet_put_port(struct sock *sk) 


EXPORT_SYMBOL(inet_put_port);



void __inet_inherit_port(struct sock *sk, struct sock *child)

{

	struct inet_hashinfo *table = sk->sk_prot->h.hashinfo;

	const int bhash = inet_bhashfn(inet_sk(child)->num, table->bhash_size);

	struct inet_bind_hashbucket *head = &table->bhash[bhash];

	struct inet_bind_bucket *tb;



	spin_lock(&head->lock);

	tb = inet_csk(sk)->icsk_bind_hash;

	sk_add_bind_node(child, &tb->owners);

	inet_csk(child)->icsk_bind_hash = tb;

	spin_unlock(&head->lock);

}



EXPORT_SYMBOL_GPL(__inet_inherit_port);



/*

 * This lock without WQ_FLAG_EXCLUSIVE is good on UP and it can be very bad on SMP.

 * Look, when several writers sleep and reader wakes them up, all but one