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

tcp: Link sk and twsk to tb2->owners using skc_bind_node. 



Now we can use sk_bind_node/tw_bind_node for bhash2, which means
we need not link TIME_WAIT sockets separately.

The dead code and sk_bind2_node will be removed in the next 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 b2cb9f9e

include/net/sock.h

+0 −10
Original line number Diff line number Diff line
@@ -873,16 +873,6 @@ static inline void sk_add_bind_node(struct sock *sk, 
	hlist_add_head(&sk->sk_bind_node, list);

}



static inline void __sk_del_bind2_node(struct sock *sk)

{

	__hlist_del(&sk->sk_bind2_node);

}



static inline void sk_add_bind2_node(struct sock *sk, struct hlist_head *list)

{

	hlist_add_head(&sk->sk_bind2_node, list);

}



#define sk_for_each(__sk, list) \

	hlist_for_each_entry(__sk, list, sk_node)

#define sk_for_each_rcu(__sk, list) \

net/ipv4/inet_connection_sock.c

+2 −2
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ static bool inet_bhash2_conflict(const struct sock *sk, 
	struct inet_timewait_sock *tw2;

	struct sock *sk2;



	sk_for_each_bound_bhash2(sk2, &tb2->owners) {

	sk_for_each_bound(sk2, &tb2->owners) {

		if (__inet_bhash2_conflict(sk, sk2, sk_uid, relax,

					   reuseport_cb_ok, reuseport_ok))

			return true;
@@ -238,7 +238,7 @@ static bool inet_bhash2_conflict(const struct sock *sk, 


#define sk_for_each_bound_bhash(__sk, __tb2, __tb)			\

	hlist_for_each_entry(__tb2, &(__tb)->bhash2, bhash_node)	\

		sk_for_each_bound_bhash2(sk2, &(__tb2)->owners)

		sk_for_each_bound(sk2, &(__tb2)->owners)



#define twsk_for_each_bound_bhash(__sk, __tb2, __tb)			\

	hlist_for_each_entry(__tb2, &(__tb)->bhash2, bhash_node)	\

net/ipv4/inet_diag.c

+1 −1
Original line number Diff line number Diff line
@@ -1104,7 +1104,7 @@ void inet_diag_dump_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *skb, 
				if (!net_eq(ib2_net(tb2), net))

					continue;



				sk_for_each_bound_bhash2(sk, &tb2->owners) {

				sk_for_each_bound(sk, &tb2->owners) {

					struct inet_sock *inet = inet_sk(sk);



					if (num < s_num)

net/ipv4/inet_hashtables.c

+4 −4
Original line number Diff line number Diff line
@@ -169,8 +169,8 @@ void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb, 
{

	inet_sk(sk)->inet_num = port;

	inet_csk(sk)->icsk_bind_hash = tb;

	sk_add_bind2_node(sk, &tb2->owners);

	inet_csk(sk)->icsk_bind2_hash = tb2;

	sk_add_bind_node(sk, &tb2->owners);

}



/*
@@ -197,7 +197,7 @@ static void __inet_put_port(struct sock *sk) 
	if (inet_csk(sk)->icsk_bind2_hash) {

		struct inet_bind2_bucket *tb2 = inet_csk(sk)->icsk_bind2_hash;



		__sk_del_bind2_node(sk);

		__sk_del_bind_node(sk);

		inet_csk(sk)->icsk_bind2_hash = NULL;

		inet_bind2_bucket_destroy(hashinfo->bind2_bucket_cachep, tb2);

	}
@@ -937,7 +937,7 @@ static int __inet_bhash2_update_saddr(struct sock *sk, void *saddr, int family, 
	spin_lock_bh(&head->lock);



	spin_lock(&head2->lock);

	__sk_del_bind2_node(sk);

	__sk_del_bind_node(sk);

	inet_bind2_bucket_destroy(hinfo->bind2_bucket_cachep, inet_csk(sk)->icsk_bind2_hash);

	spin_unlock(&head2->lock);
@@ -954,8 +954,8 @@ static int __inet_bhash2_update_saddr(struct sock *sk, void *saddr, int family, 
		tb2 = new_tb2;

		inet_bind2_bucket_init(tb2, net, head2, inet_csk(sk)->icsk_bind_hash, sk);

	}

	sk_add_bind2_node(sk, &tb2->owners);

	inet_csk(sk)->icsk_bind2_hash = tb2;

	sk_add_bind_node(sk, &tb2->owners);

	spin_unlock(&head2->lock);



	spin_unlock_bh(&head->lock);

net/ipv4/inet_timewait_sock.c

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

		return;



	__sk_del_bind_node((struct sock *)tw);

	tw->tw_tb = NULL;



	__hlist_del(&tw->tw_bind2_node);

	tw->tw_tb2 = NULL;

	inet_bind2_bucket_destroy(hashinfo->bind2_bucket_cachep, tb2);

	inet_bind_bucket_destroy(hashinfo->bind_bucket_cachep, tb);
@@ -93,12 +92,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_bind2_node(struct inet_timewait_sock *tw,

				     struct hlist_head *list)

{

	hlist_add_head(&tw->tw_bind2_node, list);

}



/*

 * Enter the time wait state. This is called with locally disabled BH.

 * Essentially we whip up a timewait bucket, copy the relevant info into it
@@ -129,7 +122,7 @@ void inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk, 


	tw->tw_tb2 = icsk->icsk_bind2_hash;

	WARN_ON(!icsk->icsk_bind2_hash);

	inet_twsk_add_bind2_node(tw, &tw->tw_tb2->deathrow);

	sk_add_bind_node((struct sock *)tw, &tw->tw_tb2->owners);



	spin_unlock(&bhead2->lock);

	spin_unlock(&bhead->lock);