From nobody Sat Mar 21 21:17:00 2026 X-Original-To: dev-commits-src-main@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 4fdXLh2Lzzz6W3VF for ; Sat, 21 Mar 2026 21:17:00 +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 4fdXLh1XRfz3C8B for ; Sat, 21 Mar 2026 21:17:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774127820; 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=MROPfCoLShFgGSwQoDyKQ0xnhC33bII48K2KY1f5HTE5NMeypCIGxY1UdDrcLnKxFp9VU+ U7GpOwQCAj/Y/XzpO8Oc5miwPoKVNylUXqMg9ZmOriY84vPFBXldo7XICJssfAJULqnpAa GXjfoDePxQX98aUGZqD8cXj22aa0kHzQmDrKbf/ccMVc7k6JpY7Jd7IHFYFtXqlATqyjcU pgfmNBN1/aKepiIONnBz7ka3borMw5CM7HclXU1o5AoHpN0x1NiLBc44NxA2X1HI3Je1V2 lFvXWA5qO/ADtoMtePX4MfpUQ+Ip/K1Vz70Q5PrF0CSGyplBMzEJymJEX9oG6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774127820; a=rsa-sha256; cv=none; b=yzeAhNuWCxoAlzPZoHwhc0WVQWJjFSSjl6iCGZK1yqe7BGq1GcbvJw2g6gTZ+KLqB1L0BS sbv3hgRnCzqBSXvBGz0XKs1MvFtCAFArxjCK3vJMsmpXpZfRYZ7ru/Wkfuzxe6Ubjv06xw 527GScIHJcZVRXGS3bvA0QVoRNEISYAcIiGsUwEBkDmZOgI9pTR21omKB+ux4TS2s6qjFu bIhhSyLoRzwGx6D+5irvugIWrp50Q+p6XJuZnN3fPiYGs8QU2MTzjPFGC+4ySLpKFtkKh7 irLl++Z8xypU/sWqdCMqcNv42bAXgTZzcT8OJATsHRauiTnJYSFX2xPNQjKBQA== 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=1774127820; 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=vqLC4UnY/LKN2XHktdDvcmQPOo/4R+/NWarM5m5/ZT8wWs6bR0XOiBxY3y5nOB4Fm2nGbY ybzrWqG6HWiYafU34d24Dv5f0XvumOQXR/fR58We58GP2DAFL1HuZbc804Y6o7OrKqrKXk 9oy5v9Gh7BneoWoYFbKbrFns1vy0COswbIyElnkmXEcq48f/BcMfcRQ7eEOA5VNwWu3Tyt CnMVBm46sJVsiheSZ8CvUaNR/DIOeG01L039uVBzH5AuQa5Xdie32naLICyBih96bVlQaT 5yiGogMqbPu9lVCCRcrKdqZIPhiAwAjj5oSJpVx8lCM1gzphxbnPKxZTJbOZFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fdXLh0qvBzD9W 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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))