diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-03-17 18:32:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-17 22:01:56 -0400 |
| commit | e3d95ad7da4f8955599f0786d7c70497c0aaf8c9 (patch) | |
| tree | c427b35237fcb5ee29cc973d96c1d8b893bb7491 | |
| parent | 9439ce00f208d95703a6725e4ea986dd90e37ffd (diff) | |
| download | linux-e3d95ad7da4f8955599f0786d7c70497c0aaf8c9.tar.bz2 | |
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: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/inet_connection_sock.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 741f0d96a7f7..f0f91858aecf 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -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 |