From nobody Wed Aug 3 15:29:17 2022 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 4LybPT4Bmlz4XwlW; Wed, 3 Aug 2022 15:29:17 +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 4LybPT3SR1z3rSy; Wed, 3 Aug 2022 15:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659540557; 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=1aAXL8MwxV0rqTfVlYeiBSOwyhvBqBj5YGfLLA3OTwk=; b=XamxYdJCHxDpt1auLb4sDR3nMrMz3oQ1s3KA7sPWbmiAZUU+gWLmUakBY9HoSCMCZvku3h laD/vvoz4OqMDcKJY/MieMx//hfzE4lQNDfYtg5xqtVKN05EiRYuEbRoJcNLWRpc3gQxOh yijyUlJcAOsbqxQp83FFmdZyhDWHjPXx1nOPu3ytXriPPIvxMxTI1Tzt83jPg4tCjn7eMv 1F5eEU/7lJ4c8IWSkfjBBJWthHxYyj8FZDxZ+OQ7OTsWLZhs7XkaZbzTKgpO0fFKZepKqm jwb+ixxVS3PfbVRUhDLTqct6h8Kxow025W1pBmkq8rM+Dbvp+RIWeGSwIl+ZjA== 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 4LybPT2GMbzwSl; Wed, 3 Aug 2022 15:29:17 +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 273FTHaJ023860; Wed, 3 Aug 2022 15:29:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 273FTHpm023859; Wed, 3 Aug 2022 15:29:17 GMT (envelope-from git) Date: Wed, 3 Aug 2022 15:29:17 GMT Message-Id: <202208031529.273FTHpm023859@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: 979bc32c7c14 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 979bc32c7c14f944a340058fcd1a580a7492f785 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659540557; 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=1aAXL8MwxV0rqTfVlYeiBSOwyhvBqBj5YGfLLA3OTwk=; b=fvZORmpE9NCFuzLfUr7uZPUktJs4e8X7nqJZU+4IpucfnI3QSW5j4t0i6rId0drOiujufk zQl9PGcKtfCUiKGJkIS+Xf4lA+TkpjHFBEJ4D0ZTXxihNn3CcQMqxsYAtFVRogmcW9kIK9 Fol0wxVmaqdn6CLb0J/JuAU00HewrewZIBn5cXLW5mWlI7rMs9Whj2THkqm6lgjxVTQexl HkSeZsU4tSVl9CD393RI8p0qquSK4Z/OqrrxtFltBlsQJNYRpGorSXUUNI3CT09yd9ix5l 3XIfxQsK7HO1yLZxV5gt2ZA3/uV9kbGsDTXB+rz4pX1j2Svmo15FuEextOQrOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659540557; a=rsa-sha256; cv=none; b=YpHAIc0hZjKb70Jw28YmWh3nJZV+F3BcagzyxEx8pWQxIZ9dwLSfQY1JIMt+dZ/TmcXjRr ubaOPen16vAzJSOdqxbxsojcSLh2X3UvNGoCO8sM/0c2CvwlpUbtzJdfF+DepHVTgT7smn A/KILc7gkW/NQE6camaldTC40p4noSm+2nidjqLhf85i/ANPs4A1i30VKBDBt/ReFpx5Nj wv5wqdTttWaeb9gU1JN2iHYMYX861MeNK21msELEp+VCxUbndrIhvTdZbf58iOxP7czLKT +ZXRxgRc7eA/B/2dwSEE3VdbaDvXKg4cjuUruWC1pv6rGX6LkmJMbSAhfmk48g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=979bc32c7c14f944a340058fcd1a580a7492f785 commit 979bc32c7c14f944a340058fcd1a580a7492f785 Author: Michael Tuexen AuthorDate: 2022-08-03 15:28:15 +0000 Commit: Michael Tuexen CommitDate: 2022-08-03 15:28:15 +0000 sctp: tweak panic message MFC after: 1 week --- 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;