From nobody Tue Oct 17 14:38:47 2023 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 4S8xS74cWSz4xb12; Tue, 17 Oct 2023 14:38:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S8xS744hcz3WsB; Tue, 17 Oct 2023 14:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697553527; 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=saHwYY7j1+KpN8Phd9gIHSiVL+dxt8DhjTnpx6v8GZM=; b=rUhRFBa51L6g7AIML/h37Q48h43uFUiTvrU0AR/1zHEpKvFvT0QpCyEzlMMxzBLx2M7jIQ n4S3fROe0bsr7dW+dR9d57MQfKiNzduEv3C3rAQZULN1K9MspvEvzzZ9IWTPhQRcQ7wxnL qaj/SEu0hHi0KyJlFk9TWacblczOHLbv2NN38MnqXXVJBq25MSeAL6ImxMUxjt224SBF3X AvoA7SE2K9XsVvtUcXYVeKFOSLTzD5F3WAsef1fBtOltM/K3sA9wP8dnn2xFqQ+lf45azK CRQcS5PvPJ/aO6aji3zo/x8Pk2p/jt8bAJ8vMn0lQydVbIs9MQ/nBjz5/t6kpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697553527; a=rsa-sha256; cv=none; b=Am8YPhFbWEyK52/v4qWgToypMzqP3UUwx2/gG+7xCo6MSnszI7YlwuCzkpLFGBT/AkbWEK LuzqwnWLGzBgBT5IPj19iuv/2+8b70vjFdFwuIRUaEVy4E91ZarDG1KefEo4ZUCH+Gu9sT oA4+NCiUWq4RGMBMT1peR/vw7PfdGEhmeKhrzI/3wCi/mzgrDebg5NhFNGvMbRwubptgfF 4/YMOZOs0v5pRd47OJSZNMFfNsQAFgXGDzRx0T1QZgFVOyUjisLcdItXVguqnXMpHN9KA7 Bhmbzv2fGrK9FWr8b8YTAxyYO67OXZmvWpVPsCNWMOkF0CNkGyYsmdMgvIiXYg== 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=1697553527; 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=saHwYY7j1+KpN8Phd9gIHSiVL+dxt8DhjTnpx6v8GZM=; b=JSrD1bzzNhplGx5YUC9p+yKCMEUCw7ZXW2Po+olMxFXkGUziIG5Dz7bYwKCRD3fwE7vMGu FxFgIasCgLAUXoI7k/DYuhdt4s9p03bzhKzIoV2y/jumcOrrHa5ORADsifajRGAUEDWWpL VNE/yVep0KcKHC2NMWbIRGzV4YEEJsKL9O+nANBQ1qpmYB3SQklNyDTU2W7eMY+2nTttNP VrxfzUqgI4mHerSkj5g/W7St3QIrUI5aRxQYkgR9/EIfBkKSm8aa+7HZmHdsjoH/+MkzTQ 9JW9BG3gmccJCm2liO/r3p6+f+PuaPfA3fpDSXnTZqgdo+gZ3KCL8/5cXCLSAw== 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 4S8xS739VHzCBJ; Tue, 17 Oct 2023 14:38:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HEclOQ097077; Tue, 17 Oct 2023 14:38:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HEcl2J097074; Tue, 17 Oct 2023 14:38:47 GMT (envelope-from git) Date: Tue, 17 Oct 2023 14:38:47 GMT Message-Id: <202310171438.39HEcl2J097074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 22dc8609c565 - main - tcp: use signed IsLost() related accounting variables 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22dc8609c565456fda3de6ddc34e07af98f11203 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=22dc8609c565456fda3de6ddc34e07af98f11203 commit 22dc8609c565456fda3de6ddc34e07af98f11203 Author: Richard Scheffenegger AuthorDate: 2023-10-17 14:07:23 +0000 Commit: Richard Scheffenegger CommitDate: 2023-10-17 14:37:09 +0000 tcp: use signed IsLost() related accounting variables Coverity found that one safety check (kassert) was not functional, as possible incorrect subtractions during the accounting wouldn't show up as (invalid) negative values. Reported by: gallatin Reviewed By: cc, #transport Sponsored By: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D42180 --- sys/netinet/tcp_sack.c | 4 ++-- sys/netinet/tcp_var.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index 8647630bb6bc..589b0c424acb 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -888,10 +888,10 @@ tcp_free_sackholes(struct tcpcb *tp) while ((q = TAILQ_FIRST(&tp->snd_holes)) != NULL) tcp_sackhole_remove(tp, q); tp->sackhint.sack_bytes_rexmit = 0; - tp->sackhint.sacked_bytes = 0; tp->sackhint.delivered_data = 0; - tp->sackhint.lost_bytes = 0; + tp->sackhint.sacked_bytes = 0; tp->sackhint.hole_bytes = 0; + tp->sackhint.lost_bytes = 0; KASSERT(tp->snd_numholes == 0, ("tp->snd_numholes == 0")); KASSERT(tp->sackhint.nexthole == NULL, diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h index 11509a87c6e7..c6e24b187e0f 100644 --- a/sys/netinet/tcp_var.h +++ b/sys/netinet/tcp_var.h @@ -128,8 +128,8 @@ struct sackhint { uint32_t recover_fs; /* Flight Size at the start of Loss recovery */ uint32_t prr_delivered; /* Total bytes delivered using PRR */ uint32_t prr_out; /* Bytes sent during IN_RECOVERY */ - uint32_t hole_bytes; /* current number of bytes in scoreboard holes */ - uint32_t lost_bytes; /* number of rfc6675 IsLost() bytes */ + int32_t hole_bytes; /* current number of bytes in scoreboard holes */ + int32_t lost_bytes; /* number of rfc6675 IsLost() bytes */ }; #define SEGQ_EMPTY(tp) TAILQ_EMPTY(&(tp)->t_segq)