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

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

inet_hashinfo: remove bsocket counter 



We no longer need bsocket atomic counter, as inet_csk_get_port()
calls bind_conflict() regardless of its value, after commit
2b05ad33 ("tcp: bind() fix autoselection to share ports")

This patch removes overhead of maintaining this counter and
double inet_csk_get_port() calls under pressure.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Marcelo Ricardo Leitner <mleitner@redhat.com>
Cc: Flavio Leitner <fbl@redhat.com>
Acked-by: default avatarFlavio Leitner <fbl@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ce5ec440

include/net/inet_hashtables.h

+0 −2
Original line number Diff line number Diff line
@@ -148,8 +148,6 @@ struct inet_hashinfo { 
	 */

	struct inet_listen_hashbucket	listening_hash[INET_LHTABLE_SIZE]

					____cacheline_aligned_in_smp;



	atomic_t			bsockets;

};



static inline struct inet_ehash_bucket *inet_ehash_bucket(

net/ipv4/inet_connection_sock.c

+0 −5
Original line number Diff line number Diff line
@@ -127,11 +127,6 @@ int inet_csk_get_port(struct sock *sk, unsigned short snum) 
					    (tb->num_owners < smallest_size || smallest_size == -1)) {

						smallest_size = tb->num_owners;

						smallest_rover = rover;

						if (atomic_read(&hashinfo->bsockets) > (high - low) + 1 &&

						    !inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb, false)) {

							snum = smallest_rover;

							goto tb_found;

						}

					}

					if (!inet_csk(sk)->icsk_af_ops->bind_conflict(sk, tb, false)) {

						snum = rover;

net/ipv4/inet_hashtables.c

+0 −7
Original line number Diff line number Diff line
@@ -90,10 +90,6 @@ void inet_bind_bucket_destroy(struct kmem_cache *cachep, struct inet_bind_bucket 
void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb,

		    const unsigned short snum)

{

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



	atomic_inc(&hashinfo->bsockets);



	inet_sk(sk)->inet_num = snum;

	sk_add_bind_node(sk, &tb->owners);

	tb->num_owners++;
@@ -111,8 +107,6 @@ static void __inet_put_port(struct sock *sk) 
	struct inet_bind_hashbucket *head = &hashinfo->bhash[bhash];

	struct inet_bind_bucket *tb;



	atomic_dec(&hashinfo->bsockets);



	spin_lock(&head->lock);

	tb = inet_csk(sk)->icsk_bind_hash;

	__sk_del_bind_node(sk);
@@ -608,7 +602,6 @@ void inet_hashinfo_init(struct inet_hashinfo *h) 
{

	int i;



	atomic_set(&h->bsockets, 0);

	for (i = 0; i < INET_LHTABLE_SIZE; i++) {

		spin_lock_init(&h->listening_hash[i].lock);

		INIT_HLIST_NULLS_HEAD(&h->listening_hash[i].head,