Page MenuHomeFreeBSD
Files F115904014

D28813.diff
No OneTemporary
Actions

D28813.diff
View Options

diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -2570,8 +2570,8 @@
if (V_tcp_do_prr &&
IN_FASTRECOVERY(tp->t_flags) &&
(tp->t_flags & TF_SACK_PERMIT)) {
- long snd_cnt = 0, limit = 0;
- long del_data = 0, pipe = 0;
+ int snd_cnt = 0, limit = 0;
+ int del_data = 0, pipe = 0;
/*
* In a duplicate ACK del_data is only the
* diff_in_sack. If no SACK is used del_data
@@ -2588,39 +2588,29 @@
if (pipe > tp->snd_ssthresh) {
if (tp->sackhint.recover_fs == 0)
tp->sackhint.recover_fs =
- max(1, tp->snd_nxt - tp->snd_una);
- snd_cnt = (tp->sackhint.prr_delivered *
- tp->snd_ssthresh /
- tp->sackhint.recover_fs) +
- 1 - tp->sackhint.sack_bytes_rexmit;
+ imax(1, tp->snd_nxt - tp->snd_una);
+ snd_cnt = howmany((long)tp->sackhint.prr_delivered *
+ tp->snd_ssthresh, tp->sackhint.recover_fs) -
+ tp->sackhint.sack_bytes_rexmit;
} else {
if (V_tcp_do_prr_conservative)
limit = tp->sackhint.prr_delivered -
tp->sackhint.sack_bytes_rexmit;
else
- if ((tp->sackhint.prr_delivered -
- tp->sackhint.sack_bytes_rexmit) >
- del_data)
- limit = tp->sackhint.prr_delivered -
- tp->sackhint.sack_bytes_rexmit +
- maxseg;
- else
- limit = del_data + maxseg;
- if ((tp->snd_ssthresh - pipe) < limit)
- snd_cnt = tp->snd_ssthresh - pipe;
- else
- snd_cnt = limit;
+ limit = imax(tp->sackhint.prr_delivered -
+ tp->sackhint.sack_bytes_rexmit,
+ del_data) + maxseg;
+ snd_cnt = imin(tp->snd_ssthresh - pipe, limit);
}
- snd_cnt = max((snd_cnt / maxseg), 0);
+ snd_cnt = imax(snd_cnt, 0) / maxseg;
/*
* Send snd_cnt new data into the network in
* response to this ACK. If there is a going
* to be a SACK retransmission, adjust snd_cwnd
* accordingly.
*/
- tp->snd_cwnd = tp->snd_nxt - tp->snd_recover +
- tp->sackhint.sack_bytes_rexmit +
- (snd_cnt * maxseg);
+ tp->snd_cwnd = imax(maxseg, tp->snd_nxt - tp->snd_recover +
+ tp->sackhint.sack_bytes_rexmit + (snd_cnt * maxseg));
} else if ((tp->t_flags & TF_SACK_PERMIT) &&
IN_FASTRECOVERY(tp->t_flags)) {
int awnd;
@@ -3948,7 +3938,7 @@
void
tcp_prr_partialack(struct tcpcb *tp, struct tcphdr *th)
{
- long snd_cnt = 0, limit = 0, del_data = 0, pipe = 0;
+ int snd_cnt = 0, limit = 0, del_data = 0, pipe = 0;
int maxseg = tcp_maxseg(tp);
INP_WLOCK_ASSERT(tp->t_inpcb);
@@ -3974,29 +3964,27 @@
if (pipe > tp->snd_ssthresh) {
if (tp->sackhint.recover_fs == 0)
tp->sackhint.recover_fs =
- max(1, tp->snd_nxt - tp->snd_una);
- snd_cnt = (tp->sackhint.prr_delivered * tp->snd_ssthresh /
- tp->sackhint.recover_fs) - tp->sackhint.sack_bytes_rexmit;
+ imax(1, tp->snd_nxt - tp->snd_una);
+ snd_cnt = howmany((long)tp->sackhint.prr_delivered *
+ tp->snd_ssthresh, tp->sackhint.recover_fs) -
+ tp->sackhint.sack_bytes_rexmit;
} else {
if (V_tcp_do_prr_conservative)
limit = tp->sackhint.prr_delivered -
tp->sackhint.sack_bytes_rexmit;
else
- if ((tp->sackhint.prr_delivered -
- tp->sackhint.sack_bytes_rexmit) > del_data)
- limit = tp->sackhint.prr_delivered -
- tp->sackhint.sack_bytes_rexmit + maxseg;
- else
- limit = del_data + maxseg;
- snd_cnt = min((tp->snd_ssthresh - pipe), limit);
+ limit = imax(tp->sackhint.prr_delivered -
+ tp->sackhint.sack_bytes_rexmit,
+ del_data) + maxseg;
+ snd_cnt = imin((tp->snd_ssthresh - pipe), limit);
}
- snd_cnt = max((snd_cnt / maxseg), 0);
+ snd_cnt = imax(snd_cnt, 0) / maxseg;
/*
* Send snd_cnt new data into the network in response to this ack.
* If there is going to be a SACK retransmission, adjust snd_cwnd
* accordingly.
*/
- tp->snd_cwnd = max(maxseg, (int64_t)tp->snd_nxt - tp->snd_recover +
+ tp->snd_cwnd = imax(maxseg, tp->snd_nxt - tp->snd_recover +
tp->sackhint.sack_bytes_rexmit + (snd_cnt * maxseg));
tp->t_flags |= TF_ACKNOW;
(void) tcp_output(tp);

File Metadata

Mime Type
text/plain
Expires
Thu, May 1, 5:46 AM (7 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17874264
Default Alt Text
D28813.diff (4 KB)

Event Timeline