From nobody Wed Mar 12 14:47:39 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 4ZCYQ41zByz5r2M1; Wed, 12 Mar 2025 14:47:40 +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 4ZCYQ34jXKz42T4; Wed, 12 Mar 2025 14:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741790859; 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=KwEAIbgbavCgVYTRpUbuDK1rf6P1mtboVaLnbdLMyC4=; b=tSWSmLC6MNzn5B/mk/qnvGV6E53+TjV5W6b7vsY29SsSUaePteQt2+q5kHIy/AbZlWkgL0 3xPNvgC0HKGeGlOoVz2NcsxyA8464hGsYOjIcjIuhyqXpinaFwYtQ/epdS+LIpI9tzxuTb aJyM+c7AMRMe97OYFNvykOQAvxx01ZN43/dpiHRfEdmsD4TXy6E3CA4CkmNtOdgONV3H6K uf54BVikr+VlYqG0DMvrv2R/LxmwEXnTaMveJ4KW3rml6Pp1ChN/7TGi3Wy3F+HjpFkWdu SOOxmDvYMNk9Uor1DrGRSWTDGY5w2ixg0pRD+bjuq/+bcKFIEfTv1o1XpWEAUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741790859; a=rsa-sha256; cv=none; b=xGvoqdYwaUjSUCAIiAsFhMaXOCc+nI+zJkU2Zn1PD7136VmK1NUP/HszXv74XixuyBeV/H C9fzsBAGJoYDWEDTN48zXRRcP0K+QFIHoGwpT6eSjN7hCAb6kVObPTbrbbehdN9Xh7oOHX xvso9mOfArVGo1ASzMfnFOKbkgcT9nueV8PhPz+SL6Q5Fn77n6/iR/lZV17KzTvR9VrxIB WuaIEJej4O+jKIJ22a19foNyQFBl6TmSxZj2dDhVKNzXvzpb7kKuo+KqsqnY3TFPAfbIxF oecGc1aiRL0jlE/HweMdAqQfZ9+AHWxyBPnp4PfyRHryAFO1UFETib56Hq/dzA== 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=1741790859; 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=KwEAIbgbavCgVYTRpUbuDK1rf6P1mtboVaLnbdLMyC4=; b=U/78GoHMnAHMcaRF5fd/ELT1lOr5kHn9F4/0ZGdXDsuqt5eaAFemE4b1qX75CBh2NhUTEj kn6fcsZovf87rrqPrL7CXNt8oULeNAt+Vf12TZN3vOw03PZ+eCcJ5YD3Mh06PJLHRGBBvx yrRMj2m9CL6Hk+nIAQpZBKL8MxYZCmW7BcfWXuG1nsPL5qNs3HZI9lM2tBHJkHZD4BVxvC p9R7fwTdHiM+1mcs3SDFbM1jsp6IdI8X0Hdzjkf0zSurHZHiB+RHy9q5cDqPCE8lBo2CqJ 7+KoTmpKWu5D0CKbDgGjGrZfNeJ8H/bGwu1+cWqNFsViy0YYxMcXVqsJ2wrrTw== 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 4ZCYQ345Hzz1Lp; Wed, 12 Mar 2025 14:47:39 +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 52CEldbD096624; Wed, 12 Mar 2025 14:47:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52CEldaZ096621; Wed, 12 Mar 2025 14:47:39 GMT (envelope-from git) Date: Wed, 12 Mar 2025 14:47:39 GMT Message-Id: <202503121447.52CEldaZ096621@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: 43a15a22c623 - main - mtx: Include the mutex pointer in the panic message for destroyed locks 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: 43a15a22c62345091fc4a2ea2bec529acda7c61f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=43a15a22c62345091fc4a2ea2bec529acda7c61f commit 43a15a22c62345091fc4a2ea2bec529acda7c61f Author: John Baldwin AuthorDate: 2025-03-12 14:26:50 +0000 Commit: John Baldwin CommitDate: 2025-03-12 14:39:26 +0000 mtx: Include the mutex pointer in the panic message for destroyed locks Reviewed by: olce, kib, markj Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D49315 --- sys/kern/kern_mutex.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index 0a873cf139c4..d52f7e1eebd1 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -287,7 +287,7 @@ __mtx_lock_flags(volatile uintptr_t *c, int opts, const char *file, int line) ("mtx_lock() by idle thread %p on mutex %p @ %s:%d", curthread, m, file, line)); KASSERT(m->mtx_lock != MTX_DESTROYED, - ("mtx_lock() of destroyed mutex @ %s:%d", file, line)); + ("mtx_lock() of destroyed mutex %p @ %s:%d", m, file, line)); KASSERT(LOCK_CLASS(&m->lock_object) != &lock_class_mtx_spin, ("mtx_lock() of spin mutex %s @ %s:%d", m->lock_object.lo_name, file, line)); @@ -316,7 +316,7 @@ __mtx_unlock_flags(volatile uintptr_t *c, int opts, const char *file, int line) m = mtxlock2mtx(c); KASSERT(m->mtx_lock != MTX_DESTROYED, - ("mtx_unlock() of destroyed mutex @ %s:%d", file, line)); + ("mtx_unlock() of destroyed mutex %p @ %s:%d", m, file, line)); KASSERT(LOCK_CLASS(&m->lock_object) != &lock_class_mtx_spin, ("mtx_unlock() of spin mutex %s @ %s:%d", m->lock_object.lo_name, file, line)); @@ -345,7 +345,7 @@ __mtx_lock_spin_flags(volatile uintptr_t *c, int opts, const char *file, m = mtxlock2mtx(c); KASSERT(m->mtx_lock != MTX_DESTROYED, - ("mtx_lock_spin() of destroyed mutex @ %s:%d", file, line)); + ("mtx_lock_spin() of destroyed mutex %p @ %s:%d", m, file, line)); KASSERT(LOCK_CLASS(&m->lock_object) != &lock_class_mtx_sleep, ("mtx_lock_spin() of sleep mutex %s @ %s:%d", m->lock_object.lo_name, file, line)); @@ -386,7 +386,8 @@ __mtx_trylock_spin_flags(volatile uintptr_t *c, int opts, const char *file, m = mtxlock2mtx(c); KASSERT(m->mtx_lock != MTX_DESTROYED, - ("mtx_trylock_spin() of destroyed mutex @ %s:%d", file, line)); + ("mtx_trylock_spin() of destroyed mutex %p @ %s:%d", m, file, + line)); KASSERT(LOCK_CLASS(&m->lock_object) != &lock_class_mtx_sleep, ("mtx_trylock_spin() of sleep mutex %s @ %s:%d", m->lock_object.lo_name, file, line)); @@ -411,7 +412,8 @@ __mtx_unlock_spin_flags(volatile uintptr_t *c, int opts, const char *file, m = mtxlock2mtx(c); KASSERT(m->mtx_lock != MTX_DESTROYED, - ("mtx_unlock_spin() of destroyed mutex @ %s:%d", file, line)); + ("mtx_unlock_spin() of destroyed mutex %p @ %s:%d", m, file, + line)); KASSERT(LOCK_CLASS(&m->lock_object) != &lock_class_mtx_sleep, ("mtx_unlock_spin() of sleep mutex %s @ %s:%d", m->lock_object.lo_name, file, line)); @@ -449,7 +451,7 @@ _mtx_trylock_flags_int(struct mtx *m, int opts LOCK_FILE_LINE_ARG_DEF) ("mtx_trylock() by idle thread %p on mutex %p @ %s:%d", curthread, m, file, line)); KASSERT(m->mtx_lock != MTX_DESTROYED, - ("mtx_trylock() of destroyed mutex @ %s:%d", file, line)); + ("mtx_trylock() of destroyed mutex %p @ %s:%d", m, file, line)); KASSERT(LOCK_CLASS(&m->lock_object) != &lock_class_mtx_spin, ("mtx_trylock() of spin mutex %s @ %s:%d", m->lock_object.lo_name, file, line)); @@ -826,7 +828,7 @@ thread_lock_validate(struct mtx *m, int opts, const char *file, int line) { KASSERT(m->mtx_lock != MTX_DESTROYED, - ("thread_lock() of destroyed mutex @ %s:%d", file, line)); + ("thread_lock() of destroyed mutex %p @ %s:%d", m, file, line)); KASSERT(LOCK_CLASS(&m->lock_object) != &lock_class_mtx_sleep, ("thread_lock() of sleep mutex %s @ %s:%d", m->lock_object.lo_name, file, line));