* [PATCH net-next] tcp: call tcp_ack_tstamp() when not fully acked
@ 2020-06-30 2:01 Yousuk Seung
2020-06-30 16:26 ` Jakub Kicinski
0 siblings, 1 reply; 2+ messages in thread
From: Yousuk Seung @ 2020-06-30 2:01 UTC (permalink / raw)
To: David Miller
Cc: netdev, Yousuk Seung, Willem de Bruijn, Eric Dumazet,
Soheil Hassas Yeganeh
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.
Fixes: fdb7eb21ddd3 ("tcp: stamp SCM_TSTAMP_ACK later in tcp_clean_rtx_queue())
Signed-off-by: Yousuk Seung <ysseung@google.com>
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
---
net/ipv4/tcp_input.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 8479b84f0a7f..12c26c9565b7 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -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);
--
2.27.0.212.ge8ba1cc988-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] tcp: call tcp_ack_tstamp() when not fully acked
2020-06-30 2:01 [PATCH net-next] tcp: call tcp_ack_tstamp() when not fully acked Yousuk Seung
@ 2020-06-30 16:26 ` Jakub Kicinski
0 siblings, 0 replies; 2+ messages in thread
From: Jakub Kicinski @ 2020-06-30 16:26 UTC (permalink / raw)
To: Yousuk Seung
Cc: David Miller, netdev, Willem de Bruijn, Eric Dumazet,
Soheil Hassas Yeganeh
On Mon, 29 Jun 2020 19:01:32 -0700 Yousuk Seung wrote:
> 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.
>
> Fixes: fdb7eb21ddd3 ("tcp: stamp SCM_TSTAMP_ACK later in tcp_clean_rtx_queue())
> Signed-off-by: Yousuk Seung <ysseung@google.com>
> Signed-off-by: Willem de Bruijn <willemb@google.com>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Fixes tag: Fixes: fdb7eb21ddd3 ("tcp: stamp SCM_TSTAMP_ACK later in tcp_clean_rtx_queue())
Has these problem(s):
- Subject has leading but no trailing quotes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-30 16:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-30 2:01 [PATCH net-next] tcp: call tcp_ack_tstamp() when not fully acked Yousuk Seung
2020-06-30 16:26 ` Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).