From nobody Thu May 1 19:52:41 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 4ZpPpy19GQz5vdrf; Thu, 01 May 2025 19:52:42 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZpPpx5vBsz49cy; Thu, 01 May 2025 19:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746129162; 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=QIt+rc1pJK83KuxNB9MRVTFk8SGK7aNAyKt/1+xVh4A=; b=mBn9S2NFKOsFlY3r7KjQk69beJq3BieBpSxJtVQK1+7YcBqfKQxFa8FXLjHHVwIgEbPeKa /XWluJ0+3aK1UKozyXqkm91LcL1hZESA4LH6bCUIOTf7v/LnejZgVMOKjG2xdlkqwlnpNH /Tcik38+KfKgJDDsAzC/IDNvBWilb3b4bAF7R9mSVhtQes8+guqPrFcLqYPwzQ9sOxN3+M vyWV+8KOgVtYeBjnHk4NU50ZIs3iHn5GWq89ab7PiBNopPFy/ZIeMU7Qd2WpoCvTnMD6fP jiSoj5wEwtNVPkTtpkCUqZ0dKXAOoYkJ1qDniuoX8hb2zx0ASYcRx64jeaszmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746129162; 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=QIt+rc1pJK83KuxNB9MRVTFk8SGK7aNAyKt/1+xVh4A=; b=qBuJ4LUq09tDeuz1zA1b570xg87Kl1c+if0xfNO9SuaT8Oj+lL1p7j4r3e4pm/vmXV8t7y EbeFBWYjzXyhQBHlPWVtW8NT7wNzO01NWLZXRfqLQg9dkgsG+M4hJ0Lc1CwjYuuazMoWlA Nxs24lXrIsuIc1I/E3DxKlZ9Uu1b/eKTA2UpLb24cmsO1l7x1gk75XbI5B9soLLAqOcWb+ wSP5VxmPrCXSO2Hg3wUt4qLXdAcw7c4RpFOWREfjGOXSm9v05EbDCuOr/1YhSmyTLSngeq U6qyf1tw3lsSZnDHLdh84zkHaE0uc6W7iLuDSUGRF/soE0r3xSYf07cOhGFMaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746129162; a=rsa-sha256; cv=none; b=tiFh0TmVSjNS4VFa0Qx0qvfbMZQEWgbhVpMOfYTZ1xOnVo/qYn6yxbrsIGgl23Ai/FOWRx 3j6Ovn2Mg0hEBKbVU3ychdBJgEWK8B/klBmwbO1ckdN5obaz2Ecd+cSl96bsKo1bEILY2L KxMP+Iuyz5TcwPXOzXJBxeO8x3yBeLxhZMJxjPC0jdZA2QqTMvfTj1o2WsKsYP6WgLcc/f g0bA4qExrh85m4HbNUHr5fTWsK4tMvHoUjFgsDmjPAmpWtvdZifsKc5PZQXEDQgeFcvvCL TCUQfDvlhN3DBbdYOmZ3t8xFYXZW5abf7e9l82WWOR0fXiNCdKOxC0t8jdONow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZpPpx4CrDzjG4; Thu, 01 May 2025 19:52:41 +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 541JqftN072932; Thu, 1 May 2025 19:52:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 541JqfU2072928; Thu, 1 May 2025 19:52:41 GMT (envelope-from git) Date: Thu, 1 May 2025 19:52:41 GMT Message-Id: <202505011952.541JqfU2072928@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: a9114926e2a6 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: a9114926e2a609524cbc7c85ff6a76f01ad268e2 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a9114926e2a609524cbc7c85ff6a76f01ad268e2 commit a9114926e2a609524cbc7c85ff6a76f01ad268e2 Author: Michael Tuexen AuthorDate: 2025-03-31 01:40:17 +0000 Commit: Michael Tuexen CommitDate: 2025-05-01 19:52:31 +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 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D49578 (cherry picked from commit f6deb9ea0a0ee760e5ff9ad5c15d0bd7a1714355) --- sys/netinet/tcp_stacks/rack.c | 39 +++++++++++++++++++-------------------- sys/netinet/tcp_stacks/tcp_rack.h | 7 ++++--- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index dca7e347d615..aa66b02bcd11 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -610,8 +610,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; @@ -631,7 +632,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; @@ -641,33 +641,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; @@ -680,8 +681,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; @@ -15059,7 +15060,7 @@ rack_init(struct tcpcb *tp, void **ptr) rack->rc_new_rnd_needed = 1; 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; @@ -15095,13 +15096,13 @@ rack_init(struct tcpcb *tp, void **ptr) rack->rc_user_set_max_segs = rack_hptsi_segments; 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 { @@ -23051,7 +23052,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); @@ -23088,7 +23089,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 = optval; + rack->r_ctl.rc_saved_beta = optval; } break; case TCP_RACK_TIMER_SLOP: @@ -23129,8 +23130,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: @@ -23680,7 +23680,6 @@ rack_process_option(struct tcpcb *tp, struct tcp_rack *rack, int sopt_name, return (error); } - static void rack_apply_deferred_options(struct tcp_rack *rack) { @@ -24050,7 +24049,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 @@ -24074,7 +24073,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 4152a1a5d7ba..1251dabbed37 100644 --- a/sys/netinet/tcp_stacks/tcp_rack.h +++ b/sys/netinet/tcp_stacks/tcp_rack.h @@ -504,9 +504,10 @@ struct rack_control { uint32_t input_pkt; uint32_t saved_input_pkt; uint32_t saved_rxt_clamp_val; /* The encoded value we used to setup clamping */ - 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