summaryrefslogtreecommitdiffstats
path: root/sys/kern/subr_sleepqueue.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern/subr_sleepqueue.c')
-rw-r--r--sys/kern/subr_sleepqueue.c74
1 files changed, 48 insertions, 26 deletions
diff --git a/sys/kern/subr_sleepqueue.c b/sys/kern/subr_sleepqueue.c
index 2d79c99..0333665 100644
--- a/sys/kern/subr_sleepqueue.c
+++ b/sys/kern/subr_sleepqueue.c
@@ -94,7 +94,7 @@ __FBSDID("$FreeBSD$");
#define SC_SHIFT 8
#define SC_HASH(wc) (((uintptr_t)(wc) >> SC_SHIFT) & SC_MASK)
#define SC_LOOKUP(wc) &sleepq_chains[SC_HASH(wc)]
-
+#define NR_SLEEPQS 2
/*
* There two different lists of sleep queues. Both lists are connected
* via the sq_hash entries. The first list is the sleep queue chain list
@@ -114,7 +114,7 @@ __FBSDID("$FreeBSD$");
* c - sleep queue chain lock
*/
struct sleepqueue {
- TAILQ_HEAD(, thread) sq_blocked; /* (c) Blocked threads. */
+ TAILQ_HEAD(, thread) sq_blocked[NR_SLEEPQS]; /* (c) Blocked threads. */
LIST_ENTRY(sleepqueue) sq_hash; /* (c) Chain and free list. */
LIST_HEAD(, sleepqueue) sq_free; /* (c) Free queues. */
void *sq_wchan; /* (c) Wait channel. */
@@ -148,6 +148,8 @@ static MALLOC_DEFINE(M_SLEEPQUEUE, "sleepqueue", "sleep queues");
/*
* Prototypes for non-exported routines.
*/
+static int sleepq_catch_signals(void *wchan);
+static int sleepq_check_signals(void);
static int sleepq_check_timeout(void);
static void sleepq_switch(void *wchan);
static void sleepq_timeout(void *arg);
@@ -192,9 +194,11 @@ struct sleepqueue *
sleepq_alloc(void)
{
struct sleepqueue *sq;
+ int i;
sq = malloc(sizeof(struct sleepqueue), M_SLEEPQUEUE, M_WAITOK | M_ZERO);
- TAILQ_INIT(&sq->sq_blocked);
+ for (i = 0; i < NR_SLEEPQS; i++)
+ TAILQ_INIT(&sq->sq_blocked[i]);
LIST_INIT(&sq->sq_free);
return (sq);
}
@@ -205,9 +209,11 @@ sleepq_alloc(void)
void
sleepq_free(struct sleepqueue *sq)
{
+ int i;
MPASS(sq != NULL);
- MPASS(TAILQ_EMPTY(&sq->sq_blocked));
+ for (i = 0; i < NR_SLEEPQS; i++)
+ MPASS(TAILQ_EMPTY(&sq->sq_blocked[i]));
free(sq, M_SLEEPQUEUE);
}
@@ -262,7 +268,8 @@ sleepq_release(void *wchan)
* woken up.
*/
void
-sleepq_add(void *wchan, struct lock_object *lock, const char *wmesg, int flags)
+sleepq_add(void *wchan, struct lock_object *lock, const char *wmesg, int flags,
+ int queue)
{
struct sleepqueue_chain *sc;
struct sleepqueue *sq;
@@ -273,6 +280,7 @@ sleepq_add(void *wchan, struct lock_object *lock, const char *wmesg, int flags)
mtx_assert(&sc->sc_lock, MA_OWNED);
MPASS(td->td_sleepqueue != NULL);
MPASS(wchan != NULL);
+ MPASS((queue >= 0) && (queue < NR_SLEEPQS));
/* If this thread is not allowed to sleep, die a horrible death. */
KASSERT(!(td->td_pflags & TDP_NOSLEEPING),
@@ -287,6 +295,16 @@ sleepq_add(void *wchan, struct lock_object *lock, const char *wmesg, int flags)
* into the sleep queue already in use by this wait channel.
*/
if (sq == NULL) {
+#ifdef INVARIANTS
+ int i;
+ for (i = 0; i < NR_SLEEP_QUEUEUS; i++)
+ KASSERT(TAILQ_EMPTY(&sq->sq_blocked[i]),
+ ("thread's sleep queue %d is not empty", i));
+
+ KASSERT(LIST_EMPTY(&sq->sq_free),
+ ("thread's sleep queue has a non-empty free list"));
+ KASSERT(sq->sq_wchan == NULL, ("stale sq_wchan pointer"));
+#endif
#ifdef SLEEPQUEUE_PROFILING
sc->sc_depth++;
if (sc->sc_depth > sc->sc_max_depth) {
@@ -297,11 +315,6 @@ sleepq_add(void *wchan, struct lock_object *lock, const char *wmesg, int flags)
#endif
sq = td->td_sleepqueue;
LIST_INSERT_HEAD(&sc->sc_queues, sq, sq_hash);
- KASSERT(TAILQ_EMPTY(&sq->sq_blocked),
- ("thread's sleep queue has a non-empty queue"));
- KASSERT(LIST_EMPTY(&sq->sq_free),
- ("thread's sleep queue has a non-empty free list"));
- KASSERT(sq->sq_wchan == NULL, ("stale sq_wchan pointer"));
sq->sq_wchan = wchan;
#ifdef INVARIANTS
sq->sq_lock = lock;
@@ -313,9 +326,10 @@ sleepq_add(void *wchan, struct lock_object *lock, const char *wmesg, int flags)
MPASS((flags & SLEEPQ_TYPE) == sq->sq_type);
LIST_INSERT_HEAD(&sq->sq_free, td->td_sleepqueue, sq_hash);
}
- TAILQ_INSERT_TAIL(&sq->sq_blocked, td, td_slpq);
+ TAILQ_INSERT_TAIL(&sq->sq_blocked[queue], td, td_slpq);
td->td_sleepqueue = NULL;
mtx_lock_spin(&sched_lock);
+ td->td_sqqueue = queue;
td->td_wchan = wchan;
td->td_wmesg = wmesg;
if (flags & SLEEPQ_INTERRUPTIBLE) {
@@ -606,12 +620,13 @@ sleepq_resume_thread(struct sleepqueue *sq, struct thread *td, int pri)
MPASS(td != NULL);
MPASS(sq->sq_wchan != NULL);
MPASS(td->td_wchan == sq->sq_wchan);
+ MPASS(td->td_sqqueue < NR_SLEEPQS && td->td_sqqueue >= 0);
sc = SC_LOOKUP(sq->sq_wchan);
mtx_assert(&sc->sc_lock, MA_OWNED);
mtx_assert(&sched_lock, MA_OWNED);
/* Remove the thread from the queue. */
- TAILQ_REMOVE(&sq->sq_blocked, td, td_slpq);
+ TAILQ_REMOVE(&sq->sq_blocked[td->td_sqqueue], td, td_slpq);
/*
* Get a sleep queue for this thread. If this is the last waiter,
@@ -656,13 +671,14 @@ sleepq_resume_thread(struct sleepqueue *sq, struct thread *td, int pri)
* Find the highest priority thread sleeping on a wait channel and resume it.
*/
void
-sleepq_signal(void *wchan, int flags, int pri)
+sleepq_signal(void *wchan, int flags, int pri, int queue)
{
struct sleepqueue *sq;
struct thread *td, *besttd;
CTR2(KTR_PROC, "sleepq_signal(%p, %d)", wchan, flags);
KASSERT(wchan != NULL, ("%s: invalid NULL wait channel", __func__));
+ MPASS((queue >= 0) && (queue < NR_SLEEPQS));
sq = sleepq_lookup(wchan);
if (sq == NULL) {
sleepq_release(wchan);
@@ -678,7 +694,7 @@ sleepq_signal(void *wchan, int flags, int pri)
* the tail of sleep queues.
*/
besttd = NULL;
- TAILQ_FOREACH(td, &sq->sq_blocked, td_slpq) {
+ TAILQ_FOREACH(td, &sq->sq_blocked[queue], td_slpq) {
if (besttd == NULL || td->td_priority < besttd->td_priority)
besttd = td;
}
@@ -693,12 +709,13 @@ sleepq_signal(void *wchan, int flags, int pri)
* Resume all threads sleeping on a specified wait channel.
*/
void
-sleepq_broadcast(void *wchan, int flags, int pri)
+sleepq_broadcast(void *wchan, int flags, int pri, int queue)
{
struct sleepqueue *sq;
CTR2(KTR_PROC, "sleepq_broadcast(%p, %d)", wchan, flags);
KASSERT(wchan != NULL, ("%s: invalid NULL wait channel", __func__));
+ MPASS((queue >= 0) && (queue < NR_SLEEPQS));
sq = sleepq_lookup(wchan);
if (sq == NULL) {
sleepq_release(wchan);
@@ -709,8 +726,9 @@ sleepq_broadcast(void *wchan, int flags, int pri)
/* Resume all blocked threads on the sleep queue. */
mtx_lock_spin(&sched_lock);
- while (!TAILQ_EMPTY(&sq->sq_blocked))
- sleepq_resume_thread(sq, TAILQ_FIRST(&sq->sq_blocked), pri);
+ while (!TAILQ_EMPTY(&sq->sq_blocked[queue]))
+ sleepq_resume_thread(sq, TAILQ_FIRST(&sq->sq_blocked[queue]),
+ pri);
mtx_unlock_spin(&sched_lock);
sleepq_release(wchan);
}
@@ -901,15 +919,19 @@ found:
}
#endif
db_printf("Blocked threads:\n");
- if (TAILQ_EMPTY(&sq->sq_blocked))
- db_printf("\tempty\n");
- else
- TAILQ_FOREACH(td, &sq->sq_blocked, td_slpq) {
- db_printf("\t%p (tid %d, pid %d, \"%s\")\n", td,
- td->td_tid, td->td_proc->p_pid,
- td->td_name[0] != '\0' ? td->td_name :
- td->td_proc->p_comm);
- }
+ for (i = 0; i < NR_SLEEPQS; i++) {
+ db_printf("\nQueue[%d]:\n", i);
+ if (TAILQ_EMPTY(&sq->sq_blocked[i]))
+ db_printf("\tempty\n");
+ else
+ TAILQ_FOREACH(td, &sq->sq_blocked[0],
+ td_slpq) {
+ db_printf("\t%p (tid %d, pid %d, \"%s\")\n", td,
+ td->td_tid, td->td_proc->p_pid,
+ td->td_name[i] != '\0' ? td->td_name :
+ td->td_proc->p_comm);
+ }
+ }
}
/* Alias 'show sleepqueue' to 'show sleepq'. */
OpenPOWER on IntegriCloud