From nobody Tue Apr 29 18:30:44 2025 X-Original-To: dev-commits-src-all@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 4Zn85K0vS6z5vN6D; Tue, 29 Apr 2025 18:30:45 +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 4Zn85J3hNzz4HYL; Tue, 29 Apr 2025 18:30:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745951444; 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=s6j5ydyGAaxqa8OFGcdA0217tbmcNCx6N1iNeSe0b9I=; b=xgcLd1s4YkW3xs958SDmTcMSiC0XI0NICY4hKp2edkfSFctFKQnBs6nImfmKcSquKg8+d/ Z78SCn3A7XCmvzdYzzRWrcuD5L1NLsDOGLPApvOYp0gUrrpBZCNdOP0PUIW09HDnvADEex 4Ah3jvM18vwaFKClnirzfyJTff8m8ngVOiHpaBqOBUUyLpE+xVtYozJdr3aYaW4mCCisqt WgidSNXr1fxIXfAK4mhDYGsCzrYJ2ulfVNI0MeR7iljCc7duNwpGoNGEmmGKLpluBqAATQ 9dtG5dyPvQH65J/jeTdQgmESxsvm3JZxIj+issnkWekxC/WXPMnqwJcumwquMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745951444; a=rsa-sha256; cv=none; b=DG3t0/7lnIGlbpVu8oyxttY4Mkk6G37qpnHYAcHPqa0qCpsezGQI0PU9NpggOsaAMN7OE+ IrnOo7s79saEvdMFfXngVtCspJLs0v1LnwGySVWmYLeAy9E5k4n9JnP5RajhqRxYDHB0dJ qIuAmlwapVM1gznAIv7/mq82fKd7LRkrKLzOt3RqnHR8Yzp/3KbKfCmVwWrJeSmFwqmk4t jsmDY3Pi5oBkaXTHeGlH6UwpEjTywvxhYGs86HUxjxQTsRSqdaq/N5zbwjOwx5WqrnHv/u aq9f+OFWz4f7IvISnPSsYnEoc5kBRnUfH0Vq+QrT6P8jXMlmiabdpFGlq2WWsg== 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=1745951444; 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=s6j5ydyGAaxqa8OFGcdA0217tbmcNCx6N1iNeSe0b9I=; b=jgYzZ05cVfGjk2977ZbYiF2lTpiKHOSoEiX7HdFnCFlWvzQdFJOeNXle8vkUqOO1WKE8Wj TI2YnJ1KCWazDfOm1i5bo3Yv3koQpFpwvyxvqbGMgU9rIKpMMY1ItJQQ7K8TnYUra9mUOo 5tJdwiSIiIUQO7Umh/w+AZmNSAlsfk4PalTJYhZwF/Xyg6fkaIxBo+Fn2C/6+hvn7XQATU 0e0Gz8Mqk+u/BQcCeY+n09SJmRZoLX04eSMxS3wnet0WpiCTdvDnDayxDblvYqeH8ald35 01wFyeh/+HyydcZE1F8pOnEVPhaOhlLi3XY5wSRop+mOF2sgNkEi9KjHyiq6qA== 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 4Zn85J2nnYzXmy; Tue, 29 Apr 2025 18:30:44 +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 53TIUiGc022771; Tue, 29 Apr 2025 18:30:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TIUiKd022768; Tue, 29 Apr 2025 18:30:44 GMT (envelope-from git) Date: Tue, 29 Apr 2025 18:30:44 GMT Message-Id: <202504291830.53TIUiKd022768@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: d9ce37179a2f - stable/14 - mtx: Include the mutex pointer in the panic message for destroyed locks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: d9ce37179a2f738feacf5eb9af0d394fc5882543 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d9ce37179a2f738feacf5eb9af0d394fc5882543 commit d9ce37179a2f738feacf5eb9af0d394fc5882543 Author: John Baldwin AuthorDate: 2025-03-12 14:26:50 +0000 Commit: John Baldwin CommitDate: 2025-04-29 14:43:48 +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 (cherry picked from commit 43a15a22c62345091fc4a2ea2bec529acda7c61f) --- 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 9bb059f13d64..3a8afdcad338 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -269,7 +269,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)); @@ -298,7 +298,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)); @@ -327,7 +327,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)); @@ -368,7 +368,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)); @@ -393,7 +394,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)); @@ -431,7 +433,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)); @@ -805,7 +807,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));