diff options
| author | jhb <jhb@FreeBSD.org> | 2012-08-22 20:01:38 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2012-08-22 20:01:38 +0000 |
| commit | ca55558465e9647d883f38cb1f9639bb60c3a161 (patch) | |
| tree | 7151d359ad426acc299ded840b3ca451ffe110b7 /sys | |
| parent | 9559a94c6bd31513aa1c178aed9fd5ee20d0186f (diff) | |
| download | FreeBSD-src-ca55558465e9647d883f38cb1f9639bb60c3a161.zip FreeBSD-src-ca55558465e9647d883f38cb1f9639bb60c3a161.tar.gz | |
Mark the idle threads as non-sleepable and also assert that an idle
thread never blocks on a turnstile.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/sched_4bsd.c | 1 | ||||
| -rw-r--r-- | sys/kern/sched_ule.c | 1 | ||||
| -rw-r--r-- | sys/kern/subr_turnstile.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index f7fd347..7aaf37c 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -1598,6 +1598,7 @@ sched_idletd(void *dummy) { struct pcpuidlestat *stat; + THREAD_NO_SLEEPING(); stat = DPCPU_PTR(idlestat); for (;;) { mtx_assert(&Giant, MA_NOTOWNED); diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index 8ceda76..3374778 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -2581,6 +2581,7 @@ sched_idletd(void *dummy) mtx_assert(&Giant, MA_NOTOWNED); td = curthread; tdq = TDQ_SELF(); + THREAD_NO_SLEEPING(); for (;;) { #ifdef SMP if (tdq_idled(tdq) == 0) diff --git a/sys/kern/subr_turnstile.c b/sys/kern/subr_turnstile.c index 76fb964..31d16fe 100644 --- a/sys/kern/subr_turnstile.c +++ b/sys/kern/subr_turnstile.c @@ -684,6 +684,7 @@ turnstile_wait(struct turnstile *ts, struct thread *owner, int queue) if (owner) MPASS(owner->td_proc->p_magic == P_MAGIC); MPASS(queue == TS_SHARED_QUEUE || queue == TS_EXCLUSIVE_QUEUE); + KASSERT(!TD_IS_IDLETHREAD(td), ("idle threads cannot block on locks")); /* * If the lock does not already have a turnstile, use this thread's |
