From nobody Tue Apr 29 18:30:43 2025 X-Original-To: dev-commits-src-branches@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 4Zn85J1tgqz5vNBQ; Tue, 29 Apr 2025 18:30:44 +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 4Zn85H4T9Yz4Hjt; Tue, 29 Apr 2025 18:30:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745951443; 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=Vtob700ykCrhTxgfj4xWJR4H30xstG7x7wOtHgCGXLE=; b=Xaw/z3QWnb6Y2HvXT1WGR8F73s4S/TVdKlBwEjEChYpzxJcmCxDEkc6Yi2QHqqjwnDVAHY zPIRfp4oh5TP/Sj3AdyNyv+aKxzitaIc0/U1ImJ5SGw+hq+xiEVFT9PxRkmMS4L82/euSQ +vfy2wT2TxX92KtFXPGgc/zFpqmHUOXF1rfZrzBJyIhGRIf6Ef1AVVZQ/To5UPhUc88pPk ODn6PsxaovKg/CUsJ7OVQkz7RhPLKlWIPlKsf0LFkJ0ZcIG1SwbiwWrQgX+ppR42IR5ZMV tsUzbXFMsxz2Vi31u3v/ye8ZvfpvBe+dGjzuO7EyqjBk9Hp9KFJoORxHA1DRuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745951443; a=rsa-sha256; cv=none; b=KTPSB2FmA4GFbyX6xvcoabtH2EpqR0USXbn+zk9tXOZDiCm0g3QkVQEp4k9kUexYEaWUxL 7+CJsd9cRnxDU0X40lyy1Ni/+bfOwTEubZnP1IxvxSmYsCWwWuK1QvxG9fCNGPcEGA4l9j WNJ5gri8H4jCho44ArWWxNgHbjp3yfuqY6JgiO9jzsnif36IvD9ucCTkGcKNAVWSRcjoxD 2fKBDIxFxo566jqy0MY+xybk2nCWYkdWb76Ups3W7RXFEaQvlE/z5yXhRkqj2OCboBnLND OaGlzG1oOUw1j21FlI/6L18slL/fCKp/AQvlQUWEwKQLmiRjmMIRzvQH48ydJw== 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=1745951443; 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=Vtob700ykCrhTxgfj4xWJR4H30xstG7x7wOtHgCGXLE=; b=FRzc3DO739FvN4Gdnk43JvFyy8deHvvBOzAK3qaXgvrlYlFAkWyKNJeQgLDVeJpbfXHdrg 9KJz7n7yZ6wqb8I3ePB++cKq8LbOiA6NSwwdA93FzvCN3A+sUUxF+Ojq9aBth/ze/etiBF KhqNoCITYKaZ/pvvfF5QpFfxNF1T3JQwRLeujESEZlmkg1gj5zM7kxCEwMYWQMiWboSo2o BrI9LxU9KpQSAsZaudlO0fxVgyevrQV5sC6g++EGMjbRtottomnIjOrSkddDftefjuuhsv 9RfSGkYElqPOrEtUNQkbTdBuFSnfoF/VwyF9ZEtoNc1w4FKmxTgHtxE1EN+gXw== 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 4Zn85H1kNnzXRM; Tue, 29 Apr 2025 18:30:43 +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 53TIUh1h022732; Tue, 29 Apr 2025 18:30:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53TIUhD7022729; Tue, 29 Apr 2025 18:30:43 GMT (envelope-from git) Date: Tue, 29 Apr 2025 18:30:43 GMT Message-Id: <202504291830.53TIUhD7022729@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: 7a7a7cd85090 - stable/14 - mtx: Make idle thread assertions more robust List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 7a7a7cd85090784070de36771e0ceae9427cc092 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7a7a7cd85090784070de36771e0ceae9427cc092 commit 7a7a7cd85090784070de36771e0ceae9427cc092 Author: John Baldwin AuthorDate: 2025-03-12 14:25:13 +0000 Commit: John Baldwin CommitDate: 2025-04-29 14:43:42 +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 (cherry picked from commit 0ed104978ce55ecacf42bde4458acda0cc773940) --- 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 11ff7e1cacc4..9bb059f13d64 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -266,8 +266,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, @@ -428,8 +428,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,