From nobody Fri Jun 10 12:34:25 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 075D9843CBB; Fri, 10 Jun 2022 12:34:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LKL4f2t38z3w1H; Fri, 10 Jun 2022 12:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654864466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H6in4/dsUqujpBbDe2sR7mH+AvIT7fMHH5ngo3PjTb4=; b=lRNtHTLqWgwkR4+FkyrnT+MrA9Rbu1IVqxQHD5SzgrQla+XIp/abVTmyX0pJvYEUP2e8Nn n6uCKs+pSdmncdlO8b6lN/R7j56NUqVtuqA5cN6wL6ho1P38PWN5M23SZjdfN0Fhak4kWC gO9TswuS3xXkh+4tZtgnqxavRRhLmbQC2yRItuNDwrzadfbJAQSeWSesB3QjYvnVCIKCdi D+z1pQGZ0UDcNIxylKSNL/3MZ44IAa1wKreqHVH4TFHaOn0o+vZNICRnlUYhp0z5JuXCup 3P2w03lctoVSqe1YbgrTb3wETn7r1d3KqhzXj9gByfeQWrrYYYC077pmzDe1Bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 21E0118D8E; Fri, 10 Jun 2022 12:34:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25ACYQV4024099; Fri, 10 Jun 2022 12:34:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25ACYP6F024098; Fri, 10 Jun 2022 12:34:25 GMT (envelope-from git) Date: Fri, 10 Jun 2022 12:34:25 GMT Message-Id: <202206101234.25ACYP6F024098@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: fb61250b966f - stable/13 - rack: Fix a common typo in comments and a sysctl description List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fb61250b966f09852fb433689be1592d85304cb0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654864466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H6in4/dsUqujpBbDe2sR7mH+AvIT7fMHH5ngo3PjTb4=; b=SFp1DcnKwuhqgyhQDmVyun4x6AH6oSrDoddB4UmDmfa1jB3JNjmYyXq+jO7xEz1rs7NEln Q9Ic65NPcfv3PhyNEV0dUssiUeX01EfKSvKQnpKjUdGgCDHWDYUwz/t3E0kThpc0WZjLmm RX90jQYefConed6eE1JB/hJjLUdAqlS4TIDrAITtL/l4GAcUCLzgoGp8WoNg7RU1YxO5FR fC0vRo5bHwqGYf1vO8DMstLaUclG3KgXFjFxtrxOYp2ccTHoDnRv2qvBc1/nL8lInAEqU3 k8IN6YmPrmQDQsMDGLPb/3zYT9zQ/T9ewWn1XixJkpJAmXhE2Ldg0hNTUmwGjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654864466; a=rsa-sha256; cv=none; b=qCak84jvAE4p4A1L4mvHsskc7/5UJoDlW2Irz3nA01Zh8uXk9WvhJU4woI0/qyHlswEYhx dFg6cLQDq88oUy89yK9K1pfGhDDc+uNUIYDvMNsTMlxq2emiEYw8oZUjocg90w8zEJ8Q7Z Y3u9UXn2nLr1r2eQDxnFUYzd1/OjXK8d7RPFBh0sRnKLYQXIQUyXoUqk2cTEPlb/JFJtYK jy5E1ImaIPLbumz0YiqvnOeprkcKuHtI1NyCeVGiEdNPiIQb9LG2MZy+jhUPHLZrftgbX1 hyMQ0NUJVXKEFd+jwsY49wB8bkddp+8er6G17hxEeCZC1n5kr78ekZmWnR8p7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=fb61250b966f09852fb433689be1592d85304cb0 commit fb61250b966f09852fb433689be1592d85304cb0 Author: Gordon Bergling AuthorDate: 2022-06-04 15:56:56 +0000 Commit: Gordon Bergling CommitDate: 2022-06-10 12:32:35 +0000 rack: Fix a common typo in comments and a sysctl description - s/multipler/multiplier/ (cherry picked from commit 32a01b2b8691453b59a26cf273a5a5eae7643985) --- sys/netinet/tcp_stacks/rack.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index fe9743b82567..2f9ea65c5ec2 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -304,8 +304,8 @@ static int32_t rack_gp_per_bw_mul_down = 4; /* 4% */ static int32_t rack_gp_rtt_maxmul = 3; /* 3 x maxmin */ static int32_t rack_gp_rtt_minmul = 1; /* minrtt + (minrtt/mindiv) is lower rtt */ static int32_t rack_gp_rtt_mindiv = 4; /* minrtt + (minrtt * minmul/mindiv) is lower rtt */ -static int32_t rack_gp_decrease_per = 20; /* 20% decrease in multipler */ -static int32_t rack_gp_increase_per = 2; /* 2% increase in multipler */ +static int32_t rack_gp_decrease_per = 20; /* 20% decrease in multiplier */ +static int32_t rack_gp_increase_per = 2; /* 2% increase in multiplier */ static int32_t rack_per_lower_bound = 50; /* Don't allow to drop below this multiplier */ static int32_t rack_per_upper_bound_ss = 0; /* Don't allow SS to grow above this */ static int32_t rack_per_upper_bound_ca = 0; /* Don't allow CA to grow above this */ @@ -1112,7 +1112,7 @@ rack_init_sysctls(void) SYSCTL_CHILDREN(rack_timely), OID_AUTO, "rtt_max_mul", CTLFLAG_RW, &rack_gp_rtt_maxmul, 3, - "Rack timely multipler of lowest rtt for rtt_max"); + "Rack timely multiplier of lowest rtt for rtt_max"); SYSCTL_ADD_S32(&rack_sysctl_ctx, SYSCTL_CHILDREN(rack_timely), OID_AUTO, "rtt_min_div", CTLFLAG_RW, @@ -3217,7 +3217,7 @@ rack_bw_can_be_raised(struct tcp_rack *rack, uint64_t cur_bw, uint64_t last_bw_e * rate to push us faster there is no sense of * increasing. * - * We first caculate our actual pacing rate (ss or ca multipler + * We first caculate our actual pacing rate (ss or ca multiplier * times our cur_bw). * * Then we take the last measured rate and multipy by our @@ -3970,7 +3970,7 @@ rack_update_multiplier(struct tcp_rack *rack, int32_t timely_says, uint64_t last (rack->use_fixed_rate) || (rack->in_probe_rtt) || (rack->rc_always_pace == 0)) { - /* No dynamic GP multipler in play */ + /* No dynamic GP multiplier in play */ return; } losses = rack->r_ctl.rc_loss_count - rack->r_ctl.rc_loss_at_start; @@ -4137,7 +4137,7 @@ rack_make_timely_judgement(struct tcp_rack *rack, uint32_t rtt, int32_t rtt_diff log_rtt_a_diff |= (uint32_t)rtt_diff; if (rtt >= (get_filter_value_small(&rack->r_ctl.rc_gp_min_rtt) * rack_gp_rtt_maxmul)) { - /* Reduce the b/w multipler */ + /* Reduce the b/w multiplier */ timely_says = 2; log_mult = get_filter_value_small(&rack->r_ctl.rc_gp_min_rtt) * rack_gp_rtt_maxmul; log_mult <<= 32; @@ -4148,7 +4148,7 @@ rack_make_timely_judgement(struct tcp_rack *rack, uint32_t rtt, int32_t rtt_diff } else if (rtt <= (get_filter_value_small(&rack->r_ctl.rc_gp_min_rtt) + ((get_filter_value_small(&rack->r_ctl.rc_gp_min_rtt) * rack_gp_rtt_minmul) / max(rack_gp_rtt_mindiv , 1)))) { - /* Increase the b/w multipler */ + /* Increase the b/w multiplier */ log_mult = get_filter_value_small(&rack->r_ctl.rc_gp_min_rtt) + ((get_filter_value_small(&rack->r_ctl.rc_gp_min_rtt) * rack_gp_rtt_minmul) / max(rack_gp_rtt_mindiv , 1)); @@ -4175,13 +4175,13 @@ rack_make_timely_judgement(struct tcp_rack *rack, uint32_t rtt, int32_t rtt_diff if (rtt_diff <= 0) { /* * Rttdiff is less than zero, increase the - * b/w multipler (its 0 or negative) + * b/w multiplier (its 0 or negative) */ timely_says = 0; rack_log_timely(rack, timely_says, log_mult, get_filter_value_small(&rack->r_ctl.rc_gp_min_rtt), log_rtt_a_diff, __LINE__, 6); } else { - /* Reduce the b/w multipler */ + /* Reduce the b/w multiplier */ timely_says = 1; rack_log_timely(rack, timely_says, log_mult, get_filter_value_small(&rack->r_ctl.rc_gp_min_rtt), log_rtt_a_diff, __LINE__, 7); @@ -9563,7 +9563,7 @@ rack_check_bottom_drag(struct tcpcb *tp, * * This means we need to boost the b/w in * addition to any earlier boosting of - * the multipler. + * the multiplier. */ rack->rc_dragged_bottom = 1; rack_validate_multipliers_at_or_above100(rack);