git: 7882c2fa2527 - stable/15 - sched_ule: sched_rem(): Use THREAD_LOCKPTR_ASSERT() instead of MPASS()

From: Olivier Certner <olce_at_FreeBSD.org>
Date: Thu, 19 Nov 2026 15:32:20 UTC
The branch stable/15 has been updated by olce:

URL: https://cgit.FreeBSD.org/src/commit/?id=7882c2fa2527c399085c1af168bd56f753430548

commit 7882c2fa2527c399085c1af168bd56f753430548
Author:     Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2026-11-12 12:24:42 +0000
Commit:     Olivier Certner <olce@FreeBSD.org>
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);