Date: Mon, 14 Jun 2021 09:01:24 GMT From: Michael Tuexen <tuexen@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 82f75079f188 - stable/13 - tcp: fix two bugs in new reno Message-ID: <202106140901.15E91OKY049883@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=82f75079f188d15c4a2ab5eb4bdbe0414b7f7f34 commit 82f75079f188d15c4a2ab5eb4bdbe0414b7f7f34 Author: Michael Tuexen <tuexen@FreeBSD.org> AuthorDate: 2021-06-11 13:37:39 +0000 Commit: Michael Tuexen <tuexen@FreeBSD.org> CommitDate: 2021-06-13 23:29:14 +0000 tcp: fix two bugs in new reno * Completely initialise the CC module specific data * Use beta_ecn in case of an ECN event whenever ABE is enabled or it is requested by the stack. Reviewed by: rscheff, rrs Sponsored by: Netflix, Inc. (cherry picked from commit fa3746be4203fc9a3414afb21d964eec8bad74f8) --- sys/netinet/cc/cc_newreno.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netinet/cc/cc_newreno.c b/sys/netinet/cc/cc_newreno.c index 55cab36e149a..1ebd6200befd 100644 --- a/sys/netinet/cc/cc_newreno.c +++ b/sys/netinet/cc/cc_newreno.c @@ -111,6 +111,7 @@ newreno_malloc(struct cc_var *ccv) /* NB: nreno is not zeroed, so initialise all fields. */ nreno->beta = V_newreno_beta; nreno->beta_ecn = V_newreno_beta_ecn; + nreno->newreno_flags = 0; ccv->cc_data = nreno; } @@ -254,8 +255,9 @@ newreno_cong_signal(struct cc_var *ccv, uint32_t type) * has set a flag in our newreno_flags (due to pacing) telling * us to use the lower valued back-off. */ - if (V_cc_do_abe || - (nreno && (nreno->newreno_flags & CC_NEWRENO_BETA_ECN) && (type == CC_ECN))) + if ((type == CC_ECN) && + (V_cc_do_abe || + ((nreno != NULL) && (nreno->newreno_flags & CC_NEWRENO_BETA_ECN)))) factor = beta_ecn; else factor = beta;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106140901.15E91OKY049883>