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

tcp: track last lost bytes in sack sb

Browse Source 
Type:feature

Change-Id: I687809ebcc759cec8cb1d5c3b2b7e6bc995a7985
Signed-off-by: Florin Coras <fcoras@cisco.com>
This commit is contained in:
Florin Coras
2019-07-05 18:31:54 -07:00
committed by Dave Wallace
parent 24cbf77f9f
commit b3f58e1049
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/vnet/tcp/tcp.h
View File

@ -183,6 +183,7 @@ typedef struct _sack_scoreboard
u32 high_rxt; /**< Highest retransmitted sequence */ u32 high_rxt; /**< Highest retransmitted sequence */
u32 rescue_rxt; /**< Rescue sequence number */ u32 rescue_rxt; /**< Rescue sequence number */
u32 lost_bytes; /**< Bytes lost as per RFC6675 */ u32 lost_bytes; /**< Bytes lost as per RFC6675 */
u32 last_lost_bytes; /**< Number of bytes last lost */
u32 cur_rxt_hole; /**< Retransmitting from this hole */ u32 cur_rxt_hole; /**< Retransmitting from this hole */
#if TCP_SCOREBOARD_TRACE #if TCP_SCOREBOARD_TRACE

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

@ -775,6 +775,7 @@ scoreboard_update_bytes (tcp_connection_t * tc, sack_scoreboard_t * sb)
sack_scoreboard_hole_t *left, *right; sack_scoreboard_hole_t *left, *right;
u32 bytes = 0, blks = 0; u32 bytes = 0, blks = 0;
sb->last_lost_bytes = 0;
sb->lost_bytes = 0; sb->lost_bytes = 0;
sb->sacked_bytes = 0; sb->sacked_bytes = 0;
left = scoreboard_last_hole (sb); left = scoreboard_last_hole (sb);
@ -803,6 +804,7 @@ scoreboard_update_bytes (tcp_connection_t * tc, sack_scoreboard_t * sb)
do do
{ {
sb->lost_bytes += scoreboard_hole_bytes (right); sb->lost_bytes += scoreboard_hole_bytes (right);
sb->last_lost_bytes += left->is_lost ? 0 : left->end - left->start;
left->is_lost = 1; left->is_lost = 1;
left = scoreboard_prev_hole (sb, right); left = scoreboard_prev_hole (sb, right);
if (left) if (left)
@ -914,6 +916,7 @@ scoreboard_clear (sack_scoreboard_t * sb)
sb->high_sacked = 0; sb->high_sacked = 0;
sb->high_rxt = 0; sb->high_rxt = 0;
sb->lost_bytes = 0; sb->lost_bytes = 0;
sb->last_lost_bytes = 0;
sb->cur_rxt_hole = TCP_INVALID_SACK_HOLE_INDEX; sb->cur_rxt_hole = TCP_INVALID_SACK_HOLE_INDEX;
} }
#endif /* CLIB_MARCH_VARIANT */ #endif /* CLIB_MARCH_VARIANT */
@ -934,13 +937,14 @@ tcp_scoreboard_is_sane_post_recovery (tcp_connection_t * tc)
} }
#ifndef CLIB_MARCH_VARIANT #ifndef CLIB_MARCH_VARIANT
void void
tcp_rcv_sacks (tcp_connection_t * tc, u32 ack) tcp_rcv_sacks (tcp_connection_t * tc, u32 ack)
{ {
sack_scoreboard_t *sb = &tc->sack_sb;
sack_block_t *blk, tmp;
sack_scoreboard_hole_t *hole, *next_hole, *last_hole; sack_scoreboard_hole_t *hole, *next_hole, *last_hole;
u32 blk_index = 0, old_sacked_bytes, hole_index; u32 blk_index = 0, old_sacked_bytes, hole_index;
sack_scoreboard_t *sb = &tc->sack_sb;
sack_block_t *blk, tmp;
int i, j; int i, j;
sb->last_sacked_bytes = 0; sb->last_sacked_bytes = 0;
@ -1055,7 +1059,6 @@ tcp_rcv_sacks (tcp_connection_t * tc, u32 ack)
sb->last_bytes_delivered += sb->high_sacked - hole->end; sb->last_bytes_delivered += sb->high_sacked - hole->end;
} }
} }
scoreboard_remove_hole (sb, hole); scoreboard_remove_hole (sb, hole);
hole = next_hole; hole = next_hole;
} }
@ -1102,6 +1105,7 @@ tcp_rcv_sacks (tcp_connection_t * tc, u32 ack)
scoreboard_update_bytes (tc, sb); scoreboard_update_bytes (tc, sb);
sb->last_sacked_bytes = sb->sacked_bytes sb->last_sacked_bytes = sb->sacked_bytes
- (old_sacked_bytes - sb->last_bytes_delivered); - (old_sacked_bytes - sb->last_bytes_delivered);
ASSERT (sb->last_sacked_bytes <= sb->sacked_bytes || tcp_in_recovery (tc)); ASSERT (sb->last_sacked_bytes <= sb->sacked_bytes || tcp_in_recovery (tc));
ASSERT (sb->sacked_bytes == 0 || tcp_in_recovery (tc) ASSERT (sb->sacked_bytes == 0 || tcp_in_recovery (tc)
|| sb->sacked_bytes < tc->snd_nxt - seq_max (tc->snd_una, ack)); || sb->sacked_bytes < tc->snd_nxt - seq_max (tc->snd_una, ack));
@ -1109,6 +1113,8 @@ tcp_rcv_sacks (tcp_connection_t * tc, u32 ack)
- seq_max (tc->snd_una, ack) || tcp_in_recovery (tc)); - seq_max (tc->snd_una, ack) || tcp_in_recovery (tc));
ASSERT (sb->head == TCP_INVALID_SACK_HOLE_INDEX || tcp_in_recovery (tc) ASSERT (sb->head == TCP_INVALID_SACK_HOLE_INDEX || tcp_in_recovery (tc)
|| sb->holes[sb->head].start == ack + sb->snd_una_adv); || sb->holes[sb->head].start == ack + sb->snd_una_adv);
ASSERT (sb->last_lost_bytes <= sb->lost_bytes);
TCP_EVT_DBG (TCP_EVT_CC_SCOREBOARD, tc); TCP_EVT_DBG (TCP_EVT_CC_SCOREBOARD, tc);
} }
#endif /* CLIB_MARCH_VARIANT */ #endif /* CLIB_MARCH_VARIANT */