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

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

inet: avoid fastopen lock for regular accept() 



It is not because a TCP listener is FastOpen ready that
all incoming sockets actually used FastOpen.

Avoid taking queue->fastopenq->lock if not needed.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9439ce00

net/ipv4/inet_connection_sock.c

+4 −2
Original line number Diff line number Diff line
@@ -293,8 +293,8 @@ struct sock *inet_csk_accept(struct sock *sk, int flags, int *err) 
{

	struct inet_connection_sock *icsk = inet_csk(sk);

	struct request_sock_queue *queue = &icsk->icsk_accept_queue;

	struct sock *newsk;

	struct request_sock *req;

	struct sock *newsk;

	int error;



	lock_sock(sk);
@@ -323,7 +323,9 @@ struct sock *inet_csk_accept(struct sock *sk, int flags, int *err) 
	newsk = req->sk;



	sk_acceptq_removed(sk);

	if (sk->sk_protocol == IPPROTO_TCP && queue->fastopenq != NULL) {

	if (sk->sk_protocol == IPPROTO_TCP &&

	    tcp_rsk(req)->tfo_listener &&

	    queue->fastopenq) {

		spin_lock_bh(&queue->fastopenq->lock);

		if (tcp_rsk(req)->tfo_listener) {

			/* We are still waiting for the final ACK from 3WHS