Commit 622a08e8 authored by Eric Dumazet's avatar Eric Dumazet Committed by Paolo Abeni
Browse files

inet_diag: skip over empty buckets 



After the removal of inet_diag_table_mutex, sock_diag_table_mutex
and sock_diag_mutex, I was able so see spinlock contention from
inet_diag_dump_icsk() when running 100 parallel invocations.

It is time to skip over empty buckets.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarGuillaume Nault <gnault@redhat.com>
Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent f44e6499

net/ipv4/inet_diag.c

+8 −0
Original line number Diff line number Diff line
@@ -1045,6 +1045,10 @@ void inet_diag_dump_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *skb, 
			num = 0;

			ilb = &hashinfo->lhash2[i];



			if (hlist_nulls_empty(&ilb->nulls_head)) {

				s_num = 0;

				continue;

			}

			spin_lock(&ilb->lock);

			sk_nulls_for_each(sk, node, &ilb->nulls_head) {

				struct inet_sock *inet = inet_sk(sk);
@@ -1109,6 +1113,10 @@ void inet_diag_dump_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *skb, 
			accum = 0;

			ibb = &hashinfo->bhash2[i];



			if (hlist_empty(&ibb->chain)) {

				s_num = 0;

				continue;

			}

			spin_lock_bh(&ibb->lock);

			inet_bind_bucket_for_each(tb2, &ibb->chain) {

				if (!net_eq(ib2_net(tb2), net))