mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
2de8023e7bb288e0bfbe0325a7690d32dc670873
linux/net/ipv4
History
Martin KaFai Lau 2de8023e7b tcp: Merge txstamp_ack in tcp_skb_collapse_tstamp 
When collapsing skbs, txstamp_ack also needs to be merged.

Retrans Collapse Test:
~~~~~~
0.200 accept(3, ..., ...) = 4
+0 setsockopt(4, SOL_TCP, TCP_NODELAY, [1], 4) = 0

0.200 write(4, ..., 730) = 730
+0 setsockopt(4, SOL_SOCKET, 37, [2688], 4) = 0
0.200 write(4, ..., 730) = 730
+0 setsockopt(4, SOL_SOCKET, 37, [2176], 4) = 0
0.200 write(4, ..., 11680) = 11680

0.200 > P. 1:731(730) ack 1
0.200 > P. 731:1461(730) ack 1
0.200 > . 1461:8761(7300) ack 1
0.200 > P. 8761:13141(4380) ack 1

0.300 < . 1:1(0) ack 1 win 257 <sack 1461:2921,nop,nop>
0.300 < . 1:1(0) ack 1 win 257 <sack 1461:4381,nop,nop>
0.300 < . 1:1(0) ack 1 win 257 <sack 1461:5841,nop,nop>
0.300 > P. 1:1461(1460) ack 1
0.400 < . 1:1(0) ack 13141 win 257

BPF Output Before:
~~~~~
<No output due to missing SCM_TSTAMP_ACK timestamp>

BPF Output After:
~~~~~
<...>-2027  [007] d.s.    79.765921: : ee_data:1459

Sacks Collapse Test:
~~~~~
0.200 accept(3, ..., ...) = 4
+0 setsockopt(4, SOL_TCP, TCP_NODELAY, [1], 4) = 0

0.200 write(4, ..., 1460) = 1460
+0 setsockopt(4, SOL_SOCKET, 37, [2688], 4) = 0
0.200 write(4, ..., 13140) = 13140
+0 setsockopt(4, SOL_SOCKET, 37, [2176], 4) = 0

0.200 > P. 1:1461(1460) ack 1
0.200 > . 1461:8761(7300) ack 1
0.200 > P. 8761:14601(5840) ack 1

0.300 < . 1:1(0) ack 1 win 257 <sack 1461:14601,nop,nop>
0.300 > P. 1:1461(1460) ack 1
0.400 < . 1:1(0) ack 14601 win 257

BPF Output Before:
~~~~~
<No output due to missing SCM_TSTAMP_ACK timestamp>

BPF Output After:
~~~~~
<...>-2049  [007] d.s.    89.185538: : ee_data:14599

Signed-off-by: Martin 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: Soheil Hassas Yeganeh <soheil@google.com>
Tested-by: Soheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-04-24 14:06:43 -04:00
..
netfilter
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2016-04-24 00:12:08 -04:00
af_inet.c
GSO: Support partial segmentation offload
2016-04-14 16:23:41 -04:00
ah4.c
ah4: Fix error return in ah_input().
2015-08-25 13:38:50 -07:00
arp.c
arp: correct return value of arp_rcv
2016-03-07 14:55:04 -05:00
cipso_ipv4.c
net: introduce lockdep_is_held and update various places to use it
2016-04-07 16:44:14 -04:00
datagram.c
net: Set sk_txhash from a random number
2015-07-29 22:44:04 -07:00
devinet.c
ipv4: Don't do expensive useless work during inetdev destroy.
2016-03-13 23:28:35 -04:00
esp4.c
esp4: Switch to new AEAD interface
2015-05-28 11:23:20 +08:00
fib_frontend.c
ipv4: initialize flowi4_flags before calling fib_lookup()
2016-03-22 15:59:23 -04:00
fib_lookup.h
ipv4: consider TOS in fib_select_default
2015-07-24 22:46:11 -07:00
fib_rules.c
net: ipv6: use common fib_default_rule_pref
2015-09-09 14:19:50 -07:00
fib_semantics.c
net: ipv4: Consider failed nexthops in multipath routes
2016-04-11 15:16:13 -04:00
fib_trie.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-02-01 15:56:08 -08:00
fou.c
ip_tunnel_core: iptunnel_handle_offloads returns int and doesn't free skb
2016-04-16 19:09:13 -04:00
gre_demux.c
gre: Remove support for sharing GRE protocol hook.
2015-08-10 14:03:54 -07:00
gre_offload.c
GRE: Add support for GRO/GSO of IPv6 GRE traffic
2016-04-16 19:09:13 -04:00
icmp.c
net: ipv4: Convert IP network timestamps to be y2038 safe
2016-03-01 17:18:44 -05:00
igmp.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-03-08 12:34:12 -05:00
inet_connection_sock.c
tcp/dccp: fix inet_reuseport_add_sock()
2016-04-07 12:02:33 -04:00
inet_diag.c
net: use jiffies_to_msecs to replace EXPIRES_IN_MS in inet/sctp_diag
2016-04-21 13:55:33 -04:00
inet_fragment.c
inet: kill unused skb_free op
2016-01-05 22:25:57 -05:00
inet_hashtables.c
tcp/dccp: fix inet_reuseport_add_sock()
2016-04-07 12:02:33 -04:00
inet_timewait_sock.c
tcp/dccp: fix timewait races in timer handling
2015-09-21 16:32:29 -07:00
inetpeer.c
net: Add helper function to compare inetpeer addresses
2015-08-28 13:32:36 -07:00
ip_forward.c
net: remove skb_sender_cpu_clear()
2016-03-01 17:36:47 -05:00
ip_fragment.c
net: Export ip fragment sysctl to unprivileged users
2016-02-16 20:42:54 -05:00
ip_gre.c
ip_tunnel_core: iptunnel_handle_offloads returns int and doesn't free skb
2016-04-16 19:09:13 -04:00
ip_input.c
ipv4: namespacify ip_early_demux sysctl knob
2016-02-16 20:42:54 -05:00
ip_options.c
net: ipv4: Convert IP network timestamps to be y2038 safe
2016-03-01 17:18:44 -05:00
ip_output.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-03-08 12:34:12 -05:00
ip_sockglue.c
udp: do not expect udp headers in recv cmsg IP_CMSG_CHECKSUM
2016-04-13 22:24:52 -04:00
ip_tunnel_core.c
libnl: nla_put_be64(): align on a 64-bit area
2016-04-23 20:13:24 -04:00
ip_tunnel.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-03-08 12:34:12 -05:00
ip_vti.c
ip_tunnel: Move stats update to iptunnel_xmit()
2015-12-25 23:32:23 -05:00
ipcomp.c
ipv4: coding style: comparison for equality with NULL
2015-04-03 12:11:15 -04:00
ipconfig.c
ipv4: ipconfig: avoid unused ic_proto_used symbol
2016-01-29 19:39:09 -08:00
ipip.c
ip_tunnel_core: iptunnel_handle_offloads returns int and doesn't free skb
2016-04-16 19:09:13 -04:00
ipmr.c
ipmr: align RTA_MFC_STATS on 64-bit
2016-04-21 14:22:13 -04:00
Kconfig
ipv4: Remove inet_lro library
2016-02-17 16:15:46 -05:00
Makefile
ipv4: Remove inet_lro library
2016-02-17 16:15:46 -05:00
netfilter.c
ipv4: Pass struct net into ip_route_me_harder
2015-09-29 20:21:32 +02:00
ping.c
sock: enable timestamping using control messages
2016-04-04 15:50:30 -04:00
proc.c
ipv4: Namespaceify ip_default_ttl sysctl knob
2016-02-16 20:42:54 -05:00
protocol.c
net: Export inet_offloads and inet6_offloads
2014-09-19 17:15:31 -04:00
raw.c
sock: enable timestamping using control messages
2016-04-04 15:50:30 -04:00
route.c
route: do not cache fib route info on local routes with oif
2016-04-13 23:33:01 -04:00
syncookies.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-03-19 10:05:34 -07:00
sysctl_net_ipv4.c
net: ipv4: Consider failed nexthops in multipath routes
2016-04-11 15:16:13 -04:00
tcp_bic.c
tcp: add tcp_in_slow_start helper
2015-07-09 14:22:52 -07:00
tcp_cdg.c
tcp: do not slow start when cwnd equals ssthresh
2015-07-09 14:22:52 -07:00
tcp_cong.c
tcp: remove tcp_ecn_make_synack() socket argument
2015-09-25 13:00:38 -07:00
tcp_cubic.c
tcp_cubic: do not set epoch_start in the future
2015-09-17 22:35:07 -07:00
tcp_dctcp.c
tcp: allow dctcp alpha to drop to zero
2015-10-23 02:46:52 -07:00
tcp_diag.c
net: diag: Support destroying TCP sockets.
2015-12-15 23:26:52 -05:00
tcp_fastopen.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2016-03-19 10:05:34 -07:00
tcp_highspeed.c
tcp: add tcp_in_slow_start helper
2015-07-09 14:22:52 -07:00
tcp_htcp.c
tcp: add tcp_in_slow_start helper
2015-07-09 14:22:52 -07:00
tcp_hybla.c
tcp: do not slow start when cwnd equals ssthresh
2015-07-09 14:22:52 -07:00
tcp_illinois.c
tcp: add tcp_in_slow_start helper
2015-07-09 14:22:52 -07:00
tcp_input.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-04-23 18:51:33 -04:00
tcp_ipv4.c
tcp: do not mess with listener sk_wmem_alloc
2016-04-15 16:45:44 -04:00
tcp_lp.c
tcp: remove in_flight parameter from cong_avoid() methods
2014-05-03 19:23:07 -04:00
tcp_metrics.c
libnl: nla_put_msecs(): align on a 64-bit area
2016-04-23 20:13:24 -04:00
tcp_minisocks.c
tcp: rate limit ACK sent by SYN_RECV request sockets
2016-04-04 22:11:20 -04:00
tcp_offload.c
GSO: Support partial segmentation offload
2016-04-14 16:23:41 -04:00
tcp_output.c
tcp: Merge txstamp_ack in tcp_skb_collapse_tstamp
2016-04-24 14:06:43 -04:00
tcp_probe.c
net: ipv4: tcp_probe: Replace timespec with timespec64
2016-03-01 17:18:44 -05:00
tcp_recovery.c
tcp: use RACK to detect losses
2015-10-21 07:00:53 -07:00
tcp_scalable.c
tcp: add tcp_in_slow_start helper
2015-07-09 14:22:52 -07:00
tcp_timer.c
ipv4: Namespaceify tcp_orphan_retries sysctl knob
2016-02-07 14:35:11 -05:00
tcp_vegas.c
tcp: add tcp_in_slow_start helper
2015-07-09 14:22:52 -07:00
tcp_vegas.h
tcp: prepare CC get_info() access from getsockopt()
2015-04-29 17:10:38 -04:00
tcp_veno.c
tcp: add tcp_in_slow_start helper
2015-07-09 14:22:52 -07:00
tcp_westwood.c
tcp_westwood: fix tcp_westwood_info()
2015-05-05 19:50:09 -04:00
tcp_yeah.c
tcp_yeah: don't set ssthresh below 2
2016-01-11 17:25:16 -05:00
tcp.c
sock: enable timestamping using control messages
2016-04-04 15:50:30 -04:00
tunnel4.c
…
udp_diag.c
udp: no longer use SLAB_DESTROY_BY_RCU
2016-04-04 22:11:19 -04:00
udp_impl.h
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
udp_offload.c
GSO: Support partial segmentation offload
2016-04-14 16:23:41 -04:00
udp_tunnel.c
udp: Add socket based GRO and config
2016-04-07 16:53:29 -04:00
udp.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-04-23 18:51:33 -04:00
udplite.c
net: Eliminate no_check from protosw
2014-05-23 16:28:53 -04:00
xfrm4_input.c
netfilter: Pass net into okfn
2015-09-17 17:18:37 -07:00
xfrm4_mode_beet.c
…
xfrm4_mode_transport.c
…
xfrm4_mode_tunnel.c
ipv4: hash net ptr into fragmentation bucket selection
2015-03-25 14:07:04 -04:00
xfrm4_output.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-10-24 06:54:12 -07:00
xfrm4_policy.c
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
2015-12-22 16:26:31 -05:00
xfrm4_protocol.c
xfrm4: Remove duplicate semicolon
2014-06-30 07:49:47 +02:00
xfrm4_state.c
…
xfrm4_tunnel.c
…