From nobody Wed Apr 1 04:34:10 2026 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 4flsZV3SXyz6RbpL for ; Wed, 01 Apr 2026 04:34:10 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4flsZV1G7Zz3LpM for ; Wed, 01 Apr 2026 04:34:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775018050; 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=TNTWyEy1wiZJBNiDGFFz5keX4BlnVdmRj0Gm1Y85IsE=; b=wM2P8zsaRHjzoPbLnLaw9qKR9VZ/c2EH+1/M5jBNLRhQrIyuCJ45r7lBm9Ojvz4CyCMdb/ 4pYFKb4mzFJDefH3aRG2BgJPlPNY8Ahb257H5LdwtWsLBfVdV0Jelo/2J5EyCo0jyD0UvC 4WHbVBn6a4klxcB6XWBRxMrJhbY5Zv3bIFsShWgKYSvmVLixALzNJecSCqMajd0JDgBlwQ vTmt8YSef0qCxFp8Nw75cnKcJmQj0FG6T8dyLqgQIOTDEqMbuT+1Z8r6vKaF8JogJ4qq/I iuZy1FVGHO2HIlelH7Qtq/P7FIuN2EmL/oA2uuZ2VorkR5xq8/UF/cuH/IP8Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775018050; a=rsa-sha256; cv=none; b=MlJjkeK5Jsx3zwIs5tp+IaiujNpH6iRk4QfZWTg32IWnYMymFZ8fZ4XrKMHwMRbU6kdmvM HFGXDEEb8KBnTrX+uIl16V5eGD+8hK5AOHFQVxTwxnVEpcnd5UPZDZS0/GpefVYvTYLzng /P31E75MqWcaApPuptZwU0wg9VNBi3KRAD62Uq26Va8/bxtJx+SBDGS31q14wUEcB2Efyw OMPNvMFhVNA1NsNsXDBTeGlh5sKE5uxTlo2o4mAXX/2QEy/eV2NhY9uX7sBnhqhsEmP4q8 kXW/YUspYItwR/PdVhYWakKRKzxHeKT13qKRVAqKiXiI+D45TvXl6/vRgUnlGw== 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=1775018050; 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=TNTWyEy1wiZJBNiDGFFz5keX4BlnVdmRj0Gm1Y85IsE=; b=IOo7jCeQwr3HlY6xRsw4tFiJY/PWfWA4VdGvqyTcVe5nwqIFj8M1Sn7cZSIuCZ5G/z0hW8 YBXUgdeYNnMJFkae2brPdG8MuoIVSxKU3l/EiCrV696hqjhRNyGY2puD+9xOLQCVPlcGm5 /0GBV1y11NJRFxWUYoXwTrt9ZTKWkficKvw7N6MRjPeOTLtaTVPMq89H9byvQEUQ/RRqp5 TB9gm4aF/z6bKwgltAxb+jRcKshsikT8+7xd9P7ySPaz0Nn1bgoE7shxQDnGFHI90N2t4O tr2P1GbKsraDhZ+AXCbxYIUkGCAuydAsTzPGSG/bIadr1hyb8oA6df8TIRZ84w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flsZV0q9qz11Dr for ; Wed, 01 Apr 2026 04:34:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42717 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 01 Apr 2026 04:34:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: d5d08dea8443 - stable/14 - sbuf: make assertion message a lot more useable 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d5d08dea844315a0f10d8ffefd1c903b3e871c1b Auto-Submitted: auto-generated Date: Wed, 01 Apr 2026 04:34:10 +0000 Message-Id: <69cca042.42717.1fc34f22@gitrepo.freebsd.org> The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d5d08dea844315a0f10d8ffefd1c903b3e871c1b commit d5d08dea844315a0f10d8ffefd1c903b3e871c1b Author: Bjoern A. Zeeb AuthorDate: 2026-03-18 14:43:15 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-01 04:33:47 +0000 sbuf: make assertion message a lot more useable Saying that we are called with an (un)finished or corrupted sbuf is like saying "error" (though [un]finished is an extra hint). Add the pointer to the sbuf so one could easily check it, add the flags we are checking so one could see quickly about a possible state mismatch. Given we already dereference the pointer in the KASSERT there is no extra harm adding it to the message. Found while: testing lindebugfs changes Sponsored by: The FreeBSD Foundation Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D55919 (cherry picked from commit 2ce06d25431a6c96ef5719165cb73e138a0ed89c) (cherry picked from commit 40be04834308e3aa1e1cf411f87f16a34f4ff130) --- sys/kern/subr_sbuf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c index 0ce2427f6dbb..002b65d81959 100644 --- a/sys/kern/subr_sbuf.c +++ b/sys/kern/subr_sbuf.c @@ -125,8 +125,8 @@ _assert_sbuf_state(const char *fun, struct sbuf *s, int state) { KASSERT((s->s_flags & SBUF_FINISHED) == state, - ("%s called with %sfinished or corrupt sbuf", fun, - (state ? "un" : ""))); + ("%s called with %sfinished or corrupt sbuf %p { s_flags %#010x }, " + "state %#010x", fun, (state ? "un" : ""), s, s->s_flags, state)); } #define assert_sbuf_integrity(s) _assert_sbuf_integrity(__func__, (s))