From nobody Mon Jul 21 07:59:49 2025 X-Original-To: dev-commits-src-main@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 4blt921zD7z62KSC; Mon, 21 Jul 2025 07:59:50 +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 4blt914B5Mz3f0R; Mon, 21 Jul 2025 07:59:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753084789; 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=21I/Pc3DASAGnGhF+8/HQTWCctFSw09Qoz/Hv+civpM=; b=sMquUD5qKcjlCysc2a+9mGUlAt6e9D1jb+I90nyYFCVMnG5IibQLSqghXegiYTI+4QQkCK oNWeIC2yn4ZhVzLjDY0R8s/yklj8VOXT0iL5yTmY7TjxESOX+zXSpv82vnyR7Mhr7uoKiI X3VfFwOcwjOl/frqhoSdyA/I2+POc8GfbWJkQPE7SD3PHrVwnR9Y2TsH0unYdNUxYo80nN a9Tey3vb/LfuQ6ALFm+HQT7YHfO+7XdanWQSXRx5kuBUo5+ToybZ2G+FfhJGCHGZ5LBDyy AcViObhxERos1oNh1qjiIcSoRbSdBVZzsEER9J3iiIfTtIedddmiL/36atMDBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753084789; 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=21I/Pc3DASAGnGhF+8/HQTWCctFSw09Qoz/Hv+civpM=; b=eibgveUTkN1lYgxBIEwSCzlnU9VSIrzJvQt4HoucPGN6mND7PlWmYfywK48/F33kF9GwsL 39PWPmkxgUdlVkEzPdKWPlt/cr2Sl+OL4CECvvOzrSfNFN3B+yMCP2jOLjjN4N0FkEva5e IAypghGRckezNhcbHDiD1cLqovBLF8dyPpPNFw486JQqfSVQw7CwJEG+BnE656S5IAPyDz RPpO1joEkXfMgBpzqGEfA3RNt7yolXPuHXSKCfpKTGKdstVyseBzfrkZgBZXh7YqnxzN1h bWOadPfZW+TGONS4PmsdgbS2oKevIBZIe7eVoNU+g3wE0uWb3TuBO890sIowmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753084789; a=rsa-sha256; cv=none; b=E/AmQpxRvoSPKFlvNeD/mwkmFVnFM/y/nwkuHw+V0nk81G8GftqBijuQVLBifTja1uno4d IN/Orjo08q+F3mpgjzN1Tg1OQU6ONQj6AFvgS3l4YmaNTYOLS90Q5Ydy9Qki79RcWlM/TR uKQyITfeTT4pTM789tdWf9KZyXU3j/2YSxj139HQZNmDF7vVuaWdpNRO1LN5UVWPPKdrgr JQ//sm4Ph0zXWX45DVjNqwnDWEjNIUbg4EhkxGJ9OXdcgQfHMEc7ct+ujMMFjk/h3gu1T8 dX1dm5Dhnn6Nw3mjhbYehQbjBqu+JcHesST5bUDKSQM/ieXe7fhPkZeq4R65PA== 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 4blt913nn1zq98; Mon, 21 Jul 2025 07:59:49 +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 56L7xnM7061046; Mon, 21 Jul 2025 07:59:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56L7xnQq061042; Mon, 21 Jul 2025 07:59:49 GMT (envelope-from git) Date: Mon, 21 Jul 2025 07:59:49 GMT Message-Id: <202507210759.56L7xnQq061042@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: e0838f8a2e61 - main - tcp rack: fix sendmap app limited count tracking List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: e0838f8a2e61e73e37c1ae08eab9473daacaacb8 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e0838f8a2e61e73e37c1ae08eab9473daacaacb8 commit e0838f8a2e61e73e37c1ae08eab9473daacaacb8 Author: Peter Lei AuthorDate: 2025-07-21 07:56:03 +0000 Commit: Michael Tuexen CommitDate: 2025-07-21 07:56:03 +0000 tcp rack: fix sendmap app limited count tracking rc_app_limited_cnt is an internal counter on the rack structure that tracks the number of sendmap entries that have the RACK_APP_LIMITED flag set. These entries gate goodput measurements. The counter is reported in a number of blackbox logging events. When a sendmap entry which has the RACK_APP_LIMITED flag set is cloned, the counter was not being maintained properly. While here, cleanup the counter check when a sendmap entry with the flag set is freed which previously hid this issue. Reviewed by: tuexen MFC after: 1 week Sponsored by: Netflix, Inc. --- sys/netinet/tcp_stacks/rack.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index f52e6fbddfef..b0342b4e3165 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -3480,9 +3480,9 @@ static void rack_free(struct tcp_rack *rack, struct rack_sendmap *rsm) { if (rsm->r_flags & RACK_APP_LIMITED) { - if (rack->r_ctl.rc_app_limited_cnt > 0) { - rack->r_ctl.rc_app_limited_cnt--; - } + KASSERT((rack->r_ctl.rc_app_limited_cnt > 0), + ("app_cnt %u, rsm %p", rack->r_ctl.rc_app_limited_cnt, rsm)); + rack->r_ctl.rc_app_limited_cnt--; } if (rsm->r_limit_type) { /* currently there is only one limit type */ @@ -7044,6 +7044,9 @@ rack_clone_rsm(struct tcp_rack *rack, struct rack_sendmap *nrsm, /* Push bit must go to the right edge as well */ if (rsm->r_flags & RACK_HAD_PUSH) rsm->r_flags &= ~RACK_HAD_PUSH; + /* Update the count if app limited */ + if (nrsm->r_flags & RACK_APP_LIMITED) + rack->r_ctl.rc_app_limited_cnt++; /* Clone over the state of the hw_tls flag */ nrsm->r_hw_tls = rsm->r_hw_tls; /*