From nobody Tue Mar 31 20:28:14 2026 X-Original-To: dev-commits-src-branches@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 4flfnq2zMKz6Y0KZ for ; Tue, 31 Mar 2026 20:28:15 +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 4flfnp65KNz3QjC for ; Tue, 31 Mar 2026 20:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774988894; 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=qNnhv8LrheaV/f0Am0oLDoduT0u9UVAZukYtYDyCm10=; b=PHfTGR3qxeFL2t9POlMVbMjHkDWscofEh4+7q8SbTqHCVgEj0keFH/vNaewtszWKWKoBwN vLBvVr0JRlwKzdzZz80SIcfm7Evd5iF7FmJpkZqPqfJkVLteQFzQ1iWhvlZgHoJbYLb8aP t36mikyw+20uVWRkJmB22+/CKT/lg/m+iPZNlfMqLcp0PeRbYfqnj5ZcLLeutyI4I4sEMV Y3Xle0M2LZ0peKvK8aXb7xW/v/rPGKR8jpgpiw03k1n+FW9djlLtdDNE4+/dazvqIBDqmu wJL7Xf6+2bRJ9NPVqTmAimfVgBkmR+v8Cpl7J9ocv48QTtBxxDZxSQSilRlkdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774988894; a=rsa-sha256; cv=none; b=xula8U+ECgBCX2mEP8uvbdGyjwnUmDpoF5M4cBMHUaojNUOiv1qR72ShjuNKA3tQo0hXnL YPytZzrL3UwS4uoK9wQZwf/fZZxaxZuETv8YhNKAa5WaVL3qZuyVS264hu03YC4LY8owXi laIjJkUX9e3TPJk8hAnR3DyeSaCCibFW+i9jsItlnZgIuu66xdVurkQRvD/PLPAiQeMClG lWiQsMx3dy+OuwqWk/IbBkJwSQ2xcnb55dNnN+Kf0htBQYYAyecnGfH9XsR0eJIk4DzzMM xrkGfrmLK8H7YXUBTQZYOmHLgYHTHYUs3/YqNMsu5MPcDLCR977eKUgOS0SA7w== 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=1774988894; 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=qNnhv8LrheaV/f0Am0oLDoduT0u9UVAZukYtYDyCm10=; b=qAsW0dwm4zJNvbBE+oTXB0XcFzyhAp4+qRStwo6sUbTvks1dyxqaybGOeToR9JzaXWr1pT lCqKsM7f7dTxuyo93a5lmmQLRGERGEURbvfKPQKu4mnUel7CGJMHftNsA47TSFQC/l8XfK vQ46i2oK7VQGJDhH+pJ5lMZc1Jis2sngCVJuQJTCE7seshyPpE0YE18TE9mmSE4l6JtASf d8wfWTcwD8aoBCoNS6HMyJtpw9szi8FwPmuo2pO1ZsPvf+6a3cgG5a1l4uh3dAEELEQToT aBn3e9LTPCY2g4d+Z+hmkn82QRvl0GvJs5ywEW1TRxBNg0kqnLTIuTzH2+oHoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flfnp5NvPzkbk for ; Tue, 31 Mar 2026 20:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 245d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 20:28:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 40be04834308 - stable/15 - sbuf: make assertion message a lot more useable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: 40be04834308e3aa1e1cf411f87f16a34f4ff130 Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 20:28:14 +0000 Message-Id: <69cc2e5e.245d7.3f60af2@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=40be04834308e3aa1e1cf411f87f16a34f4ff130 commit 40be04834308e3aa1e1cf411f87f16a34f4ff130 Author: Bjoern A. Zeeb AuthorDate: 2026-03-18 14:43:15 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-31 16:22:51 +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) --- 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))