• Martin KaFai Lau's avatar
    tcp: Carry txstamp_ack in tcp_fragment_tstamp · b51e13fa
    Martin KaFai Lau authored
    When a tcp skb is sliced into two smaller skbs (e.g. in
    tcp_fragment() and tso_fragment()),  it does not carry
    the txstamp_ack bit to the newly created skb if it is needed.
    The end result is a timestamping event (SCM_TSTAMP_ACK) will
    be missing from the sk->sk_error_queue.
    
    This patch carries this bit to the new skb2
    in tcp_fragment_tstamp().
    
    BPF Output Before:
    ~~~~~~
    <No output due to missing SCM_TSTAMP_ACK timestamp>
    
    BPF Output After:
    ~~~~~~
    <...>-2050  [000] d.s.   100.928763: : ee_data:14599
    
    Packetdrill Script:
    ~~~~~~
    +0 `sysctl -q -w net.ipv4.tcp_min_tso_segs=10`
    +0 `sysctl -q -w net.ipv4.tcp_no_metrics_save=1`
    +0 socket(..., SOCK_STREAM, IPPROTO_TCP) = 3
    +0 setsockopt(3, SOL_SOCKET, SO_REUSEADDR, [1], 4) = 0
    +0 bind(3, ..., ...) = 0
    +0 listen(3, 1) = 0
    
    0.100 < S 0:0(0) win 32792 <mss 1460,sackOK,nop,nop,nop,wscale 7>
    0.100 > S. 0:0(0) ack 1 <mss 1460,nop,nop,sackOK,nop,wscale 7>
    0.200 < . 1:1(0) ack 1 win 257
    0.200 accept(3, ..., ...) = 4
    +0 setsockopt(4, SOL_TCP, TCP_NODELAY, [1], 4) = 0
    
    +0 setsockopt(4, SOL_SOCKET, 37, [2688], 4) = 0
    0.200 write(4, ..., 14600) = 14600
    +0 setsockopt(4, SOL_SOCKET, 37, [2176], 4) = 0
    
    0.200 > . 1:7301(7300) ack 1
    0.200 > P. 7301:14601(7300) ack 1
    
    0.300 < . 1:1(0) ack 14601 win 257
    
    0.300 close(4) = 0
    0.300 > F. 14601:14601(0) ack 1
    0.400 < F. 1:1(0) ack 16062 win 257
    0.400 > . 14602:14602(0) ack 2
    Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
    Cc: Eric Dumazet <edumazet@google.com>
    Cc: Neal Cardwell <ncardwell@google.com>
    Cc: Soheil Hassas Yeganeh <soheil@google.com>
    Cc: Willem de Bruijn <willemb@google.com>
    Cc: Yuchung Cheng <ycheng@google.com>
    Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
    Tested-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
    Acked-by: default avatarWillem de Bruijn <willemb@google.com>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    b51e13fa
tcp_output.c 102 KB