From nobody Sat Mar 21 21:17:00 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 4fdXLn4Td5z6W3QF for ; Sat, 21 Mar 2026 21:17:05 +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 4fdXLn1NSyz3CBv for ; Sat, 21 Mar 2026 21:17:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774127825; 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=SM5FdokVUEF7OxHFTaQWXTxspmk5KpbFwWjxt3D6ve8=; b=Num5/wzud0eBaHsjkF+CZXIRkojifOjUOnDbIO0iXQEhoE++uLsDFCR7gb3VLlvcQ1LUNN FDZnH1pfpZDc8plFmPLIBn6YbSsWn6D2oS/d8xZkfg0fbXbo6cSEi606ZyuuNAWySJD+Fy W7mES+eMoTm4QL2E7pxfHMl0gkKmiKoAWcO+AAtKeC7vICqjpROSRwmGmUy+hRiLJFVqXK 167SrSzJGLpUYFGtEVMLJPjq/7FEn6ffwWhac68g8RlA1aLFwsS5TzeHRonMejmET6cyr4 0F79fp49Emm8PGCti97/N8l7Vym9RfjDEuJa1Rw6C+j1YCTVQOycSJSD/CTZtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774127825; a=rsa-sha256; cv=none; b=OIFkR2KGT5/yLXxX98/Ja3eUUpuxcPsN8DCZ3cJLEaVrwIBuIz0X0yEq6POn6foqAJNuP9 9cCyzCg/ZyJ+NJJRmKQPWqd281332FKj33FruCIkH/hYFs7xk6cBLmNKI/nBXqro+N7hHJ aOsvLQi9+RFFTZV8h703e6NdmEG8HU96h9dA0hsS1TndwhbKd0boED3ZSwTGmr1SvNzMS9 A8ahJZUuShugY8QBsFn8L1lGREjfbTxlQEPlNNpg9qymB5xrMhdg/QzEDwDjH8sUrnjKxN cvZCdcIMeXo3GaKgKusA1L47LOpfhAVVSI3jYxJfb7iqdLuKF9bEr98YLHb81A== 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=1774127825; 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=SM5FdokVUEF7OxHFTaQWXTxspmk5KpbFwWjxt3D6ve8=; b=vvvAurXeavVoAYa+pGltqkPFf3v+NEL7DEwO6sMT2n1zy1AJEbiarm9bei1W8dDsfUEo46 R0DPVTzKElUZnLR4T/4AeKXfL2T+MECrU0KcV5y5qNV40sTuTJbapj6r2sdrAs72k7TPqx P6W+wdIwMAJWInbw1pTd0doKPTQCdYXmWvuzV5IaaGGKA8LtN1mhlsScXCT5nJ+4xjfRPC B1OeaFpngsS2pDkiEZqCYeGb2VcOvphN30J0HP6nwBoqRalmUJpgTXxS9i7ubcU68JX4LX copvGK7Y1t0aG3Va1dXsO1TuwomsmWROQhO86GJncBV+CIAZvRCpITwSmmAMiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdXLh0qw9zDTl for ; Sat, 21 Mar 2026 21:17:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ceef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Mar 2026 21:17:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 2ce06d25431a - main - 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/main X-Git-Reftype: branch X-Git-Commit: 2ce06d25431a6c96ef5719165cb73e138a0ed89c Auto-Submitted: auto-generated Date: Sat, 21 Mar 2026 21:17:00 +0000 Message-Id: <69bf0acc.1ceef.3e044b1d@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2ce06d25431a6c96ef5719165cb73e138a0ed89c commit 2ce06d25431a6c96ef5719165cb73e138a0ed89c Author: Bjoern A. Zeeb AuthorDate: 2026-03-18 14:43:15 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-21 21:16:43 +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 MFC after: 3 days Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D55919 --- 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 27e18c114afd..c5673e871df4 100644 --- a/sys/kern/subr_sbuf.c +++ b/sys/kern/subr_sbuf.c @@ -124,8 +124,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))