From nobody Wed Nov 11 01:06:52 2026 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 4jPQMw5mcZz6y1l7 for ; Wed, 11 Nov 2026 01:06:52 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jPQMw5GsVz4nXw for ; Wed, 11 Nov 2026 01:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794359212; 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=zIuzTR1rIYFRi58aF4Kg5sUS6iu3pNpwunSnjI33RDw=; b=UOqyOjGS7w4JHYrl9HJtc0OmNihOxWRA+TL5ZlO4I78Vfso+yhlPt8/gxMJecO8Nh/jF8s znPrudP+/P4nHYXtebylmnzH/Ra+cJyvyjxUKH8GVjoO7jqfIWf3Pz9uMWgcy5X6jB/XhQ 18ckpJ8s/bfcVzsgUZC34nuqgHBwlSZR82/LRcOn1aaoPRt2vlbFE4bL2O+A7o6UCXx6Lc LhC9Ihez208wuDq6P/NuDijk8RjXM9GtjifiSoWYW/hJWpdDxZt7DO9Nzz/O8stqMhwOrT GEndwWqlAWEPJG3tBgWl2fno1+KZja99M2oabNt+dW+INfIhBVruYjfkIhU4yg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794359212; b=xNnhuciJrNwHKwb7hsaTU18Xi8TOOlTq4omnxht0KGzkfiG710nM7t9KmtMXitmbObz8HR 7vcves/re4wvAjBbofyaQbFP7c5yM6QjJg5uRtVFFarj/oKvVY1+C7kMhDByav4Hv9pq5M c2qHnAmY0kv9TGhXLaWGW7uRRniZeA92oGDaFeHCm4QZvqrtC3Xf2LUb1slXp1sSbeNjSL 8QRS19wDLCNo/e7DhkKRoksheC5hmZxLkmVorKSI4vYW8TlnW6h0FpHEunb9bXqNhGYRy5 4oPZ4DnEDMQ4LLaGZXlzGjdtRud3QeryEX8/Qlf/3qbGTtBG6JIavArVggMzrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794359212; 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=zIuzTR1rIYFRi58aF4Kg5sUS6iu3pNpwunSnjI33RDw=; b=y0urOtUdJdKPvaWiNA+2Eo6X5pmTkhpfQyRfWsczSTpdGWMp/ygGu1HRa8ok3WFPNmb6TA 42Z+mTHcnXybH1Y2ydiYTxEqfd8mC4XQmTfjn9ZgdsuAK+Fnqz40456tJKc0VdqhCzgHI+ 1S5ZJC3Cj6FL9oYGe0Y47rzpj7bhoqC+D64p+H44BHgxP6Zpr3f5pWWKr/7ZgJSBwTaKN6 pRiLNlcMaY8FojoWNGY6EcFyFhyRxEze/fbJAUf97bxkQB+h1LUI89KOt3V7UQVZB0Y+sP tNkrW0TJLRzdQACb0PrRMTctCbaqEhX0l13ljBdzX4VGLOnqK/ybi8NXBRAfFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jPQMw4Qg1zsJG for ; Wed, 11 Nov 2026 01:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23282 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 01:06:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c1dfe1821292 - stable/15 - libthr/thr_mutex.c: make mutex asserts more useful List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: c1dfe1821292daea73d468bca565fe08d874cfc0 Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 01:06:52 +0000 Message-Id: <6af3bfac.23282.5faa10c6@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c1dfe1821292daea73d468bca565fe08d874cfc0 commit c1dfe1821292daea73d468bca565fe08d874cfc0 Author: Konstantin Belousov AuthorDate: 2026-10-27 13:05:59 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-10 19:53:54 +0000 libthr/thr_mutex.c: make mutex asserts more useful (cherry picked from commit 4ab9e73994e673e518d1b0631f8ce7d1faec6d80) --- lib/libthr/thread/thr_mutex.c | 50 +++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c index ccb3094db16d..cd79a5d1e93d 100644 --- a/lib/libthr/thread/thr_mutex.c +++ b/lib/libthr/thread/thr_mutex.c @@ -128,41 +128,50 @@ mutex_init_link(struct pthread_mutex *m __unused) #endif } +#if defined(_PTHREADS_INVARIANTS) static void -mutex_assert_is_owned(struct pthread_mutex *m __unused) +mutex_assert_is_owned(struct pthread_mutex *m, int line) { - -#if defined(_PTHREADS_INVARIANTS) - if (__predict_false(m->m_qe.tqe_prev == NULL)) - PANIC("mutex %p own %#x is not on list %p %p", + if (__predict_false(m->m_qe.tqe_prev == NULL)) { + _thread_exitf(__FILE__, line, + "mutex %p own %#x is not on list %p %p", m, m->m_lock.m_owner, m->m_qe.tqe_prev, m->m_qe.tqe_next); -#endif + } } static void -mutex_assert_not_owned(struct pthread *curthread __unused, - struct pthread_mutex *m __unused) +mutex_assert_not_owned(struct pthread_mutex *m, int line) { + struct pthread *curthread; -#if defined(_PTHREADS_INVARIANTS) + curthread = _get_curthread(); if (__predict_false(m->m_qe.tqe_prev != NULL || - m->m_qe.tqe_next != NULL)) - PANIC("mutex %p own %#x is on list %p %p", + m->m_qe.tqe_next != NULL)) { + _thread_exitf(__FILE__, line, + "mutex %p own %#x is on list %p %p", m, m->m_lock.m_owner, m->m_qe.tqe_prev, m->m_qe.tqe_next); + } if (__predict_false(is_robust_mutex(m) && (m->m_lock.m_rb_lnk != 0 || m->m_rb_prev != NULL || (is_pshared_mutex(m) && curthread->robust_list == (uintptr_t)&m->m_lock) || (!is_pshared_mutex(m) && curthread->priv_robust_list == - (uintptr_t)&m->m_lock)))) - PANIC( - "mutex %p own %#x is on robust linkage %p %p head %p phead %p", + (uintptr_t)&m->m_lock)))) { + _thread_exitf(__FILE__, line, + "mutex %p own %#x is on robust linkage %p %p head %p phead %p", m, m->m_lock.m_owner, (void *)m->m_lock.m_rb_lnk, m->m_rb_prev, (void *)curthread->robust_list, (void *)curthread->priv_robust_list); -#endif + } } +#define MUTEX_ASSERT_IS_OWNED(m) mutex_assert_is_owned(m, __LINE__) +#define MUTEX_ASSERT_NOT_OWNED(m) mutex_assert_not_owned(m, __LINE__) +#else +#define MUTEX_ASSERT_IS_OWNED(m) do {} while (0) +#define MUTEX_ASSERT_NOT_OWNED(m) do {} while (0) +#endif + static bool is_pshared_mutex(struct pthread_mutex *m) { @@ -475,8 +484,7 @@ _thr_mutex_destroy(pthread_mutex_t *mutex) if (m1 != NULL) { if ((uint32_t)m1->m_lock.m_owner != UMUTEX_RB_OWNERDEAD) { - mutex_assert_not_owned( - _get_curthread(), m1); + MUTEX_ASSERT_NOT_OWNED(m1); } __thr_pshared_destroy(mutex); } @@ -488,7 +496,7 @@ _thr_mutex_destroy(pthread_mutex_t *mutex) ret = EBUSY; } else { *mutex = THR_MUTEX_DESTROYED; - mutex_assert_not_owned(_get_curthread(), m); + MUTEX_ASSERT_NOT_OWNED(m); __thr_free(m); ret = 0; } @@ -528,7 +536,7 @@ enqueue_mutex(struct pthread *curthread, struct pthread_mutex *m, /* Add to the list of owned mutexes: */ if (error != EOWNERDEAD) - mutex_assert_not_owned(curthread, m); + MUTEX_ASSERT_NOT_OWNED(m); qidx = mutex_qidx(m); TAILQ_INSERT_TAIL(&curthread->mq[qidx], m, m_qe); if (!is_pshared_mutex(m)) @@ -556,7 +564,7 @@ dequeue_mutex(struct pthread *curthread, struct pthread_mutex *m) struct pthread_mutex *mp, *mn; int qidx; - mutex_assert_is_owned(m); + MUTEX_ASSERT_IS_OWNED(m); qidx = mutex_qidx(m); if (is_robust_mutex(m)) { mp = m->m_rb_prev; @@ -1052,7 +1060,7 @@ _pthread_mutex_setprioceiling(pthread_mutex_t * __restrict mutex, curthread = _get_curthread(); if (PMUTEX_OWNER_ID(m) == TID(curthread)) { - mutex_assert_is_owned(m); + MUTEX_ASSERT_IS_OWNED(m); m1 = TAILQ_PREV(m, mutex_queue, m_qe); m2 = TAILQ_NEXT(m, m_qe); if ((m1 != NULL && m1->m_lock.m_ceilings[0] > (u_int)ceiling) ||