Page MenuHomeFreeBSD
Files F151941021

D48236.id.diff
No OneTemporary
Actions

D48236.id.diff
View Options

diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c
--- a/sys/netinet/tcp_sack.c
+++ b/sys/netinet/tcp_sack.c
@@ -653,8 +653,6 @@
* scoreboard).
*/
tp->snd_fack = SEQ_MAX(tp->snd_una, th_ack);
- tp->sackhint.sacked_bytes = 0; /* reset */
- tp->sackhint.hole_bytes = 0;
}
/*
* In the while-loop below, incoming SACK blocks (sack_blocks[]) and
@@ -870,12 +868,26 @@
}
}
- KASSERT(!(TAILQ_EMPTY(&tp->snd_holes) && (tp->sackhint.hole_bytes != 0)),
- ("SACK scoreboard empty, but accounting non-zero\n"));
-
+ KASSERT(delivered_data >= 0, ("delivered_data < 0"));
KASSERT(notlost_bytes <= tp->sackhint.hole_bytes,
("SACK: more bytes marked notlost than in scoreboard holes"));
+ if (TAILQ_EMPTY(&tp->snd_holes)) {
+ KASSERT(tp->sackhint.hole_bytes == 0,
+ ("SACK scoreboard empty, but accounting non-zero\n"));
+ tp->sackhint.sack_bytes_rexmit = 0;
+ tp->sackhint.sacked_bytes = 0;
+ tp->sackhint.lost_bytes = 0;
+ } else {
+ KASSERT(tp->sackhint.hole_bytes > 0,
+ ("SACK scoreboard not empty, but has no bytes\n"));
+ tp->sackhint.delivered_data = delivered_data;
+ tp->sackhint.sacked_bytes += delivered_data - left_edge_delta;
+ KASSERT((tp->sackhint.sacked_bytes >= 0), ("sacked_bytes < 0"));
+ tp->sackhint.lost_bytes = tp->sackhint.hole_bytes -
+ notlost_bytes;
+ }
+
if (!(to->to_flags & TOF_SACK))
/*
* If this ACK did not contain any
@@ -886,11 +898,6 @@
* for RFC6675 rescue retransmission.
*/
sack_changed = SACK_NOCHANGE;
- tp->sackhint.delivered_data = delivered_data;
- tp->sackhint.sacked_bytes += delivered_data - left_edge_delta;
- tp->sackhint.lost_bytes = tp->sackhint.hole_bytes - notlost_bytes;
- KASSERT((delivered_data >= 0), ("delivered_data < 0"));
- KASSERT((tp->sackhint.sacked_bytes >= 0), ("sacked_bytes < 0"));
return (sack_changed);
}

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 12, 4:02 PM (21 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31357512
Default Alt Text
D48236.id.diff (1 KB)

Event Timeline