d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve two KASSERTs in the TCP RACK stack.

Browse Source 
There are two locations where an always true comparison was made in
a KASSERT. Replace this by an appropriate check and use a consistent
panic message. Also use this code when checking a similar condition.

PR:			229664
Reviewed by:		rrs@
MFC after:		1 week
Sponsored by:		Netflix, Inc.
Differential Revision:	https://reviews.freebsd.org/D18021
This commit is contained in:
tuexen 2018-11-21 18:19:15 +00:00
parent e9a5feab20
commit 3ca57eff63
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/netinet/tcp_stacks/rack.c
View File

@ -7053,12 +7053,10 @@ rack_output(struct tcpcb *tp)
tlen = rsm->r_end - rsm->r_start;
if (tlen > tp->t_maxseg)
tlen = tp->t_maxseg;
#ifdef INVARIANTS
if (SEQ_GT(tp->snd_una, rsm->r_start)) {
panic("tp:%p rack:%p snd_una:%u rsm:%p r_start:%u",
tp, rack, tp->snd_una, rsm, rsm->r_start);
}
#endif
KASSERT(SEQ_LEQ(tp->snd_una, rsm->r_start),
("%s:%d: r.start:%u < SND.UNA:%u; tp:%p, rack:%p, rsm:%p",
__func__, __LINE__,
rsm->r_start, tp->snd_una, tp, rack, rsm));
sb_offset = rsm->r_start - tp->snd_una;
cwin = min(tp->snd_wnd, tlen);
len = cwin;
@ -7069,12 +7067,14 @@ rack_output(struct tcpcb *tp)
len = rsm->r_end - rsm->r_start;
sack_rxmit = 1;
sendalot = 0;
KASSERT(SEQ_LEQ(tp->snd_una, rsm->r_start),
("%s:%d: r.start:%u < SND.UNA:%u; tp:%p, rack:%p, rsm:%p",
__func__, __LINE__,
rsm->r_start, tp->snd_una, tp, rack, rsm));
sb_offset = rsm->r_start - tp->snd_una;
if (len >= tp->t_maxseg) {
len = tp->t_maxseg;
}
KASSERT(sb_offset >= 0, ("%s: sack block to the left of una : %d",
__func__, sb_offset));
} else if ((rack->rc_in_persist == 0) &&
((rsm = tcp_rack_output(tp, rack, cts)) != NULL)) {
long tlen;
@ -7099,6 +7099,10 @@ rack_output(struct tcpcb *tp)
}
#endif
tlen = rsm->r_end - rsm->r_start;
KASSERT(SEQ_LEQ(tp->snd_una, rsm->r_start),
("%s:%d: r.start:%u < SND.UNA:%u; tp:%p, rack:%p, rsm:%p",
__func__, __LINE__,
rsm->r_start, tp->snd_una, tp, rack, rsm));
sb_offset = rsm->r_start - tp->snd_una;
if (tlen > rack->r_ctl.rc_prr_sndcnt) {
len = rack->r_ctl.rc_prr_sndcnt;
@ -7120,8 +7124,6 @@ rack_output(struct tcpcb *tp)
goto just_return_nolock;
}
}
KASSERT(sb_offset >= 0, ("%s: sack block to the left of una : %d",
__func__, sb_offset));
if (len > 0) {
sub_from_prr = 1;
sack_rxmit = 1;