Commit b2cb9f9e authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by David S. Miller
Browse files

tcp: Unlink sk from bhash. 



Now we do not use tb->owners and can unlink sockets from bhash.

sk_bind_node/tw_bind_node are available for bhash2 and will be
used in the following patch.

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8002d44f

include/net/inet_hashtables.h

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ struct inet_bind_bucket { 
	unsigned short		fast_sk_family;

	bool			fast_ipv6_only;

	struct hlist_node	node;

	struct hlist_head	owners;

	struct hlist_head	bhash2;

};

net/ipv4/inet_hashtables.c

+0 −3
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ struct inet_bind_bucket *inet_bind_bucket_create(struct kmem_cache *cachep, 
		tb->port      = snum;

		tb->fastreuse = 0;

		tb->fastreuseport = 0;

		INIT_HLIST_HEAD(&tb->owners);

		INIT_HLIST_HEAD(&tb->bhash2);

		hlist_add_head(&tb->node, &head->chain);

	}
@@ -169,7 +168,6 @@ void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb, 
		    struct inet_bind2_bucket *tb2, unsigned short port)

{

	inet_sk(sk)->inet_num = port;

	sk_add_bind_node(sk, &tb->owners);

	inet_csk(sk)->icsk_bind_hash = tb;

	sk_add_bind2_node(sk, &tb2->owners);

	inet_csk(sk)->icsk_bind2_hash = tb2;
@@ -192,7 +190,6 @@ static void __inet_put_port(struct sock *sk) 


	spin_lock(&head->lock);

	tb = inet_csk(sk)->icsk_bind_hash;

	__sk_del_bind_node(sk);

	inet_csk(sk)->icsk_bind_hash = NULL;

	inet_sk(sk)->inet_num = 0;

net/ipv4/inet_timewait_sock.c

+0 −8
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ void inet_twsk_bind_unhash(struct inet_timewait_sock *tw, 
	if (!tb)

		return;



	__hlist_del(&tw->tw_bind_node);

	tw->tw_tb = NULL;



	__hlist_del(&tw->tw_bind2_node);
@@ -94,12 +93,6 @@ static void inet_twsk_add_node_rcu(struct inet_timewait_sock *tw, 
	hlist_nulls_add_head_rcu(&tw->tw_node, list);

}



static void inet_twsk_add_bind_node(struct inet_timewait_sock *tw,

				    struct hlist_head *list)

{

	hlist_add_head(&tw->tw_bind_node, list);

}



static void inet_twsk_add_bind2_node(struct inet_timewait_sock *tw,

				     struct hlist_head *list)

{
@@ -133,7 +126,6 @@ void inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk, 


	tw->tw_tb = icsk->icsk_bind_hash;

	WARN_ON(!icsk->icsk_bind_hash);

	inet_twsk_add_bind_node(tw, &tw->tw_tb->owners);



	tw->tw_tb2 = icsk->icsk_bind2_hash;

	WARN_ON(!icsk->icsk_bind2_hash);