From nobody Thu Nov 14 14:58:21 2024 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 4Xq3Ds2z4Pz5cmBB; Thu, 14 Nov 2024 14:58:21 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xq3Ds2SrBz4cKv; Thu, 14 Nov 2024 14:58:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731596301; 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=FkxPacgNRlnUocwYcX5Npf5apzisPlQKOGO3GysE+jw=; b=L7keL4WU5g4tJjIiBVtv+6NPFs9Y/wFshYC8NlRXfvF9fPFx5SXxKwXu+Nu55tEwpgo8I6 qEtgitTclI7pLymUvGhQtdnWToiqI0lYh1/hvXncMLiZkwWN3rdVI3PMyHi+8N9Mu9/vBE +d/17lFg8iC3kWRXsJfx9iSOy7pUwBGOUTH5Ma8mJJQvMXeYuuRlnRe+7HsvHnkTvP1wI1 GJMcahSUSf08B5lRG48E7S17L87GZ9pg1/ExtDsBdX4VVhbFl8Jog0/8JdiPEs2yF9AMv5 N/+GUeKsKPQiFQkl33bfbYnF8cToPyGn2YwTWy9zHTKuoiSzrPjvx7JKzB3ZVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731596301; 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=FkxPacgNRlnUocwYcX5Npf5apzisPlQKOGO3GysE+jw=; b=jIk9Zb6ufyGvapssRDX7aDgj2L2u4tzWqHJhevJ6l1Vghao8uyq49bju92TO6rNIFr+Cvs n9BNl4HX+eCGxT+dZHfi4FE0AIL6twiKltswXSzdgOz9I1Nof+fLEAd6It2dZcogEOd1wm RiijR5DZ8spIVN3dpjJHSWA9Adza0rylwb/EU63vCAqW40pZo7NhEmp9U396Syj0Bt9fvI DBnr7ofi2FUY1bGtTPFhArsJqZzFlr3J6GXvDuSx2Rw/deohgcTjWTzA7WVqR1f5RQRsSA C8qDVZM1wrtzzVPLDsOb7N2HvHSeJkSr2CZTGLefIGEhfHvbss84m4+7SGZTAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731596301; a=rsa-sha256; cv=none; b=Lsg5wY4ff0e4rgqWqR0DwF4eLN070NImNHj/nrmhV+cduPyL+OLi2rNpugJbXytvKkbHpP r2EV1IcqKmK+NNpo43bN75QOFIV6SXCak8Z6C/Z59Frp0poiifbJuDou7i/RllrIcog8QE Q/lrC9DyXXMrwTZUcGoU7i+V7jhhwcEDHbzgC6bG2aEynhu60GD6YUqvzj56+q4T8kKvVf dTAWRd3hNaOqnlOW9FBn9ggnv2EwSNiSm8uz04cgfTtyZ1nw2PfWQa6pXbHpaQDBX4b5Gz KRPrH2awtMv7+r0ULpCsEvO7n3itcr9VZYObRF0JNJZ9hEGEXHIr4XS6kMgqrg== 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 4Xq3Ds247dzkBW; Thu, 14 Nov 2024 14:58:21 +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 4AEEwLv6006708; Thu, 14 Nov 2024 14:58:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AEEwLPi006705; Thu, 14 Nov 2024 14:58:21 GMT (envelope-from git) Date: Thu, 14 Nov 2024 14:58:21 GMT Message-Id: <202411141458.4AEEwLPi006705@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 73da0265c29c - main - locks: Use %p to print uintptr_t values 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73da0265c29c79641dab3e6b98452bd5afca01fb Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=73da0265c29c79641dab3e6b98452bd5afca01fb commit 73da0265c29c79641dab3e6b98452bd5afca01fb Author: John Baldwin AuthorDate: 2024-11-14 14:57:14 +0000 Commit: John Baldwin CommitDate: 2024-11-14 14:57:56 +0000 locks: Use %p to print uintptr_t values Pointers are not the same shape as sizes on CHERI architectures. Cast to void * and print with %p instead. Obtained from: CheriBSD Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D47342 --- sys/kern/kern_mutex.c | 2 +- sys/kern/kern_rwlock.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index fa043fa7e124..c04412688979 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -1072,7 +1072,7 @@ __mtx_unlock_sleep(volatile uintptr_t *c, uintptr_t v) _mtx_release_lock_quick(m); ts = turnstile_lookup(&m->lock_object); if (__predict_false(ts == NULL)) { - panic("got NULL turnstile on mutex %p v %zx", m, v); + panic("got NULL turnstile on mutex %p v %p", m, (void *)v); } if (LOCK_LOG_TEST(&m->lock_object, opts)) CTR1(KTR_LOCK, "_mtx_unlock_sleep: %p contested", m); diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c index c7e377c8f77a..3286fce76d96 100644 --- a/sys/kern/kern_rwlock.c +++ b/sys/kern/kern_rwlock.c @@ -843,8 +843,8 @@ __rw_runlock_hard(struct rwlock *rw, struct thread *td, uintptr_t v */ ts = turnstile_lookup(&rw->lock_object); if (__predict_false(ts == NULL)) { - panic("got NULL turnstile on rwlock %p passedv %zx v %zx", - rw, passedv, v); + panic("got NULL turnstile on rwlock %p passedv %p v %p", + rw, (void *)passedv, (void *)v); } turnstile_broadcast(ts, queue); turnstile_unpend(ts); @@ -1288,8 +1288,8 @@ __rw_wunlock_hard(volatile uintptr_t *c, uintptr_t v LOCK_FILE_LINE_ARG_DEF) ts = turnstile_lookup(&rw->lock_object); if (__predict_false(ts == NULL)) { - panic("got NULL turnstile on rwlock %p passedv %zx v %zx", rw, - passedv, v); + panic("got NULL turnstile on rwlock %p passedv %p v %p", rw, + (void *)passedv, (void *)v); } turnstile_broadcast(ts, queue); turnstile_unpend(ts);