net: TCP thin dupack
Subsystems (4)
PATCH v4 3/3 net: TCP thin dupack
Major changes:
-Renamed variables, ioctl and sysctl.
-Added sysctl documentation.
-Removed redundant allocation
--- Documentation/networking/ip-sysctl.txt | 12 ++++++++++++ include/linux/tcp.h | 4 +++- include/net/tcp.h | 1 + net/ipv4/sysctl_net_ipv4.c | 7 +++++++ net/ipv4/tcp.c | 7 +++++++ net/ipv4/tcp_input.c | 11 +++++++++++ 6 files changed, 41 insertions(+), 1 deletions(-)
Documentation/networking/ip-sysctl.txt +12 -0
@@ -499,6 +499,18 @@ tcp_thin_linear_timeouts - BOOLEAN Documentation/networking/tcp-thin.txt Default: 0 +tcp_thin_dupack - BOOLEAN + Enable dynamic triggering of retransmissions after one dupACK + for thin streams. If set, a check is performed upon reception + of a dupACK to determine if the stream is thin (less than 4 + packets in flight). As long as the stream is found to be thin, + data is retransmitted on the first received dupACK. This + improves retransmission latency for non-aggressive thin + streams, often found to be time-dependent. + For more information on thin streams, see + Documentation/networking/tcp-thin.txt + Default: 0 + UDP variables: udp_mem - vector of 3 INTEGERs: min, pressure, max
include/linux/tcp.h +3 -1
@@ -104,6 +104,7 @@ enum {#define TCP_MD5SIG 14/* TCP MD5 Signature (RFC2385) */ #define TCP_COOKIE_TRANSACTIONS 15/* TCP Cookie Transactions */ #define TCP_THIN_LINEAR_TIMEOUTS 16/* Use linear timeouts for thin streams*/ +#define TCP_THIN_DUPACK 17/* Fast retrans. after 1 dupack */ /* for TCP_INFO socket option */ #define TCPI_OPT_TIMESTAMPS 1
@@ -343,7 +344,8 @@ struct tcp_sock {u8 frto_counter;/* Number of new acks after RTO */ u8 nonagle;/* Disable Nagle algorithm? */ u8 thin_lto : 1,/* Use linear timeouts for thin streams */ - thin_undef : 7; + thin_dupack : 1,/* Fast retransmit on first dupack */ + thin_undef : 6;/* RTT measurement */ u32 srtt;/* smoothed round trip time << 3 */
include/net/tcp.h +1 -0
@@ -245,6 +245,7 @@ extern int sysctl_tcp_slow_start_after_idle;extern int sysctl_tcp_max_ssthresh;extern int sysctl_tcp_cookie_size;extern int sysctl_tcp_thin_linear_timeouts; +extern int sysctl_tcp_thin_dupack;extern atomic_t tcp_memory_allocated;extern struct percpu_counter tcp_sockets_allocated;
net/ipv4/sysctl_net_ipv4.c +7 -0
@@ -582,6 +582,13 @@ static struct ctl_table ipv4_table[] = { .mode = 0644, .proc_handler = proc_dointvec }, + { + .procname = "tcp_thin_dupack", + .data = &sysctl_tcp_thin_dupack, + .maxlen = sizeof(int), + .mode = 0644, + .proc_handler = proc_dointvec + }, { .procname = "udp_mem", .data = &sysctl_udp_mem,
net/ipv4/tcp.c +7 -0
@@ -2236,6 +2236,13 @@ static int do_tcp_setsockopt(struct sock *sk, int level, tp->thin_lto = val;break ; +case TCP_THIN_DUPACK : +if (val <0 || val >1 ) + err = -EINVAL ; +else + tp->thin_dupack = val; +break ; +case TCP_CORK :/* When set indicates to always queue non-full frames. * Later the user clears this option and we transmit
net/ipv4/tcp_input.c +11 -0
@@ -89,6 +89,8 @@ int sysctl_tcp_frto __read_mostly = 2;int sysctl_tcp_frto_response__read_mostly ;int sysctl_tcp_nometrics_save__read_mostly ; +int sysctl_tcp_thin_dupack__read_mostly ; +int sysctl_tcp_moderate_rcvbuf__read_mostly =1 ;int sysctl_tcp_abc__read_mostly ;
@@ -2447,6 +2449,15 @@ static int tcp_time_to_recover(struct sock *sk)return 1 ; } +/* If a thin stream is detected, retransmit after first +* received dupack. Employ only if SACK is supported in order +* to avoid possible corner-case series of spurious retransmissions +* Use only if there are no unsent data. */ +if ((tp->thin_dupack || sysctl_tcp_thin_dupack) && +tcp_stream_is_thin (tp) &&tcp_dupack_heuristics (tp) >1 && +tcp_is_sack (tp) && sk->sk_send_head ==NULL ) +return 1 ; +return 0 ; }
Signature · 1 line
1.6.3.3
David Miller
maintainerFrom: Andreas Petlund <[email protected]>
Date: Tue, 16 Feb 2010 15:40:46 +0100
Quoted 6 lines
Major changes:
-Renamed variables, ioctl and sysctl.
-Added sysctl documentation.
-Removed redundant allocationSigned-off-by Andreas Petlund <[email protected]>
Patches #2 and #3 look the same, what's going on here?
Thanks.
Quoted 8 lines · David Miller
From: Andreas Petlund <[email protected]>
Date: Tue, 16 Feb 2010 15:40:46 +0100Quoted 5 lines
Major changes:
-Renamed variables, ioctl and sysctl.
-Added sysctl documentation.
-Removed redundant allocation
Quoted 5 lines
Quoted 1 line
Signed-off-by Andreas Petlund <[email protected]>Patches #2 and #3 look the same, what's going on here?
Thanks.
The changes from v3 to v4 was basically in the naming. I changed names for the given variables both for patch #2 and patch #3. The removal of the unneeded allocation was also done for both patches. It seems also I have forgotten to include the general patch description for each patch. I will fix this for the next round of changes.
Cheers,
Andreas