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

Revert "net: correct sk_acceptq_is_full()" 



This reverts commit f211ac15.

We had similar attempt in the past, and we reverted it.

History:

64a14651 [NET]: Revert incorrect accept queue backlog changes.
8488df89 [NET]: Fix bugs in "Whether sock accept queue is full" checking

I am adding a fat comment so that future attempts will
be much harder.

Fixes: f211ac15 ("net: correct sk_acceptq_is_full()")
Cc: iuyacan <yacanliu@163.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9dc22c0d

include/net/sock.h

+5 −1
Original line number Diff line number Diff line
@@ -934,9 +934,13 @@ static inline void sk_acceptq_added(struct sock *sk) 
	WRITE_ONCE(sk->sk_ack_backlog, sk->sk_ack_backlog + 1);

}



/* Note: If you think the test should be:

 *	return READ_ONCE(sk->sk_ack_backlog) >= READ_ONCE(sk->sk_max_ack_backlog);

 * Then please take a look at commit 64a146513f8f ("[NET]: Revert incorrect accept queue backlog changes.")

 */

static inline bool sk_acceptq_is_full(const struct sock *sk)

{

	return READ_ONCE(sk->sk_ack_backlog) >= READ_ONCE(sk->sk_max_ack_backlog);

	return READ_ONCE(sk->sk_ack_backlog) > READ_ONCE(sk->sk_max_ack_backlog);

}



/*