From nobody Wed Mar 12 14:47:38 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 4ZCYQ269cbz5r2k1; Wed, 12 Mar 2025 14:47:38 +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 4ZCYQ23zD1z42Sv; Wed, 12 Mar 2025 14:47:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741790858; 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=TNRpimDnJs4Xj1zyOXXX9TlWhmojAWtv4znVb4vVcv8=; b=ejWeqQ79AcnQ9d5DPh2Bg5/FZ8O5tIyWLAclm1ImY+WPp9YwQf3E3BV4pcrOzEuvoPoj13 h/LHGonEKe+k0qVBWlJSxFAcTMeivkoOHNMXmDK6sY5WvNkHdk/pGDahUcbLs/TfW1OZjY 8TFSCQwrp34dfR/qQ9e5/XVviv3XzDAryZLoI70HgzTUJtRH69ZYM8fUvlmb7cgZ7cuuRQ 9zxHNDquSzu2CUjg9Xu+NQVJMWaVqazPoNxXtZDzWmFbTNNwkxJbGOW8NeyBBYn1Apcw4o W5VPhE0a8xl2J2q4aXcUOWMBznhhIVGgYZz7BxFjs8jxNEub5c/2fXqazL4pTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741790858; a=rsa-sha256; cv=none; b=t6wutXgdRVvK4+qg2GX3Any/K7YYwC94e+Qh2Kx5pAmzDAahKJLHf+SN3zxm1+h3So3YKW G7lGpmLiQlNzztDcAaR2FGIBFGgSIJOQkCHQvkn73O68tuy/99i23j9sZ2DNH0iIx3in00 oqLYdWVeowsQSOzHvyRGTUBI78g1J0ClFHNWSd8X+9AMJygk3R8KSYQNUO0Nl6hYD3xJSD Kim6AYr1daoyPjKKBiO/gp16YNcD7FYeuC5hNYipm8mezN2J+ffrg3WSYtxLEX0DqMhKkz 34pNrvvSqVBtK2yn9aYXBmTd/Aqive3sSCQyAepg8o3slZa6CB4Ddg4e5iBAjA== 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=1741790858; 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=TNRpimDnJs4Xj1zyOXXX9TlWhmojAWtv4znVb4vVcv8=; b=dpObW222UDOB41m4cEyuVf/Eadws4IEbvs57ZHK02mokoI7XuuRemUvtYLQ5iRezuC0yd+ N1cZm7Ekpw8zk0aEfN9mzs4swzsx9Ru97UmBNqmCMdsjMt5Ptl+8CcfUylko9NqyovAnLf FlsslJSgw10z44F/+ech3ZmXQ+dVLgHP3td+kBSVvw6MvC53ahPr9RFTtwMJK7dXbBFJ9/ I5lm6qTwRYIddTqW7UC3sTOsMqYrMjRB3w01RGFG8yaM5/dTyowuZv/9TUUxoq5NDEqEDq Z8h03k2vL2OrITu8Av3vevegV1jUPFKoJUxihSPlA+7wY1YNxFmqa2HOGigRvw== 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 4ZCYQ236qTz1dm; Wed, 12 Mar 2025 14:47:38 +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 52CElckd096590; Wed, 12 Mar 2025 14:47:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52CElcxL096587; Wed, 12 Mar 2025 14:47:38 GMT (envelope-from git) Date: Wed, 12 Mar 2025 14:47:38 GMT Message-Id: <202503121447.52CElcxL096587@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: 0ed104978ce5 - main - mtx: Make idle thread assertions more robust 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: 0ed104978ce55ecacf42bde4458acda0cc773940 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0ed104978ce55ecacf42bde4458acda0cc773940 commit 0ed104978ce55ecacf42bde4458acda0cc773940 Author: John Baldwin AuthorDate: 2025-03-12 14:25:13 +0000 Commit: John Baldwin CommitDate: 2025-03-12 14:39:26 +0000 mtx: Make idle thread assertions more robust Just print the pointer to the mutex instead of the name in case the mutex is corrupted. Reviewed by: olce, kib Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D49314 --- sys/kern/kern_mutex.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index 3ada9246326f..0a873cf139c4 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -284,8 +284,8 @@ __mtx_lock_flags(volatile uintptr_t *c, int opts, const char *file, int line) KASSERT(kdb_active != 0 || SCHEDULER_STOPPED() || !TD_IS_IDLETHREAD(curthread), - ("mtx_lock() by idle thread %p on sleep mutex %s @ %s:%d", - curthread, m->lock_object.lo_name, file, 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)); KASSERT(LOCK_CLASS(&m->lock_object) != &lock_class_mtx_spin, @@ -446,8 +446,8 @@ _mtx_trylock_flags_int(struct mtx *m, int opts LOCK_FILE_LINE_ARG_DEF) return (1); KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(td), - ("mtx_trylock() by idle thread %p on sleep mutex %s @ %s:%d", - curthread, m->lock_object.lo_name, file, line)); + ("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)); KASSERT(LOCK_CLASS(&m->lock_object) != &lock_class_mtx_spin,