From nobody Wed Feb 05 20:51:13 2025 X-Original-To: dev-commits-src-branches@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 4YpC7k3NTXz5mNqx; Wed, 05 Feb 2025 20:51:14 +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 4YpC7k189Wz3RsH; Wed, 05 Feb 2025 20:51:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788674; 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=D4wKYiy3RD70d9wiCHZPECiNBfG666OxZVlQQybM5gk=; b=etJXUVHvtkOboAD3MHaZIRebQLGvsoiHr7l224n2IjhnyIq0l5jJY027Y0L7qBcFOfYbWv Lwm1vEtgGB+QAzRqvQEXekqvlvRQArNrIuoYKgXeXBKY0/UqBFLaHyUgRaPkR/E9QK8cCW +Ltn6Kel2VNTw9qxNT85gwjNpHKQ5s6FSNOTA2eN9P61DdahDCpPrw9N9SFiAOo4fLgawt m2zNLwjJojR6ezVi1oJQYBd8j2ruXbywi1OSwIHGXHQaMcxHTpRLfHf0i+yVz5Jhr+3GEU 66dciuAobzNKo7zAuOUQOhxeX3b9Lp11Ql0XKd3vy8hpioPHrQNlJO5wSJbXCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788674; 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=D4wKYiy3RD70d9wiCHZPECiNBfG666OxZVlQQybM5gk=; b=lTURPa49Wz6CCYqHlThjW716O3fb/1e0sSDTWqy+aZWN87AcF68ZWofdt35Yk94py0XJ5D +BygB1K7awvJRSgUj8faan47FUZDz17cs57AFx9VFRnv9/ExiRBFOK2SERBT8OnIxR307h jKYP4ZybJnLocAPhLRWLVwIN20xGaqx4ROqdOY7WL64xh5YmofVf2LkGq2XYgDgCv1JJ2N eGFCnWtUJRd1zPreaZrtd/G8wUN7H3X+ELFIy7ONXsT6TqJhI0Lea1zwkEiwoVnBuDLdYJ avLvf2pcbkOg4FYclVxNEsM+fqS9Ma8xZHrSbOmbrTbKgJEUJkm8TbRn6tH0zA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788674; a=rsa-sha256; cv=none; b=wrJvxj3XZUFfb4ECrw6IDIijvRgiVJmYFdDO7RRl1bt8sQWdHVrZge6CMbM4qFsFnt7VPa M25cvgHMZi0qnuFj7RRmUlqOS1Y/AnHbQnhqirH5KSguuXLZmyD0x4tk06JdnEydm8p3CR cLnQXNQabKnvyZsySCgDwcNIfcj8w5VkaYtmHNaZL6LFjgeRJ+nnvxLyXN3LXBIRi8c9JU /YxC1Dxyew1DuStbOp/bcoNWsz1bdLLUlbq9A7mnGf1g12SAoHh/TSldDt6VYOZinRExBf bHlv/YVwURi2PV4Kt41nwUF5b6iZvaYyxG6xqvYcJFeHiMmkEjfJ7opDt3CKEw== 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 4YpC7k0hRBz16w1; Wed, 05 Feb 2025 20:51:14 +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 515KpDYN099645; Wed, 5 Feb 2025 20:51:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KpDDZ099603; Wed, 5 Feb 2025 20:51:13 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:51:13 GMT Message-Id: <202502052051.515KpDDZ099603@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: 6ab740bc90c1 - stable/14 - TCP BBR: remove code which is not needed List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 6ab740bc90c188e757124533e6c4b67e40becb67 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6ab740bc90c188e757124533e6c4b67e40becb67 commit 6ab740bc90c188e757124533e6c4b67e40becb67 Author: Michael Tuexen AuthorDate: 2025-01-04 20:08:43 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:50:55 +0000 TCP BBR: remove code which is not needed rc_bbr_substate is a 3-bit unsigned int, so it can't be larger than or equal to 8. The wrap around already happens. No functional change intended. Reviewed by: rrs CID: 1523795 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48320 (cherry picked from commit 4bce1a19fcfac0c9f22c11278daa510546ccd3f2) --- sys/netinet/tcp_stacks/bbr.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index 144b3f25e9c7..6c6bc5d1532f 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -10302,10 +10302,6 @@ bbr_substate_change(struct tcp_bbr *bbr, uint32_t cts, int32_t line, int dolog) bbr->r_ctl.bbr_smallest_srtt_state2 = bbr->r_ctl.bbr_smallest_srtt_this_state; } bbr->rc_bbr_substate++; - if (bbr->rc_bbr_substate >= BBR_SUBSTATE_COUNT) { - /* Cycle back to first state-> gain */ - bbr->rc_bbr_substate = 0; - } if (bbr_state_val(bbr) == BBR_SUB_GAIN) { /* * We enter the gain(5/4) cycle (possibly less if