From nobody Sat Nov 14 16:29:45 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 4jRfjQ3HGFz71M3w for ; Sat, 14 Nov 2026 16:29:46 +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 4jRfjP3tBNz4fmy for ; Sat, 14 Nov 2026 16:29:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794673785; 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=vHRgcz9MILihPkMMPTRsj9eqEGZXEOvaYFvYghzznW4=; b=DuYa7ngmFN3L8OIDk7/yugGFgf3DZXLkPUt+blobziTfxNT/HTRPV1cUwiTXP1GreQKO27 pr8exwMapmkh8PhdXQu/trl8F+D/b03Eq5XB1prSPUNHvSR2w5o37f94fNw8o7vZIxCbD8 3xeWecTPXcMdPWSBMVhpBWiC/832uFRrP7opvxhVLtQkoTQ1/ldLL71DZgxjHptCx3X7pk jRgS0TWXMexf41YFHqlG3IpflMf9r9I7a78nOOzxPFF4gBujLK4W1ka74g27P2s22wpnJ5 1NmzkUEGOBbSvgI6b1ITvgIByJOXeHYXo+8JG9XITD8n0Tpu0bnTWTUIus1MRA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794673785; b=KW7L5ZJIBtVGPRVn8YBweXUe5MuzzPo04szTtoH6pmdHRzWCL/VbMRjYFRpiPSRJQtxNab pykUVDbtLDrAabzsDhS/Kv2zDfxBrdyj8PVziDL4Sw/QzNlNNKuwCOXHZ6uBZtpoTSCGTK oyUimIPZ/rtBqqeqWk7NYBETSjhDL+Wdm96De5JeNc2a4h9k08U4SWFlyv++K0OAMfIPfR J8igkKggjAVAePISt4Hm5ze69vifdBKY2Z3vaqYKh07ZHHNIeqjJ54C9STvbg6TBnlC0+d MjNCgL+REZVV0ug+ES10Dc1MzHnFCsGccmo827oUHDYuVo46/MPjd5+fbgjbeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794673785; 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=vHRgcz9MILihPkMMPTRsj9eqEGZXEOvaYFvYghzznW4=; b=W5o2w4tprwVbaEx4VOSaxr/JXR3UhG4kSrgLPjE4zMK/25fCzpK6mH3vyOUDTzyBfPWGj6 F7Hwa86TOKdKrlwgVgYpRO7mQT5nioToWsSZu2mTHYSNlwnGHzI4oS/YZ3IDKV7N/Y//Zr S33EkFVO3NpyW0ANBmMkJu1yk8pAmjlZ2DFWK/51B/NGdullTgJDdbtcudgYL9hZ4XvYRD JL66RwOggEdSMiMbEMf05fa2veKOWoLA7x/sUYVoD/FoaYjrtaOxupKdLMuFne1wEkHp/d B9CxxI/h/UarMz6lV0bw7vvj/vucNwzh8O/m4tEgTL+FVIxng/KbYxOYGAnsqw== 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 4jRfjP3W40zRS0 for ; Sat, 14 Nov 2026 16:29:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 17ed6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Nov 2026 16:29:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 136e3a3eba5b - main - sched_ule: sched_rem(): Use THREAD_LOCKPTR_ASSERT() instead of MPASS() 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: 136e3a3eba5b59abfae066d4caaeccd4546d8973 Auto-Submitted: auto-generated Date: Sat, 14 Nov 2026 16:29:45 +0000 Message-Id: <6af88c79.17ed6.1b6aca78@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=136e3a3eba5b59abfae066d4caaeccd4546d8973 commit 136e3a3eba5b59abfae066d4caaeccd4546d8973 Author: Olivier Certner AuthorDate: 2026-11-12 12:24:42 +0000 Commit: Olivier Certner CommitDate: 2026-11-14 16:29:32 +0000 sched_ule: sched_rem(): Use THREAD_LOCKPTR_ASSERT() instead of MPASS() This gives a better message. While here, add some empty lines to make INVARIANTS-only statements stand out for better readability. No functional change. MFC after: 3 days Sponsored by: The FreeBSD Foundation --- sys/kern/sched_ule.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index 1dad770fc305..7354fe1926be 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -2975,11 +2975,14 @@ sched_rem(struct thread *td) KTR_STATE1(KTR_SCHED, "thread", sched_tdname(td), "runq rem", "prio:%d", td->td_priority); SDT_PROBE3(sched, , , dequeue, td, td->td_proc, NULL); + tdq = TDQ_CPU(td_get_sched(td)->ts_cpu); + TDQ_LOCK_ASSERT(tdq, MA_OWNED); - MPASS(td->td_lock == TDQ_LOCKPTR(tdq)); + THREAD_LOCKPTR_ASSERT(td, TDQ_LOCKPTR(tdq)); KASSERT(TD_ON_RUNQ(td), ("sched_rem: thread not on run queue")); + tdq_runq_rem(tdq, td); tdq_load_rem(tdq, td); TD_SET_CAN_RUN(td);