Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tcp: reset fin-wait-2 timeout connections
[vpp.git]
/
src
/
vnet
/
tcp
/
tcp_cubic.c
diff --git
a/src/vnet/tcp/tcp_cubic.c
b/src/vnet/tcp/tcp_cubic.c
index
0b4226d
..
b79ef83
100644
(file)
--- a/
src/vnet/tcp/tcp_cubic.c
+++ b/
src/vnet/tcp/tcp_cubic.c
@@
-23,10
+23,12
@@
typedef struct cubic_cfg_
{
u8 fast_convergence;
typedef struct cubic_cfg_
{
u8 fast_convergence;
+ u32 ssthresh;
} cubic_cfg_t;
static cubic_cfg_t cubic_cfg = {
.fast_convergence = 1,
} cubic_cfg_t;
static cubic_cfg_t cubic_cfg = {
.fast_convergence = 1,
+ .ssthresh = 0x7FFFFFFFU,
};
typedef struct cubic_data_
};
typedef struct cubic_data_
@@
-103,6
+105,7
@@
cubic_congestion (tcp_connection_t * tc)
cd->w_max = w_max;
tc->ssthresh = clib_max (tc->cwnd * beta_cubic, 2 * tc->snd_mss);
cd->w_max = w_max;
tc->ssthresh = clib_max (tc->cwnd * beta_cubic, 2 * tc->snd_mss);
+ tc->cwnd = tc->ssthresh;
}
static void
}
static void
@@
-110,11
+113,10
@@
cubic_loss (tcp_connection_t * tc)
{
cubic_data_t *cd = (cubic_data_t *) tcp_cc_data (tc);
{
cubic_data_t *cd = (cubic_data_t *) tcp_cc_data (tc);
- tc->ssthresh = clib_max (tc->cwnd * beta_cubic, 2 * tc->snd_mss);
tc->cwnd = tcp_loss_wnd (tc);
cd->t_start = cubic_time (tc->c_thread_index);
cd->K = 0;
tc->cwnd = tcp_loss_wnd (tc);
cd->t_start = cubic_time (tc->c_thread_index);
cd->K = 0;
- cd->w_max =
0
;
+ cd->w_max =
tc->cwnd / tc->snd_mss
;
}
static void
}
static void
@@
-155,7
+157,7
@@
cubic_rcv_ack (tcp_connection_t * tc, tcp_rate_sample_t * rs)
if (tcp_in_slowstart (tc))
{
if (tcp_in_slowstart (tc))
{
- tc->cwnd +=
clib_min (tc->snd_mss, tc->bytes_acked)
;
+ tc->cwnd +=
tc->bytes_acked
;
return;
}
return;
}
@@
-200,7
+202,7
@@
static void
cubic_conn_init (tcp_connection_t * tc)
{
cubic_data_t *cd = (cubic_data_t *) tcp_cc_data (tc);
cubic_conn_init (tcp_connection_t * tc)
{
cubic_data_t *cd = (cubic_data_t *) tcp_cc_data (tc);
- tc->ssthresh =
tc->snd_wnd
;
+ tc->ssthresh =
cubic_cfg.ssthresh
;
tc->cwnd = tcp_initial_cwnd (tc);
cd->w_max = 0;
cd->K = 0;
tc->cwnd = tcp_initial_cwnd (tc);
cd->w_max = 0;
cd->K = 0;
@@
-210,6
+212,8
@@
cubic_conn_init (tcp_connection_t * tc)
static uword
cubic_unformat_config (unformat_input_t * input)
{
static uword
cubic_unformat_config (unformat_input_t * input)
{
+ u32 ssthresh = 0x7FFFFFFFU;
+
if (!input)
return 0;
if (!input)
return 0;
@@
-219,6
+223,8
@@
cubic_unformat_config (unformat_input_t * input)
{
if (unformat (input, "no-fast-convergence"))
cubic_cfg.fast_convergence = 0;
{
if (unformat (input, "no-fast-convergence"))
cubic_cfg.fast_convergence = 0;
+ else if (unformat (input, "ssthresh %u", &ssthresh))
+ cubic_cfg.ssthresh = ssthresh;
else
return 0;
}
else
return 0;
}