git: 7d43e93a75e8 - main - sched_ule: Fix two typos in comments introduced in previous commit
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 16 Nov 2026 08:07:58 UTC
The branch main has been updated by olce:
URL: https://cgit.FreeBSD.org/src/commit/?id=7d43e93a75e8f9789521ff707a7533c0680503f0
commit 7d43e93a75e8f9789521ff707a7533c0680503f0
Author: Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2026-11-16 07:53:34 +0000
Commit: Olivier Certner <olce@FreeBSD.org>
CommitDate: 2026-11-16 08:07:16 +0000
sched_ule: Fix two typos in comments introduced in previous commit
Reported by: kib
Fixes: 538c48bf6247 ("sched_ule: Fix rare deadlock on stealing a migrated lock-blocked thread")
Sponsored by: The FreeBSD Foundation
---
sys/kern/sched_ule.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
index f9fd54285743..edd08f4ecb6f 100644
--- a/sys/kern/sched_ule.c
+++ b/sys/kern/sched_ule.c
@@ -1033,7 +1033,7 @@ tdq_lock_pair(struct tdq *one, bool one_locked, struct tdq *two)
return;
/*
* That did not work. Release 'one' to acquire both
- * locks in the proper order as we may need to sleep
+ * locks in the proper order as we may need to spin
* (most probably, as 'two' has just been seen locked).
*/
TDQ_UNLOCK(one);
@@ -2329,8 +2329,8 @@ sched_switch_migrate(struct tdq *tdq, struct thread *td, int flags)
* thread to be lock-unblocked (see there why). If we dropped the
* current runqueue lock, we would have to re-acquire it after putting
* the thread into our remote CPU's runqueue (i.e., the source CPU for
- * the steal) before finally reaching cpu_wait() which lock-unblocks the
- * thread. This would create a "hidden" and arbitrary additional
+ * the steal) before finally reaching cpu_switch() which lock-unblocks
+ * the thread. This would create a "hidden" and arbitrary additional
* lock-ordering dependency between the source and destination locks of
* tdq_move() on one hand, and our current runqueue's lock on the other
* hand, sometimes violating the lock ordering established by