tcp: call tcp_ack_tstamp() when not fully acked
Subsystems (3)
PATCH v2 1/1 tcp: call tcp_ack_tstamp() when not fully acked
When skb is coalesced tcp_ack_tstamp() still needs to be called when not fully acked in tcp_clean_rtx_queue(), otherwise SCM_TSTAMP_ACK timestamps may never be fired. Since the original patch series had dependent commits, this patch fixes the issue instead of reverting by restoring calls to tcp_ack_tstamp() when skb is not fully acked.
--- net/ipv4/tcp_input.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/ipv4/tcp_input.c +5 -2
@@ -3172,8 +3172,11 @@ static int tcp_clean_rtx_queue(struct sock *sk, u32 prior_fack,if (likely (between (tp->snd_up, prior_snd_una, tp->snd_una))) tp->snd_up = tp->snd_una; -if (skb && (TCP_SKB_CB (skb)->sacked &TCPCB_SACKED_ACKED )) - flag |=FLAG_SACK_RENEGING ; +if (skb) { +tcp_ack_tstamp (sk, skb, prior_snd_una); +if (TCP_SKB_CB (skb)->sacked &TCPCB_SACKED_ACKED ) + flag |=FLAG_SACK_RENEGING ; + }if (likely (first_ackt) && !(flag &FLAG_RETRANS_DATA_ACKED )) { seq_rtt_us =tcp_stamp_us_delta (tp->tcp_mstamp, first_ackt);
Signature · 1 line
2.27.0.212.ge8ba1cc988-goog
From: Yousuk Seung <[email protected]>
Date: Tue, 30 Jun 2020 09:49:33 -0700
Quoted 11 lines
When skb is coalesced
tcp_ack_tstamp()still needs to be called when not fully acked intcp_clean_rtx_queue(), otherwiseSCM_TSTAMP_ACKtimestamps may never be fired. Since the original patch series had dependent commits, this patch fixes the issue instead of reverting by restoring calls totcp_ack_tstamp()when skb is not fully acked.Fixes fdb7eb21ddd3 ("tcp: stamp SCM_TSTAMP_ACK later in tcp_clean_rtx_queue()")Signed-off-by Yousuk Seung <[email protected]>Signed-off-by Willem de Bruijn <[email protected]>Signed-off-by Eric Dumazet <[email protected]>
Applied, thank you.