From nobody Sat Nov 14 16:29:44 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 4jRfjN517yz71MJZ for ; Sat, 14 Nov 2026 16:29: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jRfjN42tZz4fhB for ; Sat, 14 Nov 2026 16:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794673784; 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=xzxui3gs7CC5XMpWd4TNw1r+sdJN4hCNO2g0Xb5Q9tQ=; b=DsP6+KVH43Yb0kYgHbxvnsO5/W8EzmCuJuDFqedrLTyKGyuUTX8UlYyZQxQX54agLaNWDO yvk1tRfhNAGEARMjtDtGXh7vMUP24jR3e8OtPUfXnL60xNpIdDp41RSJkUzdTRb8jAR27K ggcj+wL0TjnxKArcILDRrCJQC9Yqv5tbFCRosbpqeZn45UGwo4YOYYx5ghpaBMAslKldV8 P+E6qcc+SS+m+hYgNmxBD0KraBgKL2MxzNL/s3MSwx2qhIvlMWTuUO0kRI8mJ1yqVruEjJ hD0f2nHrfM3A/aV+E5k1Kiu4qpyHYLESWhoPtyn4ttANfhaB/6lTOshZG0MmCQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794673784; b=EQgyfv6rtL+j/YH8ySpRfvhSeqJTDlQ4Q7MiBvNGf2D7XLWVaPhCBM8w8qtbAD+z/Lh6TI Vy+/LOH8cEkPhIKiC2wynyypF88wdQujHUKDOkA6NH6t6NwtiiCYkYAUP0VFdWtDVqkz5U NBOpI7pOya9BaBME5bjt5TrPOohSmGzFZctpCa9wBv3UlexMqM92J5IX/cAQbK70tg8HMG 4dySSvfYX2oqfWST3QbbOG85SS6qO6Qbb4Jf5F9ZBJ/zrUxSU1d258+mUJX4zG+1Nf/cIL ki5AXKLJxN43SmgwK5srnN8VufZN2+YK8FnKiupccDZJTDogpeuobEFXvFK00A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794673784; 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=xzxui3gs7CC5XMpWd4TNw1r+sdJN4hCNO2g0Xb5Q9tQ=; b=jA6BB5LxnbIKFkhRx+0fWjfcz1QPj1RWMmwJn2uAILCUMKsleLc60GrLmniqLvf47ln+Er NMThxng53N4W+jRAmd9JcCvqH8XXgW+/qT/H5Myg/7ZVGMl4JzSkoDiLnvY/n5mvrdk/Tf fBDS0nQjj8eAW6GCIWhINzP59tz56OKd+4G78mv75SNpzWNaMl9Ugxk9uq/Li1LmqFlLiP uX902t32qOFdfPRfbW/gk7wKbXeNqqG/S2QE6hIPQTi3XEB4rsw9kJTw9ttuJHuef7eYfM KYlCQ4s7DmpXNDTrXiLpX6bDL7ezk1E1vsMVmdXvBRJfxJQ6GFNJbaWNB9vjtw== 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 4jRfjN374hzS9F for ; Sat, 14 Nov 2026 16:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 17824 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Nov 2026 16:29:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 00add43b882c - main - sched_ule: tdq_add(): INVARIANTS: Add check, fix name in assertion strings 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00add43b882c36ce657bc9d60d5644bf147f378b Auto-Submitted: auto-generated Date: Sat, 14 Nov 2026 16:29:44 +0000 Message-Id: <6af88c78.17824.52d27005@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=00add43b882c36ce657bc9d60d5644bf147f378b commit 00add43b882c36ce657bc9d60d5644bf147f378b Author: Olivier Certner AuthorDate: 2026-11-12 12:21:47 +0000 Commit: Olivier Certner CommitDate: 2026-11-14 16:29:31 +0000 sched_ule: tdq_add(): INVARIANTS: Add check, fix name in assertion strings Change the assertion on the to-add thread's lock so that it also fails if the thread's lock is not that of the 'tdq' (the checks that it is lock-unblocked and locked remain). It is tempting to add another check that the thread's 'ts_cpu' corresponds to the passed runqueue (in other words, that it has been set correctly), but that requires to add a call to thread_lock_block_wait() which should not be present in non-debug code, and that may prevent some races from happening on INVARIANTS, so I gave up on it. Fix the function name in assertion strings, as sched_add() is not the only (direct or indirect) caller of tdq_add(). MFC after: 3 days Sponsored by: The FreeBSD Foundation --- sys/kern/sched_ule.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index 76e8d922172f..1dad770fc305 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -2885,13 +2885,13 @@ tdq_add(struct tdq *tdq, struct thread *td, int flags) int lowpri; TDQ_LOCK_ASSERT(tdq, MA_OWNED); - THREAD_LOCK_BLOCKED_ASSERT(td, MA_OWNED); + THREAD_LOCKPTR_BLOCKED_ASSERT(td, TDQ_LOCKPTR(tdq)); KASSERT((td->td_inhibitors == 0), - ("sched_add: trying to run inhibited thread")); + ("%s: trying to run inhibited thread", __func__)); KASSERT((TD_CAN_RUN(td) || TD_IS_RUNNING(td)), - ("sched_add: bad thread state")); + ("%s: bad thread state", __func__)); KASSERT(td->td_flags & TDF_INMEM, - ("sched_add: thread swapped out")); + ("%s: thread swapped out", __func__)); lowpri = tdq->tdq_lowpri; if (td->td_priority < lowpri)