From nobody Wed Feb 05 20:51:23 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 4YpC7v4YN4z5mNl7; Wed, 05 Feb 2025 20:51:23 +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 4YpC7v2X4Lz3S25; Wed, 05 Feb 2025 20:51:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788683; 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=e6lZ7xoG24bhzpWtZwkx1ms3KbMpOqS88sGF74i6y98=; b=yXSeIprzpSkSFIJGiR2JDjPejV3mIM5hp47eTZsn9LYAT2p7HfG6MostHE9jt6y7Vng/gQ BrvMY+/RBQV71R2P8B5pukr27o7eQxukb3Eyx2mWLjIHOe5xtbbG+rAws9sTp8zFXZYX0g 3x3RFipKeXAq+aRfiBANM49ZfzVGei/871+dV6rCDNoX6IqJ83C7oOGSIRtiQBpa40MdRc hsWS73hf3AHS4Rm9cs8vgxBUb0zDIlCVrGY6KBOrMC8GQzUhQtaI0KSGPM6fqB/ugRkIYi a4uUjmIJH04k74m36L/Br+j3BWwdm+9TqF07wP2Jm+cph9IbiLDMK55zIKUJdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788683; 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=e6lZ7xoG24bhzpWtZwkx1ms3KbMpOqS88sGF74i6y98=; b=DH+L+t8Gp9BlRCol0pEkVEi/gewUFV/YnalrD92v0dlzNe+JtyrcK0QV836KtxacKKz0gi 5nOu35iyFXA6Nr75Q1SEw82MDVtAM+YxafXbzGV2yJ+WsempdiSRhvb93mVEXyPRHlCtM8 zf9WfCLnpcuvN38EVKCmXszm2XG1fh1Ic/6fOhnXKkHK3YNYt0WJPcDzvYpnBmmJGLu35Y sZD5DZTPgdbslag6Ha/aPnre9MxQT0KCdJ3LqHc8X3YxlBbnZazWYx/sYQ3CHFeieZwm5g SzGrJzjgdSev9KokdaJrFg0Fkf1ik/q9yy5SKh4ogixotzFEy2BnM4YwPvYgzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788683; a=rsa-sha256; cv=none; b=egrqSBTPS9wIR6n3OmF7BoO6jMtZ1nIkgfULR+sTLu8lNpnKNZO6Bmwm2QJneia4+uTZ0Z M+zu6FBvvCUlXyOndoaWfKjK2M+Mm2IREB38NgkbqHo1XJTc5O5WI3KDVUv3hxu+7bai1S FgFxIe4D9xx17pzmVYuASzcnCnbGwlwg2LbWRZtft7ZGOPR8X9YmCAXJ0EhLFB/Bx/vNYT xWKBMBT1n9BupxV3B9pHaP/4QTG4RND9uSjaaR8aUFQQGjNHBFSKrqwsUxR0pBE5K+r0/S Zcqvfr+Eac3Z6UunsUSUaZ+H+zl1lh+k7Y8hdIt4/GGGNcidwc4pir+i510Z7Q== 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 4YpC7v1By6z178n; Wed, 05 Feb 2025 20:51:23 +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 515KpN2p099808; Wed, 5 Feb 2025 20:51:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KpNcc099805; Wed, 5 Feb 2025 20:51:23 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:51:23 GMT Message-Id: <202502052051.515KpNcc099805@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: 264b7dd11fa1 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 264b7dd11fa13858843eb11e8e33849effdf529a Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=264b7dd11fa13858843eb11e8e33849effdf529a commit 264b7dd11fa13858843eb11e8e33849effdf529a Author: Michael Tuexen AuthorDate: 2025-01-04 20:08:43 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:36:13 +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 12152fbddcd9..cc39884a3e33 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -10370,10 +10370,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