openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Eric Dumazet 2015-03-17 18:32:30 -07:00 committed by David S. Miller
parent 9439ce00f2
commit e3d95ad7da
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv4/inet_connection_sock.c
View File

@ -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 inet_connection_sock *icsk = inet_csk(sk);
struct request_sock_queue *queue = &icsk->icsk_accept_queue; struct request_sock_queue *queue = &icsk->icsk_accept_queue;
struct sock *newsk;
struct request_sock *req; struct request_sock *req;
struct sock *newsk;
int error; int error;
lock_sock(sk); lock_sock(sk);
@ -323,7 +323,9 @@ struct sock *inet_csk_accept(struct sock *sk, int flags, int *err)
newsk = req->sk; newsk = req->sk;
sk_acceptq_removed(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); spin_lock_bh(&queue->fastopenq->lock);
if (tcp_rsk(req)->tfo_listener) { if (tcp_rsk(req)->tfo_listener) {
/* We are still waiting for the final ACK from 3WHS /* We are still waiting for the final ACK from 3WHS