From nobody Wed Feb 01 23:32:09 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 4P6dVd3Lc0z3cL73; Wed, 1 Feb 2023 23:32:09 +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 4P6dVd2vj1z3LGR; Wed, 1 Feb 2023 23:32:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675294329; 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=KEQNdTMv5SpgyhChbGXVO5YhMAoWVrOVZgZ4HiCOyXI=; b=gi5AKhk8tiQFaJ5DtDNkMiUxYFQsjbVROOq03kPBYi0fxm2l4aIYz7JCxQYd8/HC5st/dF 6fy1KYS1yWEn/k3UM4XXxGnO6krA4SfMR7QHf14jpBcLkMDiEC06/E6a+wLa2N8ufKEh5h owXZd3j8dZGAS2gI7+RR0mErhoT5aZoDQ0pHPugZXn3yHpz3QgIm14+95hXmx9gRe+ijJi Oj+/pPNFbJup9mpSLpu7YtlAoaNpmuXa7VB8WrD/1cGmFoYh3yYAxvW5npGBlTgI2Rv8ky wO+Mq0JysERIvn/7n4eM5Ughdq0JVl8bB2D5Z0WS4NF1brf6uBEvhsbfIkQzDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675294329; 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=KEQNdTMv5SpgyhChbGXVO5YhMAoWVrOVZgZ4HiCOyXI=; b=J7g7XqugU6cpm6sYCcyxTKRl6fsep7HqvXZQNG/rbXNBPJJoVxDjSTf9TWJTWFRDQdzqh5 /cpCCsn1mtPhwy+1xshLpj5R7ay77Kd1p+16PLvnGdWipNlngyWFs0CJ5m8bomzcpx6S6Q aHfx9s5oQ66W8w9HpFgj6jOjV+LPvUpPvk0HWLYhssYIRhjOPvtQyRtN11buh00hqipoYy 5e5+L3HblRiB0sVJOdGkPezBTtf1Qi7CcQhnyi+GzwfTDQh3KpGEmPdZ6iJnOqo/osNL04 WNENCMEPePMECp7WZK25nbtevyg9e3Ii1TQSM2ECvtHD9hEQ/m7R0gmG42z8LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675294329; a=rsa-sha256; cv=none; b=hsi0xsVzckrsQTrUGf16CKeS9xCk4bIAgBqb03PaWT5wzVCr5XXTU0bCtnu6jjhfDeXFPu 2o7QnhNkfzzfxEUiM5tq/0+nPxwNYK5DMtjJbT3Eal8oJNOPi2WuIHVWDhs8hwvV4AfCDE R3vfXoa/Xodcr0EbuEHvriUuD17z0c5J9o07vBWvwdpq7i86J+hM6OwWSdi3kcRiXZjJt2 Ba18DvBy9R/KiWrZPaLPrY0kC45uaoBmgne6s6kvM+GzsAjUOax+Odi1KepcSKuLWMsrpC Nw4FkB4kBSXnKV64Zi2UlKTMEP/fg4gFcByQ28S9d9u8x9sHxkt5gjEXpi8D/g== 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 4P6dVd1zwBzYMK; Wed, 1 Feb 2023 23:32:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 311NW9f4074630; Wed, 1 Feb 2023 23:32:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311NW9RO074629; Wed, 1 Feb 2023 23:32:09 GMT (envelope-from git) Date: Wed, 1 Feb 2023 23:32:09 GMT Message-Id: <202302012332.311NW9RO074629@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: ec4646fe25fe - stable/13 - sctp: tweak panic message 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ec4646fe25fe590db7a354992fdf1f2cd7ae9eeb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ec4646fe25fe590db7a354992fdf1f2cd7ae9eeb commit ec4646fe25fe590db7a354992fdf1f2cd7ae9eeb Author: Michael Tuexen AuthorDate: 2022-08-03 15:28:15 +0000 Commit: Michael Tuexen CommitDate: 2023-02-01 23:31:46 +0000 sctp: tweak panic message (cherry picked from commit 979bc32c7c14f944a340058fcd1a580a7492f785) --- sys/netinet/sctp_indata.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c index d3c969bb47b1..b8bfaf164904 100644 --- a/sys/netinet/sctp_indata.c +++ b/sys/netinet/sctp_indata.c @@ -3837,10 +3837,9 @@ static int sctp_fs_audit(struct sctp_association *asoc) { struct sctp_tmit_chunk *chk; - int inflight = 0, inbetween = 0; + int inflight = 0, resend = 0, inbetween = 0, acked = 0, above = 0; int ret; #ifndef INVARIANTS - int resend = 0, acked = 0, above = 0; int entry_flight, entry_cnt; #endif @@ -3860,29 +3859,23 @@ sctp_fs_audit(struct sctp_association *asoc) chk->snd_count); inflight++; } else if (chk->sent == SCTP_DATAGRAM_RESEND) { -#ifndef INVARIANTS resend++; -#endif } else if (chk->sent < SCTP_DATAGRAM_ACKED) { inbetween++; } else if (chk->sent > SCTP_DATAGRAM_ACKED) { -#ifndef INVARIANTS above++; -#endif } else { -#ifndef INVARIANTS acked++; -#endif } } if ((inflight > 0) || (inbetween > 0)) { #ifdef INVARIANTS - panic("Flight size-express incorrect? \n"); + panic("Flight size-express incorrect F: %d I: %d R: %d Ab: %d ACK: %d", + inflight, inbetween, resend, above, acked); #else SCTP_PRINTF("asoc->total_flight: %d cnt: %d\n", entry_flight, entry_cnt); - SCTP_PRINTF("Flight size-express incorrect F: %d I: %d R: %d Ab: %d ACK: %d\n", inflight, inbetween, resend, above, acked); ret = 1;