X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ftcp%2Ftcp.c;h=ad9bbff5c0e4fd7d7b0cbcaadddf8db40550b6d2;hb=1146ff4bcd336d8efc19405f1d83914e6115a01f;hp=bd3a4c1160af06e79640d46abda0712f41db8d4c;hpb=4e1fcf49057b6bd9b4a3a32a8da20a721536c247;p=vpp.git diff --git a/src/vnet/tcp/tcp.c b/src/vnet/tcp/tcp.c index bd3a4c1160a..ad9bbff5c0e 100644 --- a/src/vnet/tcp/tcp.c +++ b/src/vnet/tcp/tcp.c @@ -1165,6 +1165,8 @@ static transport_connection_t * tcp_session_get_transport (u32 conn_index, u32 thread_index) { tcp_connection_t *tc = tcp_connection_get (conn_index, thread_index); + if (PREDICT_FALSE (!tc)) + return 0; return &tc->connection; } @@ -1175,6 +1177,17 @@ tcp_half_open_session_get_transport (u32 conn_index) return &tc->connection; } +static u16 +tcp_session_cal_goal_size (tcp_connection_t * tc) +{ + u16 goal_size = tc->snd_mss; + + goal_size = TCP_MAX_GSO_SZ - tc->snd_mss % TCP_MAX_GSO_SZ; + goal_size = clib_min (goal_size, tc->snd_wnd / 2); + + return goal_size; +} + /** * Compute maximum segment size for session layer. * @@ -1192,6 +1205,11 @@ tcp_session_send_mss (transport_connection_t * trans_conn) * the current state of the connection. */ tcp_update_burst_snd_vars (tc); + if (PREDICT_FALSE (tc->is_tso)) + { + return tcp_session_cal_goal_size (tc); + } + return tc->snd_mss; } @@ -1587,6 +1605,7 @@ tcp_configuration_init (void) tcp_cfg.initial_cwnd_multiplier = 0; tcp_cfg.enable_tx_pacing = 1; tcp_cfg.cc_algo = TCP_CC_NEWRENO; + tcp_cfg.rwnd_min_update_ack = 1; /* Time constants defined as timer tick (100ms) multiples */ tcp_cfg.delack_time = 1; /* 0.1s */ @@ -1698,6 +1717,9 @@ tcp_config_fn (vlib_main_t * vm, unformat_input_t * input) tcp_cfg.min_rx_fifo = memory_size; else if (unformat (input, "mtu %u", &tcp_cfg.default_mtu)) ; + else if (unformat (input, "rwnd-min-update-ack %d", + &tcp_cfg.rwnd_min_update_ack)) + ; else if (unformat (input, "initial-cwnd-multiplier %u", &tcp_cfg.initial_cwnd_multiplier)) ;