ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tcp: avoid sack processing when not needed (VPP-1460)

Browse Source 
Change-Id: If81ee34e1f1e929de1a5b758ddb9aede4002e858
Signed-off-by: Florin Coras <fcoras@cisco.com>
This commit is contained in:
Florin Coras
2018-10-16 19:52:10 -07:00
committed by Marco Varlese
parent b3aff922ff
commit f1a1a4dbfc
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/unittest/tcp_test.c
View File

@ -1580,7 +1580,6 @@ tcp_test_lookup (vlib_main_t * vm, unformat_input_t * input)
tc->connection.proto = TRANSPORT_PROTO_TCP;
tc->connection.is_ip4 = 1;
clib_memcpy (tc1, &tc->connection, sizeof (*tc1));
s1 = s;
/*
* Allocate fake session and connection 2
@ -1607,6 +1606,7 @@ tcp_test_lookup (vlib_main_t * vm, unformat_input_t * input)
* Confirm that connection lookup works
*/
s1 = pool_elt_at_index (smm->sessions[0], 0);
session_lookup_add_connection (tc1, session_handle (s1));
tconn = session_lookup_connection_wt4 (0, &tc1->lcl_ip.ip4,
&tc1->rmt_ip.ip4,

6
src/vnet/tcp/tcp.c
View File

@ -939,9 +939,11 @@ format_tcp_scoreboard (u8 * s, va_list * args)
s = format (s, "sacked_bytes %u last_sacked_bytes %u lost_bytes %u\n",
sb->sacked_bytes, sb->last_sacked_bytes, sb->lost_bytes);
s = format (s, " last_bytes_delivered %u high_sacked %u snd_una_adv %u\n",
sb->last_bytes_delivered, sb->high_sacked, sb->snd_una_adv);
sb->last_bytes_delivered, sb->high_sacked - tc->iss,
sb->snd_una_adv);
s = format (s, " cur_rxt_hole %u high_rxt %u rescue_rxt %u",
sb->cur_rxt_hole, sb->high_rxt, sb->rescue_rxt);
sb->cur_rxt_hole, sb->high_rxt - tc->iss,
sb->rescue_rxt - tc->iss);
hole = scoreboard_first_hole (sb);
if (hole)

3
src/vnet/tcp/tcp_input.c
View File

@ -135,7 +135,8 @@ tcp_options_parse (tcp_header_t * th, tcp_options_t * to)
data = (const u8 *) (th + 1);
/* Zero out all flags but those set in SYN */
to->flags &= (TCP_OPTS_FLAG_SACK_PERMITTED | TCP_OPTS_FLAG_WSCALE);
to->flags &= (TCP_OPTS_FLAG_SACK_PERMITTED | TCP_OPTS_FLAG_WSCALE
| TCP_OPTS_FLAG_SACK);
for (; opts_len > 0; opts_len -= opt_len, data += opt_len)
{