From nobody Thu Mar 13 16:57:21 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 4ZDDFG3cCmz5qwbZ; Thu, 13 Mar 2025 16:57:22 +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 4ZDDFG1FHYz3gpN; Thu, 13 Mar 2025 16:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741885042; 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=OjeSb9Q0f+72LIiBEsHKt8sWliLRN7stsYWxtVm93Dg=; b=s314rtSak048M98jr7PJcvSHNFq4lgZbxcGZWn4iwFkkBj3RwJsSAUZpgyD0pb79f0asag 42dkk+QhN8CfYLaSMmNaG9j2GENvfKIHcSceT2Lmmiq2KhFAoMclq3stUVyybXLCsIkDSs QQDILzgp51CmKS5l9IyJPEYFM48aRERC0sC4JG4Au2Wb2+7WS4tkODyYoR48sG4NFZkscV ufblwos+88BgJ/pNp+uI4GHnychj0SgiGWHBkoNxpWOismyYMJCSGFQ58Q2yjmhL37kcBA gFCKybbCbLflRz0PiukcQpYCt8R50CdhoW5cpkz/oDJvLwGcoXH4L/FhrllbUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741885042; a=rsa-sha256; cv=none; b=arxpQPrC1+CcjULsmUrwAq5jqUEnOhuI1vpOtVRaHRPmZKNEfDiHXqd/6RvuOqfQcU/v1u +gtrZfT67fZFxjyceigQ2M+KY1o+QsB+nVlkCbRPzGRkyJoTPcT6930oTQxnOhk7zdh8xB 9UgUXUA/BlAYqmwo/nDbhOZCM3bONvFUZmiOuditgtEvm0c8f1RBtr5LjDe/ZKy8UVwWIx K1id3EQaHVguAAOaT7q3fsPnP2rVsiv+uhSmgTTPqAQsxUaTEm+L67COc/BeutHqFTMmAQ dXawKjNAyVXomfPWWDoz69IuBMLfArNYg81apKShAiKDUTLByrEJ7PEL9fBg9A== 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=1741885042; 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=OjeSb9Q0f+72LIiBEsHKt8sWliLRN7stsYWxtVm93Dg=; b=YiUxRNGP+Gw0BomxnPPmQPNxjQJA6ObmXD7+0vLh2di1WPi3QDXxuJuhBiKhMnFC2Pbz87 BxCBUkgvxDEQJ70Hi5/46FYyEX922/j9AUnTfLMXQzoo/uXuMiZsX7ydTu9KZ6tx6jZ4SJ bTrFdoG1zQa42mFRqADrMgvAfN/dewXzVV0WTdaW7FnU0VrB0OGaVqBMvfFhEVGW14Xkbj 1Q/fTs18M0+8/asTjt+Q94pGnIM6FfhACpVgQFwl16j0/bpjXii64Ffij1VMV+Y63JbPN5 wzL9WAESSuH2gNCHWWsJgakrEoZpo4hGJeUf9TOhjzXsuUHmrb/IyKXa2zu/wA== 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 4ZDDFG0k2tz15Ck; Thu, 13 Mar 2025 16:57:22 +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 52DGvL1m045005; Thu, 13 Mar 2025 16:57:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52DGvLQT045002; Thu, 13 Mar 2025 16:57:21 GMT (envelope-from git) Date: Thu, 13 Mar 2025 16:57:21 GMT Message-Id: <202503131657.52DGvLQT045002@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: 00d78c500783 - main - rwmlock/rwlock/sx: Print the pointer of destroyed locks in panic messages 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: 00d78c500783fc91512b3c0d231029ac75a131d9 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=00d78c500783fc91512b3c0d231029ac75a131d9 commit 00d78c500783fc91512b3c0d231029ac75a131d9 Author: John Baldwin AuthorDate: 2025-03-13 16:54:40 +0000 Commit: John Baldwin CommitDate: 2025-03-13 16:57:06 +0000 rwmlock/rwlock/sx: Print the pointer of destroyed locks in panic messages Suggested by: markj Reviewed by: kib, markj Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D49332 --- sys/kern/kern_rmlock.c | 8 ++++---- sys/kern/kern_rwlock.c | 18 ++++++++++-------- sys/kern/kern_sx.c | 17 +++++++++-------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/sys/kern/kern_rmlock.c b/sys/kern/kern_rmlock.c index bdee79e2cf1a..0867e9e14fee 100644 --- a/sys/kern/kern_rmlock.c +++ b/sys/kern/kern_rmlock.c @@ -601,7 +601,7 @@ _rm_wlock_debug(struct rmlock *rm, const char *file, int line) ("rm_wlock() by idle thread %p on rmlock %p @ %s:%d", curthread, rm, file, line)); KASSERT(!rm_destroyed(rm), - ("rm_wlock() of destroyed rmlock @ %s:%d", file, line)); + ("rm_wlock() of destroyed rmlock %p @ %s:%d", rm, file, line)); _rm_assert(rm, RA_UNLOCKED, file, line); WITNESS_CHECKORDER(&rm->lock_object, LOP_NEWORDER | LOP_EXCLUSIVE, @@ -622,7 +622,7 @@ _rm_wunlock_debug(struct rmlock *rm, const char *file, int line) return; KASSERT(!rm_destroyed(rm), - ("rm_wunlock() of destroyed rmlock @ %s:%d", file, line)); + ("rm_wunlock() of destroyed rmlock %p @ %s:%d", rm, file, line)); _rm_assert(rm, RA_WLOCKED, file, line); WITNESS_UNLOCK(&rm->lock_object, LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("RMWUNLOCK", &rm->lock_object, 0, 0, file, line); @@ -652,7 +652,7 @@ _rm_rlock_debug(struct rmlock *rm, struct rm_priotracker *tracker, ("rm_rlock() by idle thread %p on rmlock %p @ %s:%d", curthread, rm, file, line)); KASSERT(!rm_destroyed(rm), - ("rm_rlock() of destroyed rmlock @ %s:%d", file, line)); + ("rm_rlock() of destroyed rmlock %p @ %s:%d", rm, file, line)); if (!trylock) { KASSERT(!rm_wowned(rm), ("rm_rlock: wlock already held for %s @ %s:%d", @@ -686,7 +686,7 @@ _rm_runlock_debug(struct rmlock *rm, struct rm_priotracker *tracker, return; KASSERT(!rm_destroyed(rm), - ("rm_runlock() of destroyed rmlock @ %s:%d", file, line)); + ("rm_runlock() of destroyed rmlock %p @ %s:%d", rm, file, line)); _rm_assert(rm, RA_RLOCKED, file, line); WITNESS_UNLOCK(&rm->lock_object, 0, file, line); LOCK_LOG_LOCK("RMRUNLOCK", &rm->lock_object, 0, 0, file, line); diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c index ee04f4f30d2c..ed6ca75bc7a5 100644 --- a/sys/kern/kern_rwlock.c +++ b/sys/kern/kern_rwlock.c @@ -295,7 +295,7 @@ _rw_wlock_cookie(volatile uintptr_t *c, const char *file, int line) ("rw_wlock() by idle thread %p on rwlock %p @ %s:%d", curthread, rw, file, line)); KASSERT(rw->rw_lock != RW_DESTROYED, - ("rw_wlock() of destroyed rwlock @ %s:%d", file, line)); + ("rw_wlock() of destroyed rwlock %p @ %s:%d", rw, file, line)); WITNESS_CHECKORDER(&rw->lock_object, LOP_NEWORDER | LOP_EXCLUSIVE, file, line, NULL); tid = (uintptr_t)curthread; @@ -328,7 +328,7 @@ __rw_try_wlock_int(struct rwlock *rw LOCK_FILE_LINE_ARG_DEF) ("rw_try_wlock() by idle thread %p on rwlock %p @ %s:%d", curthread, rw, file, line)); KASSERT(rw->rw_lock != RW_DESTROYED, - ("rw_try_wlock() of destroyed rwlock @ %s:%d", file, line)); + ("rw_try_wlock() of destroyed rwlock %p @ %s:%d", rw, file, line)); rval = 1; recursed = false; @@ -376,7 +376,7 @@ _rw_wunlock_cookie(volatile uintptr_t *c, const char *file, int line) rw = rwlock2rw(c); KASSERT(rw->rw_lock != RW_DESTROYED, - ("rw_wunlock() of destroyed rwlock @ %s:%d", file, line)); + ("rw_wunlock() of destroyed rwlock %p @ %s:%d", rw, file, line)); __rw_assert(c, RA_WLOCKED, file, line); WITNESS_UNLOCK(&rw->lock_object, LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("WUNLOCK", &rw->lock_object, 0, rw->rw_recurse, file, @@ -684,7 +684,7 @@ __rw_rlock_int(struct rwlock *rw LOCK_FILE_LINE_ARG_DEF) ("rw_rlock() by idle thread %p on rwlock %p @ %s:%d", td, rw, file, line)); KASSERT(rw->rw_lock != RW_DESTROYED, - ("rw_rlock() of destroyed rwlock @ %s:%d", file, line)); + ("rw_rlock() of destroyed rwlock %p @ %s:%d", rw, file, line)); KASSERT(rw_wowner(rw) != td, ("rw_rlock: wlock already held for %p @ %s:%d", rw, file, line)); @@ -727,7 +727,8 @@ __rw_try_rlock_int(struct rwlock *rw LOCK_FILE_LINE_ARG_DEF) x = rw->rw_lock; for (;;) { KASSERT(rw->rw_lock != RW_DESTROYED, - ("rw_try_rlock() of destroyed rwlock @ %s:%d", file, line)); + ("rw_try_rlock() of destroyed rwlock %p @ %s:%d", rw, file, + line)); if (!(x & RW_LOCK_READ)) break; if (atomic_fcmpset_acq_ptr(&rw->rw_lock, &x, x + RW_ONE_READER)) { @@ -862,7 +863,7 @@ _rw_runlock_cookie_int(struct rwlock *rw LOCK_FILE_LINE_ARG_DEF) uintptr_t v; KASSERT(rw->rw_lock != RW_DESTROYED, - ("rw_runlock() of destroyed rwlock @ %s:%d", file, line)); + ("rw_runlock() of destroyed rwlock %p @ %s:%d", rw, file, line)); __rw_assert(&rw->rw_lock, RA_RLOCKED, file, line); WITNESS_UNLOCK(&rw->lock_object, 0, file, line); LOCK_LOG_LOCK("RUNLOCK", &rw->lock_object, 0, 0, file, line); @@ -1310,7 +1311,8 @@ __rw_try_upgrade_int(struct rwlock *rw LOCK_FILE_LINE_ARG_DEF) return (1); KASSERT(rw->rw_lock != RW_DESTROYED, - ("rw_try_upgrade() of destroyed rwlock @ %s:%d", file, line)); + ("rw_try_upgrade() of destroyed rwlock %p @ %s:%d", rw, file, + line)); __rw_assert(&rw->rw_lock, RA_RLOCKED, file, line); /* @@ -1393,7 +1395,7 @@ __rw_downgrade_int(struct rwlock *rw LOCK_FILE_LINE_ARG_DEF) return; KASSERT(rw->rw_lock != RW_DESTROYED, - ("rw_downgrade() of destroyed rwlock @ %s:%d", file, line)); + ("rw_downgrade() of destroyed rwlock %p @ %s:%d", rw, file, line)); __rw_assert(&rw->rw_lock, RA_WLOCKED | RA_NOTRECURSED, file, line); #ifndef INVARIANTS if (rw_recursed(rw)) diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c index e9aad6c6be58..accea5d288eb 100644 --- a/sys/kern/kern_sx.c +++ b/sys/kern/kern_sx.c @@ -284,7 +284,8 @@ sx_try_slock_int(struct sx *sx LOCK_FILE_LINE_ARG_DEF) x = sx->sx_lock; for (;;) { KASSERT(x != SX_LOCK_DESTROYED, - ("sx_try_slock() of destroyed sx @ %s:%d", file, line)); + ("sx_try_slock() of destroyed sx %p @ %s:%d", sx, file, + line)); if (!(x & SX_LOCK_SHARED)) break; if (atomic_fcmpset_acq_ptr(&sx->sx_lock, &x, x + SX_ONE_SHARER)) { @@ -320,7 +321,7 @@ _sx_xlock(struct sx *sx, int opts, const char *file, int line) ("sx_xlock() by idle thread %p on sx %p @ %s:%d", curthread, sx, file, line)); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, - ("sx_xlock() of destroyed sx @ %s:%d", file, line)); + ("sx_xlock() of destroyed sx %p @ %s:%d", sx, file, line)); WITNESS_CHECKORDER(&sx->lock_object, LOP_NEWORDER | LOP_EXCLUSIVE, file, line, NULL); tid = (uintptr_t)curthread; @@ -357,7 +358,7 @@ sx_try_xlock_int(struct sx *sx LOCK_FILE_LINE_ARG_DEF) ("sx_try_xlock() by idle thread %p on sx %p @ %s:%d", curthread, sx, file, line)); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, - ("sx_try_xlock() of destroyed sx @ %s:%d", file, line)); + ("sx_try_xlock() of destroyed sx %p @ %s:%d", sx, file, line)); rval = 1; recursed = false; @@ -401,7 +402,7 @@ _sx_xunlock(struct sx *sx, const char *file, int line) { KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, - ("sx_xunlock() of destroyed sx @ %s:%d", file, line)); + ("sx_xunlock() of destroyed sx %p @ %s:%d", sx, file, line)); _sx_assert(sx, SA_XLOCKED, file, line); WITNESS_UNLOCK(&sx->lock_object, LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("XUNLOCK", &sx->lock_object, 0, sx->sx_recurse, file, @@ -430,7 +431,7 @@ sx_try_upgrade_int(struct sx *sx LOCK_FILE_LINE_ARG_DEF) return (1); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, - ("sx_try_upgrade() of destroyed sx @ %s:%d", file, line)); + ("sx_try_upgrade() of destroyed sx %p @ %s:%d", sx, file, line)); _sx_assert(sx, SA_SLOCKED, file, line); /* @@ -479,7 +480,7 @@ sx_downgrade_int(struct sx *sx LOCK_FILE_LINE_ARG_DEF) return; KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, - ("sx_downgrade() of destroyed sx @ %s:%d", file, line)); + ("sx_downgrade() of destroyed sx %p @ %s:%d", sx, file, line)); _sx_assert(sx, SA_XLOCKED | SA_NOTRECURSED, file, line); #ifndef INVARIANTS if (sx_recursed(sx)) @@ -1267,7 +1268,7 @@ _sx_slock_int(struct sx *sx, int opts LOCK_FILE_LINE_ARG_DEF) ("sx_slock() by idle thread %p on sx %p @ %s:%d", curthread, sx, file, line)); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, - ("sx_slock() of destroyed sx @ %s:%d", file, line)); + ("sx_slock() of destroyed sx %p @ %s:%d", sx, file, line)); WITNESS_CHECKORDER(&sx->lock_object, LOP_NEWORDER, file, line, NULL); error = 0; @@ -1369,7 +1370,7 @@ _sx_sunlock_int(struct sx *sx LOCK_FILE_LINE_ARG_DEF) uintptr_t x; KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, - ("sx_sunlock() of destroyed sx @ %s:%d", file, line)); + ("sx_sunlock() of destroyed sx %p @ %s:%d", sx, file, line)); _sx_assert(sx, SA_SLOCKED, file, line); WITNESS_UNLOCK(&sx->lock_object, 0, file, line); LOCK_LOG_LOCK("SUNLOCK", &sx->lock_object, 0, 0, file, line);