tcp: sack compression changes
Subsystems (4)
cover tcp: sack compression changes
Patch series refines SACK compression.
We had issues with missing SACK when TCP option space is tight.
Uses hrtimer slack to improve performance.
Eric Dumazet (3):
tcp: add tp->dup_ack_counter
tcp: tcp_sack_new_ofo_skb() should be more conservative
tcp: add hrtimer slack to sack compression
Documentation/networking/ip-sysctl.rst | 8 ++++ include/linux/tcp.h | 1 + include/net/netns/ipv4.h | 1 + net/ipv4/sysctl_net_ipv4.c | 7 ++++ net/ipv4/tcp_input.c | 51 ++++++++++++++++++++------ net/ipv4/tcp_ipv4.c | 1 + net/ipv4/tcp_output.c | 6 +-- net/ipv4/tcp_timer.c | 8 +++- 8 files changed, 68 insertions(+), 15 deletions(-)
Signature · 1 line
2.26.2.303.gf8c07b1a785-goog
PATCH 1/3 tcp: add tp->dup_ack_counter
In commit 86de5921a3d5 ("tcp: defer SACK compression after DupThresh") I added a TCP_FASTRETRANS_THRESH bias to tp->compressed_ack in order to enable sack compression only after 3 dupacks.
Since we plan to relax this rule for flows that involve stacks not requiring this old rule, this patch adds a distinct tp->dup_ack_counter.
This means the TCP_FASTRETRANS_THRESH value is now used in a single location that a future patch can adjust:
if (tp->dup_ack_counter < TCP_FASTRETRANS_THRESH) {
tp->dup_ack_counter++;
goto send_now;
}This patch also introduces tcp_sack_compress_send_ack() helper to ease following patch comprehension.
This patch refines LINUX_MIB_TCPACKCOMPRESSED to not count the acks that we had to send if the timer expires or tcp_sack_compress_send_ack() is sending an ack.
--- include/linux/tcp.h | 1 + net/ipv4/tcp_input.c | 36 +++++++++++++++++++++++++++--------- net/ipv4/tcp_output.c | 6 +++--- net/ipv4/tcp_timer.c | 8 +++++++- 4 files changed, 38 insertions(+), 13 deletions(-)
include/linux/tcp.h +1 -0
@@ -268,6 +268,7 @@ struct tcp_sock { } rack;u16 advmss;/* Advertised MSS */ u8 compressed_ack; +u8 dup_ack_counter;u32 chrono_start;/* Start time in jiffies of a TCP chrono */ u32 chrono_stat[3 ];/* Time in jiffies for chrono_stat stats */ u8 chrono_type:2, /* current chronograph type */
net/ipv4/tcp_input.c +27 -9
@@ -4327,6 +4327,27 @@ static void tcp_sack_maybe_coalesce(struct tcp_sock *tp) } } +static void tcp_sack_compress_send_ack (struct sock *sk) +{ +struct tcp_sock *tp =tcp_sk (sk); + +if (!tp->compressed_ack) +return ; + +if (hrtimer_try_to_cancel (&tp->compressed_ack_timer) ==1 ) +__sock_put (sk); + +/* Since we have to send one ack finally, +* substract one from tp->compressed_ack to keep +* LINUX_MIB_TCPACKCOMPRESSED accurate. +*/ +NET_ADD_STATS (sock_net (sk),LINUX_MIB_TCPACKCOMPRESSED , + tp->compressed_ack -1 ); + + tp->compressed_ack =0 ; +tcp_send_ack (sk); +} +static void tcp_sack_new_ofo_skb (struct sock *sk,u32 seq,u32 end_seq) {struct tcp_sock *tp =tcp_sk (sk);
@@ -4355,8 +4376,7 @@ static void tcp_sack_new_ofo_skb(struct sock *sk, u32 seq, u32 end_seq)* If the sack array is full, forget about the last one. */ if (this_sack >=TCP_NUM_SACKS ) { -if (tp->compressed_ack >TCP_FASTRETRANS_THRESH ) -tcp_send_ack (sk); +tcp_sack_compress_send_ack (sk); this_sack--; tp->rx_opt.num_sacks--; sp--;
@@ -5275,15 +5295,13 @@ static void __tcp_ack_snd_check(struct sock *sk, int ofo_possible)if (tp->compressed_ack_rcv_nxt != tp->rcv_nxt) { tp->compressed_ack_rcv_nxt = tp->rcv_nxt; -if (tp->compressed_ack >TCP_FASTRETRANS_THRESH ) -NET_ADD_STATS (sock_net (sk),LINUX_MIB_TCPACKCOMPRESSED , - tp->compressed_ack -TCP_FASTRETRANS_THRESH ); - tp->compressed_ack =0 ; + tp->dup_ack_counter =0 ; } - -if (++tp->compressed_ack <=TCP_FASTRETRANS_THRESH ) +if (tp->dup_ack_counter <TCP_FASTRETRANS_THRESH ) { + tp->dup_ack_counter++; goto send_now; - + } + tp->compressed_ack++;if (hrtimer_is_queued (&tp->compressed_ack_timer))return ;
net/ipv4/tcp_output.c +3 -3
@@ -184,10 +184,10 @@ static inline void tcp_event_ack_sent(struct sock *sk, unsigned int pkts, {struct tcp_sock *tp =tcp_sk (sk); -if (unlikely (tp->compressed_ack >TCP_FASTRETRANS_THRESH )) { +if (unlikely (tp->compressed_ack)) {NET_ADD_STATS (sock_net (sk),LINUX_MIB_TCPACKCOMPRESSED , - tp->compressed_ack -TCP_FASTRETRANS_THRESH ); - tp->compressed_ack =TCP_FASTRETRANS_THRESH ; + tp->compressed_ack); + tp->compressed_ack =0 ;if (hrtimer_try_to_cancel (&tp->compressed_ack_timer) ==1 )__sock_put (sk); }
net/ipv4/tcp_timer.c +7 -1
@@ -753,8 +753,14 @@ static enum hrtimer_restart tcp_compressed_ack_kick(struct hrtimer *timer)bh_lock_sock (sk);if (!sock_owned_by_user (sk)) { -if (tp->compressed_ack >TCP_FASTRETRANS_THRESH ) +if (tp->compressed_ack) { +/* Since we have to send one ack finally, +* substract one from tp->compressed_ack to keep +* LINUX_MIB_TCPACKCOMPRESSED accurate. +*/ + tp->compressed_ack--;tcp_send_ack (sk); + } }else {if (!test_and_set_bit (TCP_DELACK_TIMER_DEFERRED , &sk->sk_tsq_flags))
Signature · 1 line
2.26.2.303.gf8c07b1a785-goog
PATCH 2/3 tcp: tcp_sack_new_ofo_skb() should be more conservative
In reply to Eric DumazetCurrently, tcp_sack_new_ofo_skb() sends an ack if prior acks were 'compressed', if room has to be made in tp->selective_acks[]
But there is no guarantee all four sack ranges can be included in SACK option. As a matter of fact, when TCP timestamps option is used, only three SACK ranges can be included.
Lets assume only two ranges can be included, and force the ack:
- When we touch more than 2 ranges in the reordering done if tcp_sack_extend() could be done.
- If we have at least 2 ranges when adding a new one.
This enforces that before a range is in third or fourth position, at least one ACK packet included it in first/second position.
--- net/ipv4/tcp_input.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
net/ipv4/tcp_input.c +11 -1
@@ -4348,6 +4348,12 @@ static void tcp_sack_compress_send_ack(struct sock *sk)tcp_send_ack (sk); } +/* Reasonable amount of sack blocks included in TCP SACK option +* The max is 4, but this becomes 3 if TCP timestamps are there. +* Given that SACK packets might be lost, be conservative and use 2. +*/ +#define TCP_SACK_BLOCKS_EXPECTED 2 +static void tcp_sack_new_ofo_skb (struct sock *sk,u32 seq,u32 end_seq) {struct tcp_sock *tp =tcp_sk (sk);
@@ -4360,6 +4366,8 @@ static void tcp_sack_new_ofo_skb(struct sock *sk, u32 seq, u32 end_seq)for (this_sack =0 ; this_sack < cur_sacks; this_sack++, sp++) {if (tcp_sack_extend (sp, seq, end_seq)) { +if (this_sack >=TCP_SACK_BLOCKS_EXPECTED ) +tcp_sack_compress_send_ack (sk);/* Rotate this_sack to the first one. */ for (; this_sack >0 ; this_sack--, sp--)swap (*sp, *(sp -1 ));
@@ -4369,6 +4377,9 @@ static void tcp_sack_new_ofo_skb(struct sock *sk, u32 seq, u32 end_seq) } } +if (this_sack >=TCP_SACK_BLOCKS_EXPECTED ) +tcp_sack_compress_send_ack (sk); +/* Could not find an adjacent existing SACK, build a new one, * put it at the front, and shift everyone else down. We * always know there is at least one SACK present already here.
@@ -4376,7 +4387,6 @@ static void tcp_sack_new_ofo_skb(struct sock *sk, u32 seq, u32 end_seq)* If the sack array is full, forget about the last one. */ if (this_sack >=TCP_NUM_SACKS ) { -tcp_sack_compress_send_ack (sk); this_sack--; tp->rx_opt.num_sacks--; sp--;
Signature · 1 line
2.26.2.303.gf8c07b1a785-goog
PATCH 3/3 tcp: add hrtimer slack to sack compression
In reply to Eric DumazetAdd a sysctl to control hrtimer slack, default of 100 usec.
This gives the opportunity to reduce system overhead, and help very short RTT flows.
--- Documentation/networking/ip-sysctl.rst | 8 ++++++++ include/net/netns/ipv4.h | 1 + net/ipv4/sysctl_net_ipv4.c | 7 +++++++ net/ipv4/tcp_input.c | 5 +++-- net/ipv4/tcp_ipv4.c | 1 + 5 files changed, 20 insertions(+), 2 deletions(-)
Documentation/networking/ip-sysctl.rst +8 -0
@@ -651,6 +651,14 @@ tcp_comp_sack_delay_ns - LONG INTEGER Default : 1,000,000 ns (1 ms) +tcp_comp_sack_slack_ns - LONG INTEGER + This sysctl control the slack used when arming the + timer used by SACK compression. This gives extra time + for small RTT flows, and reduces system overhead by allowing + opportunistic reduction of timer interrupts. + + Default : 100,000 ns (100 us) + tcp_comp_sack_nr - INTEGER Max number of SACK that can be compressed. Using 0 disables SACK compression.
include/net/netns/ipv4.h +1 -0
@@ -173,6 +173,7 @@ struct netns_ipv4 {int sysctl_tcp_rmem[3 ];int sysctl_tcp_comp_sack_nr;unsigned long sysctl_tcp_comp_sack_delay_ns; +unsigned long sysctl_tcp_comp_sack_slack_ns;struct inet_timewait_death_row tcp_death_row;int sysctl_max_syn_backlog;int sysctl_tcp_fastopen;
net/ipv4/sysctl_net_ipv4.c +7 -0
@@ -1329,6 +1329,13 @@ static struct ctl_table ipv4_net_table[] = { .mode = 0644, .proc_handler = proc_doulongvec_minmax, }, + { + .procname = "tcp_comp_sack_slack_ns", + .data = &init_net.ipv4.sysctl_tcp_comp_sack_slack_ns, + .maxlen = sizeof(unsigned long), + .mode = 0644, + .proc_handler = proc_doulongvec_minmax, + }, { .procname = "tcp_comp_sack_nr", .data = &init_net.ipv4.sysctl_tcp_comp_sack_nr,
net/ipv4/tcp_input.c +3 -2
@@ -5324,8 +5324,9 @@ static void __tcp_ack_snd_check(struct sock *sk, int ofo_possible) delay = min_t(unsigned long, sock_net(sk)->ipv4.sysctl_tcp_comp_sack_delay_ns, rtt * (NSEC_PER_USEC >>3 )/20 );sock_hold (sk); -hrtimer_start (&tp->compressed_ack_timer,ns_to_ktime (delay), -HRTIMER_MODE_REL_PINNED_SOFT ); +hrtimer_start_range_ns (&tp->compressed_ack_timer,ns_to_ktime (delay), +sock_net (sk)->ipv4.sysctl_tcp_comp_sack_slack_ns, +HRTIMER_MODE_REL_PINNED_SOFT ); }static inline void tcp_ack_snd_check (struct sock *sk)
net/ipv4/tcp_ipv4.c +1 -0
@@ -2780,6 +2780,7 @@ static int __net_init tcp_sk_init(struct net *net) sizeof(init_net.ipv4.sysctl_tcp_wmem)); } net->ipv4.sysctl_tcp_comp_sack_delay_ns =NSEC_PER_MSEC ; + net->ipv4.sysctl_tcp_comp_sack_slack_ns =100 *NSEC_PER_USEC ; net->ipv4.sysctl_tcp_comp_sack_nr =44 ; net->ipv4.sysctl_tcp_fastopen =TFO_CLIENT_ENABLE ;spin_lock_init (&net->ipv4.tcp_fastopen_ctx_lock);
Signature · 1 line
2.26.2.303.gf8c07b1a785-goog
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Thu, 30 Apr 2020 10:35:40 -0700
Quoted 5 lines
Patch series refines SACK compression.
We had issues with missing SACK when TCP option space is tight.
Uses hrtimer slack to improve performance.
Series applied, thanks Eric.