From nobody Mon Mar 31 10:20:13 2025 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 4ZR6Zj68QSz5rnXG; Mon, 31 Mar 2025 10:20:13 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZR6Zj4Jl9z4DTm; Mon, 31 Mar 2025 10:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743416413; 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=3EKP3sIV78DRvgPCS7xlvwyYeqJz80RHx/PbonSeNUE=; b=hJO/vUfqFcGRCRySo0eSLa+YecYafUDGmE+4/3lshaYpB7pcLlFBbyD8wO5fpjQokz3aOq NxXIwaGoBHujp5MB904JRXcQIS759/UWGrvi0o68QPbtUg7/l5vvRlTScbUTInC4GgD915 CNGn0fJBGsFJKSKdPK3L0Z3/JJpV0a2RKwO9oQMOOVomeDUUcuOli2WM7nwJ9mZNewlx4/ Exf8MSOgLrmbXPMXg2MVbyPd8C4GHX9H2jv1E37EijSiu0pZsNiNAHdvQDGu67esWkqHZf eMC5+TITC6tWo47qeRyEhU3VS3xvKBBHPMuIqspkyUaOs3oU8TAfRfmdN0T+rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743416413; a=rsa-sha256; cv=none; b=fHA2/6R7UsNuVG3uSJ9YkGOm7gFJ5aqAVSy0Jn1TEFUS/hrvLC8hQ4Oegc/MYfBHjCzo92 zcgem386UiX2fMLTrPiXbJ8ObPBiYmYkZY0lg108nV7IVqfO4Kyum38KHM6e10iSsYvwPI +7h7hkM4HmFEoDldxraPL0z0wc+Po8mxVKIvv6S3TNPYLUub5+kaeYi4376reuE71Bz5H4 Gac7qYxYXag8zuCk5VDgN4+OCptBqN4q/9L0b+jOavHuYNmhmuSq7NTcgbdNw1ITaA7K/g qVEgqo8Ceb0vcmLpLDrIqIZ3pbHItdPF6oJmCHZ1di1V+8TBMxw9vgKBVq36/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743416413; 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=3EKP3sIV78DRvgPCS7xlvwyYeqJz80RHx/PbonSeNUE=; b=ejf6zpUc0YYbsUwlHnvSrpGytpAE+DKFfiAlXyqocjXvEqn0T+pA8vj03q/n0pBK5gjpCi XzSLZt93MRnwV4BXRjJlgFVO2J650bA4NE8XK5sbRM29Bkn0XPIVsIFbcBYANwpN+FnjI0 WoPDQUHkfSaKzWbuntmJI7EKVRfp0WBslx18AMtsbfLaztDLIX1yTxhQT8WkEQ1cD4PYRl bWgzsujjo62pPoH9JRBwNLX8AOy0qnDb/O4nqiz1/7nFP/TkdXYFwLojvGdjMfYICrg7mA CL9fYpeYSIWie1pR5EhWelPKsaDUXlX/BYxC5WlKjd7mTwAeQLQVAYClNfDclQ== 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 4ZR6Zj29m0zhHx; Mon, 31 Mar 2025 10:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52VAKDtO017659; Mon, 31 Mar 2025 10:20:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52VAKDH7017643; Mon, 31 Mar 2025 10:20:13 GMT (envelope-from git) Date: Mon, 31 Mar 2025 10:20:13 GMT Message-Id: <202503311020.52VAKDH7017643@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: f6deb9ea0a0e - main - tcp rack: cleanup storing values for beta and beta_ecn 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f6deb9ea0a0ee760e5ff9ad5c15d0bd7a1714355 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f6deb9ea0a0ee760e5ff9ad5c15d0bd7a1714355 commit f6deb9ea0a0ee760e5ff9ad5c15d0bd7a1714355 Author: Michael Tuexen AuthorDate: 2025-03-31 01:40:17 +0000 Commit: Michael Tuexen CommitDate: 2025-03-31 01:40:17 +0000 tcp rack: cleanup storing values for beta and beta_ecn beta and beta_ecn were stored using a variable of type struct newreno in struct rack_control. Later, struct newreno was extended and now contains several more fields. This results in a memory inefficiency and also in copying around uninitialized memory. This patch fixes this by storing beta and beta_ecn individually in struct rack_control. Please note that the newreno_flags field was only stored and never used. Therefore, this is not stored anymore in struct rack_control. No functional change intended. CID: 1523796 Reviewed by: rrs MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D49578 --- sys/netinet/tcp_stacks/rack.c | 45 +++++++++++++++++---------------------- sys/netinet/tcp_stacks/tcp_rack.h | 7 +++--- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 5a9171abeaf5..f5bc435890e7 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -618,8 +618,9 @@ rack_swap_beta_values(struct tcp_rack *rack, uint8_t flex8) { struct sockopt sopt; struct cc_newreno_opts opt; - struct newreno old; struct tcpcb *tp; + uint32_t old_beta; + uint32_t old_beta_ecn; int error, failed = 0; tp = rack->rc_tp; @@ -639,7 +640,6 @@ rack_swap_beta_values(struct tcp_rack *rack, uint8_t flex8) failed = 2; goto out; } - old.newreno_flags = CC_NEWRENO_BETA_ECN_ENABLED; /* Get the current values out */ sopt.sopt_valsize = sizeof(struct cc_newreno_opts); sopt.sopt_dir = SOPT_GET; @@ -649,33 +649,34 @@ rack_swap_beta_values(struct tcp_rack *rack, uint8_t flex8) failed = 3; goto out; } - old.beta = opt.val; + old_beta = opt.val; opt.name = CC_NEWRENO_BETA_ECN; error = CC_ALGO(tp)->ctl_output(&tp->t_ccv, &sopt, &opt); if (error) { failed = 4; goto out; } - old.beta_ecn = opt.val; + old_beta_ecn = opt.val; /* Now lets set in the values we have stored */ sopt.sopt_dir = SOPT_SET; opt.name = CC_NEWRENO_BETA; - opt.val = rack->r_ctl.rc_saved_beta.beta; + opt.val = rack->r_ctl.rc_saved_beta; error = CC_ALGO(tp)->ctl_output(&tp->t_ccv, &sopt, &opt); if (error) { failed = 5; goto out; } opt.name = CC_NEWRENO_BETA_ECN; - opt.val = rack->r_ctl.rc_saved_beta.beta_ecn; + opt.val = rack->r_ctl.rc_saved_beta_ecn; error = CC_ALGO(tp)->ctl_output(&tp->t_ccv, &sopt, &opt); if (error) { failed = 6; goto out; } /* Save off the values for restoral */ - memcpy(&rack->r_ctl.rc_saved_beta, &old, sizeof(struct newreno)); + rack->r_ctl.rc_saved_beta = old_beta; + rack->r_ctl.rc_saved_beta_ecn = old_beta_ecn; out: if (rack_verbose_logging && tcp_bblogging_on(rack->rc_tp)) { union tcp_log_stackspecific log; @@ -688,8 +689,8 @@ out: log.u_bbr.flex1 = ptr->beta; log.u_bbr.flex2 = ptr->beta_ecn; log.u_bbr.flex3 = ptr->newreno_flags; - log.u_bbr.flex4 = rack->r_ctl.rc_saved_beta.beta; - log.u_bbr.flex5 = rack->r_ctl.rc_saved_beta.beta_ecn; + log.u_bbr.flex4 = rack->r_ctl.rc_saved_beta; + log.u_bbr.flex5 = rack->r_ctl.rc_saved_beta_ecn; log.u_bbr.flex6 = failed; log.u_bbr.flex7 = rack->gp_ready; log.u_bbr.flex7 <<= 1; @@ -14608,7 +14609,6 @@ rack_init(struct tcpcb *tp, void **ptr) rack->r_ctl.rc_split_limit = V_tcp_map_split_limit; /* We want abe like behavior as well */ - rack->r_ctl.rc_saved_beta.newreno_flags |= CC_NEWRENO_BETA_ECN_ENABLED; rack->r_ctl.rc_reorder_fade = rack_reorder_fade; rack->rc_allow_data_af_clo = rack_ignore_data_after_close; rack->r_ctl.rc_tlp_threshold = rack_tlp_thresh; @@ -14648,13 +14648,13 @@ rack_init(struct tcpcb *tp, void **ptr) rack->r_ctl.max_reduction = rack_max_reduce; rack->rc_force_max_seg = 0; TAILQ_INIT(&rack->r_ctl.opt_list); - rack->r_ctl.rc_saved_beta.beta = V_newreno_beta_ecn; - rack->r_ctl.rc_saved_beta.beta_ecn = V_newreno_beta_ecn; + rack->r_ctl.rc_saved_beta = V_newreno_beta_ecn; + rack->r_ctl.rc_saved_beta_ecn = V_newreno_beta_ecn; if (rack_hibeta_setting) { rack->rack_hibeta = 1; if ((rack_hibeta_setting >= 50) && (rack_hibeta_setting <= 100)) { - rack->r_ctl.rc_saved_beta.beta = rack_hibeta_setting; + rack->r_ctl.rc_saved_beta = rack_hibeta_setting; rack->r_ctl.saved_hibeta = rack_hibeta_setting; } } else { @@ -22964,7 +22964,7 @@ rack_process_option(struct tcpcb *tp, struct tcp_rack *rack, int sopt_name, rack->r_ctl.saved_hibeta = optval; if (rack->rc_pacing_cc_set) rack_undo_cc_pacing(rack); - rack->r_ctl.rc_saved_beta.beta = optval; + rack->r_ctl.rc_saved_beta = optval; } if (rack->rc_pacing_cc_set == 0) rack_set_cc_pacing(rack); @@ -23015,8 +23015,7 @@ rack_process_option(struct tcpcb *tp, struct tcp_rack *rack, int sopt_name, * Not pacing yet so set it into our local * rack pcb storage. */ - rack->r_ctl.rc_saved_beta.beta_ecn = optval; - rack->r_ctl.rc_saved_beta.newreno_flags = CC_NEWRENO_BETA_ECN_ENABLED; + rack->r_ctl.rc_saved_beta_ecn = optval; } break; case TCP_DEFER_OPTIONS: @@ -23742,7 +23741,7 @@ rack_inherit(struct tcpcb *tp, struct inpcb *parent) if (src->rack_hibeta != dest->rack_hibeta) { cnt++; if (src->rack_hibeta) { - dest->r_ctl.rc_saved_beta.beta = src->r_ctl.rc_saved_beta.beta; + dest->r_ctl.rc_saved_beta = src->r_ctl.rc_saved_beta; dest->rack_hibeta = 1; } else { dest->rack_hibeta = 0; @@ -23754,12 +23753,8 @@ rack_inherit(struct tcpcb *tp, struct inpcb *parent) cnt++; } /* TCP_RACK_PACING_BETA_ECN */ - if (dest->r_ctl.rc_saved_beta.beta_ecn != src->r_ctl.rc_saved_beta.beta_ecn) { - dest->r_ctl.rc_saved_beta.beta_ecn = src->r_ctl.rc_saved_beta.beta_ecn; - cnt++; - } - if (dest->r_ctl.rc_saved_beta.newreno_flags != src->r_ctl.rc_saved_beta.newreno_flags) { - dest->r_ctl.rc_saved_beta.newreno_flags = src->r_ctl.rc_saved_beta.newreno_flags; + if (dest->r_ctl.rc_saved_beta_ecn != src->r_ctl.rc_saved_beta_ecn) { + dest->r_ctl.rc_saved_beta_ecn = src->r_ctl.rc_saved_beta_ecn; cnt++; } /* We do not do TCP_DEFER_OPTIONS */ @@ -24437,7 +24432,7 @@ rack_get_sockopt(struct tcpcb *tp, struct sockopt *sopt) if (strcmp(tp->t_cc->name, CCALGONAME_NEWRENO) != 0) error = EINVAL; else if (rack->rc_pacing_cc_set == 0) - optval = rack->r_ctl.rc_saved_beta.beta; + optval = rack->r_ctl.rc_saved_beta; else { /* * Reach out into the CC data and report back what @@ -24461,7 +24456,7 @@ rack_get_sockopt(struct tcpcb *tp, struct sockopt *sopt) if (strcmp(tp->t_cc->name, CCALGONAME_NEWRENO) != 0) error = EINVAL; else if (rack->rc_pacing_cc_set == 0) - optval = rack->r_ctl.rc_saved_beta.beta_ecn; + optval = rack->r_ctl.rc_saved_beta_ecn; else { /* * Reach out into the CC data and report back what diff --git a/sys/netinet/tcp_stacks/tcp_rack.h b/sys/netinet/tcp_stacks/tcp_rack.h index a6cb0a81bb81..4374594a1d82 100644 --- a/sys/netinet/tcp_stacks/tcp_rack.h +++ b/sys/netinet/tcp_stacks/tcp_rack.h @@ -542,9 +542,10 @@ struct rack_control { uint32_t last_rcv_tstmp_for_rtt; uint32_t last_time_of_arm_rcv; uint32_t rto_ssthresh; - struct newreno rc_saved_beta; /* - * For newreno cc: - * rc_saved_cc are the values we have had + uint32_t rc_saved_beta; + uint32_t rc_saved_beta_ecn; /* + * For newreno cc: rc_saved_beta and + * rc_saved_beta_ecn are the values we have had * set by the user, if pacing is not happening * (i.e. its early and we have not turned on yet * or it was turned off). The minute pacing