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

Commit 96b792d1 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

tcp: do not aggressively quick ack after ECN events 



[ Upstream commit 522040ea5fdd1c33bbf75e1d7c7c0422b96a94ef ]

ECN signals currently forces TCP to enter quickack mode for
up to 16 (TCP_MAX_QUICKACKS) following incoming packets.

We believe this is not needed, and only sending one immediate ack
for the current packet should be enough.

This should reduce the extra load noticed in DCTCP environments,
after congestion events.

This is part 2 of our effort to reduce pure ACK packets.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Acked-by: default avatarYuchung Cheng <ycheng@google.com>
Acked-by: default avatarNeal Cardwell <ncardwell@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2b30c04b

net/ipv4/tcp_input.c

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static void __tcp_ecn_check_ce(struct tcp_sock *tp, const struct sk_buff *skb) 
		 * it is probably a retransmit.

		 */

		if (tp->ecn_flags & TCP_ECN_SEEN)

			tcp_enter_quickack_mode((struct sock *)tp, TCP_MAX_QUICKACKS);

			tcp_enter_quickack_mode((struct sock *)tp, 1);

		break;

	case INET_ECN_CE:

		if (tcp_ca_needs_ecn((struct sock *)tp))
@@ -245,7 +245,7 @@ static void __tcp_ecn_check_ce(struct tcp_sock *tp, const struct sk_buff *skb) 


		if (!(tp->ecn_flags & TCP_ECN_DEMAND_CWR)) {

			/* Better not delay acks, sender can have a very low cwnd */

			tcp_enter_quickack_mode((struct sock *)tp, TCP_MAX_QUICKACKS);

			tcp_enter_quickack_mode((struct sock *)tp, 1);

			tp->ecn_flags |= TCP_ECN_DEMAND_CWR;

		}

		tp->ecn_flags |= TCP_ECN_SEEN;