From nobody Thu Nov 19 15:32:20 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 4jVjBs0g4qz71FY2 for ; Thu, 19 Nov 2026 15:32:21 +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 4jVjBr3Yctz4rVM for ; Thu, 19 Nov 2026 15:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795102340; 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=5xaSJ5QgQW9/MSGk8d6A4mHfDGoyxpaQHuCWaW1UHB8=; b=mii6r7hKayUhpv0Xq2WBLjn9GJvbkg4kSsxlRYqx52Am6hWPqHi3s3GOWcFfpPDpMCGk+q u79I+gtIMaB7pNvCeHKQ6cvTUW5XRQzyzAo56gk+DsUrp4qDOqhSJJ/mhavTRB8fbjE7pX oU0SWjRaVe8VCh5pDHHHq+yCqFEhlJODheRXJRIslRDObhOq4WTzKJh9HZWldK2um3DDk3 c4nEJu8ob0ZHbQCJkDJGR0EXjbWXUAj9tlq57vtUA+Dyzt60k9p67MuHVGBcKNYSVqNXfb QbA8q/PiIc5Y7BQIQWjYioHBtHfU3tX/HvoU3T9K/NQl5Uj3mE7g/uSjf05QcA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795102340; b=KOsdgLst7LpJoYD1BN2yUPlsJorEOo7BMzRDJMWxxpKcN3j65EZvldT77cuXTm/fTMbS4G p+AQwL0Zv0CwWPbvPvuog7SFD/8GSWfIx1BltWWcerZfPNQUqkemCqf20NXhepAtg7SOEl bFfjWzQOcUOcZxYP3B19zBordFh+NOK2pHCupDfDsPnNDJQ8JDcsLJc13aY0urXjZiCs35 lAkNcXdqi8yQbLjzcDyizd25vOKGI4z35+EqMUTDWaQ/DH9Fn84RdfmSUHwyvOoZbQMAEg VO/nEJhuIy+dyJFFIS2D2dskR7A1Bxk6M8zSNskntlegFuATFYsEDNQj/3aGzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795102340; 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=5xaSJ5QgQW9/MSGk8d6A4mHfDGoyxpaQHuCWaW1UHB8=; b=uv36d/icOL+UfIh5eL8W4x6QsI/6x0Rpj0oZymOQtciSFSaapoUc8dPRd5Sq197v/Hshfj GPuxeeep7b/5RL0IciTkwKgXqVsxe39VnLPQ4XWC4HPyKIu+YJ5vGICyGWRMXEh0Qcr635 2d56rIkNSDx7ZTt3SF4b0huH9w995+ptu0cHwhu+sUXv5AZCFE0TJmyirq+eL9e0TK8dvn 0Oq8QVdOY52Pkj4g9279IFNjrvTv8DKbV3lrHOqCe0+ghx4nYtxEqZOxTUt8YmTzJynTOC JkNkZW1jnPhSKgGMQiVZsWpUEQfErroYXWw/MisASY8TvankwvQBo0RBNMgE5Q== 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 4jVjBr35D8z15vm for ; Thu, 19 Nov 2026 15:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d457 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Nov 2026 15:32:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 7882c2fa2527 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 7882c2fa2527c399085c1af168bd56f753430548 Auto-Submitted: auto-generated Date: Thu, 19 Nov 2026 15:32:20 +0000 Message-Id: <6aff1684.d457.57b5106@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7882c2fa2527c399085c1af168bd56f753430548 commit 7882c2fa2527c399085c1af168bd56f753430548 Author: Olivier Certner AuthorDate: 2026-11-12 12:24:42 +0000 Commit: Olivier Certner CommitDate: 2026-11-19 15:31:55 +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 (cherry picked from commit 136e3a3eba5b59abfae066d4caaeccd4546d8973) --- 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 96d694f723ad..714d4c4a96fd 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);