Commit 8ad0921b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'tcp_poll-flakes' 



Eric Dumazet says:

====================
tcp: address two poll() flakes

Some packetdrill tests are failing when host kernel is using ASAN
or other debugging infrastructure.

I was able to fix the flakes by making sure we were not
sending wakeup events too soon.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d02e93d6 0f9fa831

net/ipv4/tcp_input.c

+11 −9
Original line number Diff line number Diff line
@@ -4008,10 +4008,10 @@ void tcp_reset(struct sock *sk) 
	/* This barrier is coupled with smp_rmb() in tcp_poll() */

	smp_wmb();



	tcp_done(sk);



	if (!sock_flag(sk, SOCK_DEAD))

		sk->sk_error_report(sk);



	tcp_done(sk);

}



/*
@@ -5580,10 +5580,6 @@ void tcp_finish_connect(struct sock *sk, struct sk_buff *skb) 
	else

		tp->pred_flags = 0;



	if (!sock_flag(sk, SOCK_DEAD)) {

		sk->sk_state_change(sk);

		sk_wake_async(sk, SOCK_WAKE_IO, POLL_OUT);

	}

}



static bool tcp_rcv_fastopen_synack(struct sock *sk, struct sk_buff *synack,
@@ -5652,6 +5648,7 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, 
	struct tcp_sock *tp = tcp_sk(sk);

	struct tcp_fastopen_cookie foc = { .len = -1 };

	int saved_clamp = tp->rx_opt.mss_clamp;

	bool fastopen_fail;



	tcp_parse_options(skb, &tp->rx_opt, 0, &foc);

	if (tp->rx_opt.saw_tstamp && tp->rx_opt.rcv_tsecr)
@@ -5755,10 +5752,15 @@ static int tcp_rcv_synsent_state_process(struct sock *sk, struct sk_buff *skb, 


		tcp_finish_connect(sk, skb);



		if ((tp->syn_fastopen || tp->syn_data) &&

		    tcp_rcv_fastopen_synack(sk, skb, &foc))

			return -1;

		fastopen_fail = (tp->syn_fastopen || tp->syn_data) &&

				tcp_rcv_fastopen_synack(sk, skb, &foc);



		if (!sock_flag(sk, SOCK_DEAD)) {

			sk->sk_state_change(sk);

			sk_wake_async(sk, SOCK_WAKE_IO, POLL_OUT);

		}

		if (fastopen_fail)

			return -1;

		if (sk->sk_write_pending ||

		    icsk->icsk_accept_queue.rskq_defer_accept ||

		    icsk->icsk_ack.pingpong) {