From nobody Mon Apr 28 12:23:40 2025 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 4ZmN0F5YPFz5vJ0m; Mon, 28 Apr 2025 12:23:41 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZmN0F0nk0z3gC4; Mon, 28 Apr 2025 12:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745843021; 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=4ids4gb1SLh33sPxA1GC09gMJIxwE357xYQLq3TLvPI=; b=Za9+7plAOqDjdjFeaarrKrjZGbg5P1ztm4+zQREqoAA8mrlxTJ4GOH2ZQOai97EFkc2kKZ Qr2UjZHBulK3oge5pyu3Ke3wpoPJCZUD+UNZefhPMcHaV8vdV/8EcnKr/6Q9/z6tQiNLwk +5/Z/KdPMdea+g1bcLEo8EKo9Fb19gh+8r9gMPne33nEuHakNP0ABaXpZHqt4im8qhqz9M UpedfieG/q7j64oLR5GT8nnwkDt4aD6w+UoSHUGmrdyjIgJV3QvMTyK38jSSeXE7/YbhQ4 119Iqonj/XPrsV8guHBcNc9KXcwNmt5dVmNR3ChwnJq7ZZmstC/Kn1L31OtvQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745843021; a=rsa-sha256; cv=none; b=vPLiKSIDxWgTj03F3WjPy7xrXoLeA85JtFwjbtMj2akVKRoMssEVG7eAGdgncEjHtYbOLn KMZiaYelfUE2Ln+UmdzNTj5A9DbKDODh+Ae9aMUTQaFqLScq5A6T0ZBdScRLhDfPp9/TYY O8bJM4NG9JwFdVvEv3SOLPNTIzjFqHc4QAZgqo2+sRoLwGRhSIcs28CO9ECU0qJXkEazZT +zzx0n6AtrabwhcwbR2YEfcp36hLNkeS9cu6wY429VU8g9aR8YwzQhx8Js/tIeiRoLAUdk fcdR83ZwuGMvzfThBH6w6cHwGnlvfYOna6i0YF9J8AgqlOvhgJxxCvnwh+vW4g== 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=1745843021; 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=4ids4gb1SLh33sPxA1GC09gMJIxwE357xYQLq3TLvPI=; b=yEs3XzLWr0TmglkJz6y1Jjdg41R74KPEpg/ELis7NllDV409dbPtcboLCYWZTHiAriMcVU n7BaanYAD6KdhaFGiJB+Qj3pUrICxtUEdsiC2OhSiqKJ4c6Myr17g0kncmEry5cmQJiJFb vgj8KU2UXlC3JI9Zz14Hpt6l1FqXySwIF5AXa9V73MkGbPo/YM9xgmKXDYWV8eUvK5bdE3 YajgwTnbdBBuIbxjsEVOquwoMYUwqEFNLzxW7FQu+h5+Di5wgeof4ujw36YO3wyQpHUx4j GsFSsX3SNzJnUziSNtjpqowyvP+vhw3PFZgGC4lnVL8WMMHRr+5Kj4FBOBc9mw== 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 4ZmN0F0MfNzbwH; Mon, 28 Apr 2025 12:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53SCNehJ025797; Mon, 28 Apr 2025 12:23:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53SCNemQ025794; Mon, 28 Apr 2025 12:23:40 GMT (envelope-from git) Date: Mon, 28 Apr 2025 12:23:40 GMT Message-Id: <202504281223.53SCNemQ025794@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: b0d4c946572d - main - kassert: Turn 'poisoned_buf' into a 'void *' 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0d4c946572d0120ebbd264bdff328eb6aec9ce6 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=b0d4c946572d0120ebbd264bdff328eb6aec9ce6 commit b0d4c946572d0120ebbd264bdff328eb6aec9ce6 Author: Olivier Certner AuthorDate: 2025-04-07 13:15:49 +0000 Commit: Olivier Certner CommitDate: 2025-04-28 12:19:42 +0000 kassert: Turn 'poisoned_buf' into a 'void *' This is a step to make usable without the need to explicitly include other headers. 'poisoned_buf' is only used for its value and never subject to pointer arithmetics. Keeping 'caddr_t' would require to include (at least on INVARIANTS). Reviewed by: markj MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49971 --- sys/kern/vfs_bio.c | 2 +- sys/sys/kassert.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 08ba752bcf29..ea66a81b5903 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -160,7 +160,7 @@ nbufp(unsigned i) caddr_t __read_mostly unmapped_buf; #ifdef INVARIANTS -caddr_t poisoned_buf = (void *)-1; +void *poisoned_buf = (void *)-1; #endif /* Used below and for softdep flushing threads in ufs/ffs/ffs_softdep.c */ diff --git a/sys/sys/kassert.h b/sys/sys/kassert.h index 7755a241888f..a2bc42058d93 100644 --- a/sys/sys/kassert.h +++ b/sys/sys/kassert.h @@ -51,11 +51,11 @@ extern const char *panicstr; /* panic message */ */ #ifdef INVARIANTS -extern caddr_t poisoned_buf; +extern void *poisoned_buf; #define DEBUG_POISON_POINTER_VALUE poisoned_buf #define DEBUG_POISON_POINTER(x) ({ \ - x = (void *)(DEBUG_POISON_POINTER_VALUE); \ + x = (DEBUG_POISON_POINTER_VALUE); \ }) #else