2000-05-28 15:45:30 +00:00
|
|
|
/*-
|
|
|
|
* Copyright (c) 2000 Doug Rabson
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
2003-06-11 00:56:59 +00:00
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
|
2000-05-28 15:45:30 +00:00
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/systm.h>
|
2001-10-26 06:32:21 +00:00
|
|
|
#include <sys/bus.h>
|
2001-10-26 18:46:48 +00:00
|
|
|
#include <sys/interrupt.h>
|
2000-05-28 15:45:30 +00:00
|
|
|
#include <sys/kernel.h>
|
2003-12-17 21:13:04 +00:00
|
|
|
#include <sys/kthread.h>
|
2001-10-26 06:32:21 +00:00
|
|
|
#include <sys/lock.h>
|
2000-05-28 15:45:30 +00:00
|
|
|
#include <sys/malloc.h>
|
2001-10-26 06:32:21 +00:00
|
|
|
#include <sys/mutex.h>
|
|
|
|
#include <sys/taskqueue.h>
|
Move dynamic sysctl(8) variable creation for the cd(4) and da(4) drivers
out of cdregister() and daregister(), which are run from interrupt context.
The sysctl code does blocking mallocs (M_WAITOK), which causes problems
if malloc(9) actually needs to sleep.
The eventual fix for this issue will involve moving the CAM probe process
inside a kernel thread. For now, though, I have fixed the issue by moving
dynamic sysctl variable creation for these two drivers to a task queue
running in a kernel thread.
The existing task queues (taskqueue_swi and taskqueue_swi_giant) run in
software interrupt handlers, which wouldn't fix the problem at hand. So I
have created a new task queue, taskqueue_thread, that runs inside a kernel
thread. (It also runs outside of Giant -- clients must explicitly acquire
and release Giant in their taskqueue functions.)
scsi_cd.c: Remove sysctl variable creation code from cdregister(), and
move it to a new function, cdsysctlinit(). Queue
cdsysctlinit() to the taskqueue_thread taskqueue once we
have fully registered the cd(4) driver instance.
scsi_da.c: Remove sysctl variable creation code from daregister(), and
move it to move it to a new function, dasysctlinit().
Queue dasysctlinit() to the taskqueue_thread taskqueue once
we have fully registered the da(4) instance.
taskqueue.h: Declare the new taskqueue_thread taskqueue, update some
comments.
subr_taskqueue.c:
Create the new kernel thread taskqueue. This taskqueue
runs outside of Giant, so any functions queued to it would
need to explicitly acquire/release Giant if they need it.
cd.4: Update the cd(4) man page to talk about the minimum command
size sysctl/loader tunable. Also note that the changer
variables are available as loader tunables as well.
da.4: Update the da(4) man page to cover the retry_count,
default_timeout and minimum_cmd_size sysctl variables/loader
tunables. Remove references to /dev/r???, they aren't used
any longer.
cd.9: Update the cd(9) man page to describe the CD_Q_10_BYTE_ONLY
quirk.
taskqueue.9: Update the taskqueue(9) man page to describe the new thread
task queue, and the taskqueue_swi_giant queue.
MFC after: 3 days
2003-09-03 04:46:28 +00:00
|
|
|
#include <sys/unistd.h>
|
2000-05-28 15:45:30 +00:00
|
|
|
|
2000-12-08 20:09:00 +00:00
|
|
|
static MALLOC_DEFINE(M_TASKQUEUE, "taskqueue", "Task Queues");
|
2003-02-26 03:15:42 +00:00
|
|
|
static void *taskqueue_giant_ih;
|
2003-12-17 21:13:04 +00:00
|
|
|
static void *taskqueue_ih;
|
|
|
|
static STAILQ_HEAD(taskqueue_list, taskqueue) taskqueue_queues;
|
2001-10-26 06:32:21 +00:00
|
|
|
static struct mtx taskqueue_queues_mutex;
|
2000-10-25 05:19:40 +00:00
|
|
|
|
2000-05-28 15:45:30 +00:00
|
|
|
struct taskqueue {
|
|
|
|
STAILQ_ENTRY(taskqueue) tq_link;
|
|
|
|
STAILQ_HEAD(, task) tq_queue;
|
|
|
|
const char *tq_name;
|
|
|
|
taskqueue_enqueue_fn tq_enqueue;
|
|
|
|
void *tq_context;
|
2001-10-26 06:32:21 +00:00
|
|
|
struct mtx tq_mutex;
|
2000-05-28 15:45:30 +00:00
|
|
|
};
|
|
|
|
|
2001-10-26 06:32:21 +00:00
|
|
|
static void init_taskqueue_list(void *data);
|
|
|
|
|
|
|
|
static void
|
|
|
|
init_taskqueue_list(void *data __unused)
|
|
|
|
{
|
|
|
|
|
2002-04-04 21:03:38 +00:00
|
|
|
mtx_init(&taskqueue_queues_mutex, "taskqueue list", NULL, MTX_DEF);
|
2001-10-26 06:32:21 +00:00
|
|
|
STAILQ_INIT(&taskqueue_queues);
|
|
|
|
}
|
|
|
|
SYSINIT(taskqueue_list, SI_SUB_INTRINSIC, SI_ORDER_ANY, init_taskqueue_list,
|
|
|
|
NULL);
|
|
|
|
|
2000-05-28 15:45:30 +00:00
|
|
|
struct taskqueue *
|
|
|
|
taskqueue_create(const char *name, int mflags,
|
|
|
|
taskqueue_enqueue_fn enqueue, void *context)
|
|
|
|
{
|
|
|
|
struct taskqueue *queue;
|
|
|
|
|
2001-10-26 06:32:21 +00:00
|
|
|
queue = malloc(sizeof(struct taskqueue), M_TASKQUEUE, mflags | M_ZERO);
|
2000-05-28 15:45:30 +00:00
|
|
|
if (!queue)
|
|
|
|
return 0;
|
2001-10-26 06:32:21 +00:00
|
|
|
|
2000-05-28 15:45:30 +00:00
|
|
|
STAILQ_INIT(&queue->tq_queue);
|
|
|
|
queue->tq_name = name;
|
|
|
|
queue->tq_enqueue = enqueue;
|
|
|
|
queue->tq_context = context;
|
2002-04-04 21:03:38 +00:00
|
|
|
mtx_init(&queue->tq_mutex, "taskqueue", NULL, MTX_DEF);
|
2000-05-28 15:45:30 +00:00
|
|
|
|
2001-10-26 06:32:21 +00:00
|
|
|
mtx_lock(&taskqueue_queues_mutex);
|
2000-05-28 15:45:30 +00:00
|
|
|
STAILQ_INSERT_TAIL(&taskqueue_queues, queue, tq_link);
|
2001-10-26 06:32:21 +00:00
|
|
|
mtx_unlock(&taskqueue_queues_mutex);
|
2000-05-28 15:45:30 +00:00
|
|
|
|
|
|
|
return queue;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
taskqueue_free(struct taskqueue *queue)
|
|
|
|
{
|
2001-10-26 06:32:21 +00:00
|
|
|
|
|
|
|
mtx_lock(&taskqueue_queues_mutex);
|
2000-05-28 15:45:30 +00:00
|
|
|
STAILQ_REMOVE(&taskqueue_queues, queue, taskqueue, tq_link);
|
2001-10-26 06:32:21 +00:00
|
|
|
mtx_unlock(&taskqueue_queues_mutex);
|
2000-05-28 15:45:30 +00:00
|
|
|
|
2004-06-28 16:28:23 +00:00
|
|
|
mtx_lock(&queue->tq_mutex);
|
|
|
|
taskqueue_run(queue);
|
2001-10-26 06:32:21 +00:00
|
|
|
mtx_destroy(&queue->tq_mutex);
|
2000-05-28 15:45:30 +00:00
|
|
|
free(queue, M_TASKQUEUE);
|
|
|
|
}
|
|
|
|
|
2001-10-26 06:32:21 +00:00
|
|
|
/*
|
|
|
|
* Returns with the taskqueue locked.
|
|
|
|
*/
|
2000-05-28 15:45:30 +00:00
|
|
|
struct taskqueue *
|
|
|
|
taskqueue_find(const char *name)
|
|
|
|
{
|
|
|
|
struct taskqueue *queue;
|
|
|
|
|
2001-10-26 06:32:21 +00:00
|
|
|
mtx_lock(&taskqueue_queues_mutex);
|
|
|
|
STAILQ_FOREACH(queue, &taskqueue_queues, tq_link) {
|
2003-12-17 21:13:04 +00:00
|
|
|
if (strcmp(queue->tq_name, name) == 0) {
|
2004-06-28 16:28:23 +00:00
|
|
|
mtx_lock(&queue->tq_mutex);
|
2001-10-26 06:32:21 +00:00
|
|
|
mtx_unlock(&taskqueue_queues_mutex);
|
2000-05-28 15:45:30 +00:00
|
|
|
return queue;
|
|
|
|
}
|
2001-10-26 06:32:21 +00:00
|
|
|
}
|
|
|
|
mtx_unlock(&taskqueue_queues_mutex);
|
2003-12-17 21:13:04 +00:00
|
|
|
return NULL;
|
2000-05-28 15:45:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
taskqueue_enqueue(struct taskqueue *queue, struct task *task)
|
|
|
|
{
|
|
|
|
struct task *ins;
|
|
|
|
struct task *prev;
|
|
|
|
|
2001-10-26 18:46:48 +00:00
|
|
|
mtx_lock(&queue->tq_mutex);
|
|
|
|
|
2000-05-28 15:45:30 +00:00
|
|
|
/*
|
|
|
|
* Count multiple enqueues.
|
|
|
|
*/
|
|
|
|
if (task->ta_pending) {
|
|
|
|
task->ta_pending++;
|
2001-10-26 06:32:21 +00:00
|
|
|
mtx_unlock(&queue->tq_mutex);
|
2000-05-28 15:45:30 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Optimise the case when all tasks have the same priority.
|
|
|
|
*/
|
2000-08-03 16:37:46 +00:00
|
|
|
prev = STAILQ_LAST(&queue->tq_queue, task, ta_link);
|
2000-05-28 15:45:30 +00:00
|
|
|
if (!prev || prev->ta_priority >= task->ta_priority) {
|
|
|
|
STAILQ_INSERT_TAIL(&queue->tq_queue, task, ta_link);
|
|
|
|
} else {
|
|
|
|
prev = 0;
|
|
|
|
for (ins = STAILQ_FIRST(&queue->tq_queue); ins;
|
|
|
|
prev = ins, ins = STAILQ_NEXT(ins, ta_link))
|
|
|
|
if (ins->ta_priority < task->ta_priority)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (prev)
|
|
|
|
STAILQ_INSERT_AFTER(&queue->tq_queue, prev, task, ta_link);
|
|
|
|
else
|
|
|
|
STAILQ_INSERT_HEAD(&queue->tq_queue, task, ta_link);
|
|
|
|
}
|
|
|
|
|
|
|
|
task->ta_pending = 1;
|
|
|
|
if (queue->tq_enqueue)
|
|
|
|
queue->tq_enqueue(queue->tq_context);
|
2001-10-26 18:46:48 +00:00
|
|
|
|
2001-10-26 06:32:21 +00:00
|
|
|
mtx_unlock(&queue->tq_mutex);
|
2001-10-26 18:46:48 +00:00
|
|
|
|
2000-05-28 15:45:30 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
taskqueue_run(struct taskqueue *queue)
|
|
|
|
{
|
|
|
|
struct task *task;
|
2004-06-28 16:28:23 +00:00
|
|
|
int owned, pending;
|
2000-05-28 15:45:30 +00:00
|
|
|
|
2004-06-28 16:28:23 +00:00
|
|
|
owned = mtx_owned(&queue->tq_mutex);
|
|
|
|
if (!owned)
|
|
|
|
mtx_lock(&queue->tq_mutex);
|
2000-05-28 15:45:30 +00:00
|
|
|
while (STAILQ_FIRST(&queue->tq_queue)) {
|
|
|
|
/*
|
|
|
|
* Carefully remove the first task from the queue and
|
|
|
|
* zero its pending count.
|
|
|
|
*/
|
|
|
|
task = STAILQ_FIRST(&queue->tq_queue);
|
|
|
|
STAILQ_REMOVE_HEAD(&queue->tq_queue, ta_link);
|
|
|
|
pending = task->ta_pending;
|
|
|
|
task->ta_pending = 0;
|
2004-10-05 04:16:01 +00:00
|
|
|
task->ta_flags |= TAF_PENDING;
|
2001-10-26 18:46:48 +00:00
|
|
|
mtx_unlock(&queue->tq_mutex);
|
2000-05-28 15:45:30 +00:00
|
|
|
|
2001-10-26 18:46:48 +00:00
|
|
|
task->ta_func(task->ta_context, pending);
|
2000-05-28 15:45:30 +00:00
|
|
|
|
2001-10-26 06:32:21 +00:00
|
|
|
mtx_lock(&queue->tq_mutex);
|
2004-10-05 04:16:01 +00:00
|
|
|
task->ta_flags &= ~TAF_PENDING;
|
|
|
|
wakeup(task);
|
2000-05-28 15:45:30 +00:00
|
|
|
}
|
2004-06-28 16:28:23 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* For compatibility, unlock on return if the queue was not locked
|
|
|
|
* on entry, although this opens a race window.
|
|
|
|
*/
|
|
|
|
if (!owned)
|
|
|
|
mtx_unlock(&queue->tq_mutex);
|
2000-05-28 15:45:30 +00:00
|
|
|
}
|
|
|
|
|
2004-10-05 04:16:01 +00:00
|
|
|
void
|
|
|
|
taskqueue_drain(struct taskqueue *queue, struct task *task)
|
|
|
|
{
|
|
|
|
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "taskqueue_drain");
|
|
|
|
mtx_lock(&queue->tq_mutex);
|
|
|
|
while (task->ta_pending != 0 || (task->ta_flags & TAF_PENDING)) {
|
|
|
|
msleep(task, &queue->tq_mutex, PWAIT, "-", 0);
|
|
|
|
}
|
|
|
|
mtx_unlock(&queue->tq_mutex);
|
|
|
|
}
|
|
|
|
|
2000-05-28 15:45:30 +00:00
|
|
|
static void
|
|
|
|
taskqueue_swi_enqueue(void *context)
|
|
|
|
{
|
Change the preemption code for software interrupt thread schedules and
mutex releases to not require flags for the cases when preemption is
not allowed:
The purpose of the MTX_NOSWITCH and SWI_NOSWITCH flags is to prevent
switching to a higher priority thread on mutex releease and swi schedule,
respectively when that switch is not safe. Now that the critical section
API maintains a per-thread nesting count, the kernel can easily check
whether or not it should switch without relying on flags from the
programmer. This fixes a few bugs in that all current callers of
swi_sched() used SWI_NOSWITCH, when in fact, only the ones called from
fast interrupt handlers and the swi_sched of softclock needed this flag.
Note that to ensure that swi_sched()'s in clock and fast interrupt
handlers do not switch, these handlers have to be explicitly wrapped
in critical_enter/exit pairs. Presently, just wrapping the handlers is
sufficient, but in the future with the fully preemptive kernel, the
interrupt must be EOI'd before critical_exit() is called. (critical_exit()
can switch due to a deferred preemption in a fully preemptive kernel.)
I've tested the changes to the interrupt code on i386 and alpha. I have
not tested ia64, but the interrupt code is almost identical to the alpha
code, so I expect it will work fine. PowerPC and ARM do not yet have
interrupt code in the tree so they shouldn't be broken. Sparc64 is
broken, but that's been ok'd by jake and tmm who will be fixing the
interrupt code for sparc64 shortly.
Reviewed by: peter
Tested on: i386, alpha
2002-01-05 08:47:13 +00:00
|
|
|
swi_sched(taskqueue_ih, 0);
|
2000-05-28 15:45:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-10-25 05:19:40 +00:00
|
|
|
taskqueue_swi_run(void *dummy)
|
2000-05-28 15:45:30 +00:00
|
|
|
{
|
|
|
|
taskqueue_run(taskqueue_swi);
|
|
|
|
}
|
|
|
|
|
2003-02-26 03:15:42 +00:00
|
|
|
static void
|
|
|
|
taskqueue_swi_giant_enqueue(void *context)
|
|
|
|
{
|
|
|
|
swi_sched(taskqueue_giant_ih, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
taskqueue_swi_giant_run(void *dummy)
|
|
|
|
{
|
|
|
|
taskqueue_run(taskqueue_swi_giant);
|
|
|
|
}
|
|
|
|
|
2004-08-08 02:37:22 +00:00
|
|
|
void
|
|
|
|
taskqueue_thread_loop(void *arg)
|
Move dynamic sysctl(8) variable creation for the cd(4) and da(4) drivers
out of cdregister() and daregister(), which are run from interrupt context.
The sysctl code does blocking mallocs (M_WAITOK), which causes problems
if malloc(9) actually needs to sleep.
The eventual fix for this issue will involve moving the CAM probe process
inside a kernel thread. For now, though, I have fixed the issue by moving
dynamic sysctl variable creation for these two drivers to a task queue
running in a kernel thread.
The existing task queues (taskqueue_swi and taskqueue_swi_giant) run in
software interrupt handlers, which wouldn't fix the problem at hand. So I
have created a new task queue, taskqueue_thread, that runs inside a kernel
thread. (It also runs outside of Giant -- clients must explicitly acquire
and release Giant in their taskqueue functions.)
scsi_cd.c: Remove sysctl variable creation code from cdregister(), and
move it to a new function, cdsysctlinit(). Queue
cdsysctlinit() to the taskqueue_thread taskqueue once we
have fully registered the cd(4) driver instance.
scsi_da.c: Remove sysctl variable creation code from daregister(), and
move it to move it to a new function, dasysctlinit().
Queue dasysctlinit() to the taskqueue_thread taskqueue once
we have fully registered the da(4) instance.
taskqueue.h: Declare the new taskqueue_thread taskqueue, update some
comments.
subr_taskqueue.c:
Create the new kernel thread taskqueue. This taskqueue
runs outside of Giant, so any functions queued to it would
need to explicitly acquire/release Giant if they need it.
cd.4: Update the cd(4) man page to talk about the minimum command
size sysctl/loader tunable. Also note that the changer
variables are available as loader tunables as well.
da.4: Update the da(4) man page to cover the retry_count,
default_timeout and minimum_cmd_size sysctl variables/loader
tunables. Remove references to /dev/r???, they aren't used
any longer.
cd.9: Update the cd(9) man page to describe the CD_Q_10_BYTE_ONLY
quirk.
taskqueue.9: Update the taskqueue(9) man page to describe the new thread
task queue, and the taskqueue_swi_giant queue.
MFC after: 3 days
2003-09-03 04:46:28 +00:00
|
|
|
{
|
2004-08-08 02:37:22 +00:00
|
|
|
struct taskqueue **tqp, *tq;
|
2004-06-28 16:28:23 +00:00
|
|
|
|
2004-08-08 02:37:22 +00:00
|
|
|
tqp = arg;
|
|
|
|
tq = *tqp;
|
|
|
|
mtx_lock(&tq->tq_mutex);
|
Move dynamic sysctl(8) variable creation for the cd(4) and da(4) drivers
out of cdregister() and daregister(), which are run from interrupt context.
The sysctl code does blocking mallocs (M_WAITOK), which causes problems
if malloc(9) actually needs to sleep.
The eventual fix for this issue will involve moving the CAM probe process
inside a kernel thread. For now, though, I have fixed the issue by moving
dynamic sysctl variable creation for these two drivers to a task queue
running in a kernel thread.
The existing task queues (taskqueue_swi and taskqueue_swi_giant) run in
software interrupt handlers, which wouldn't fix the problem at hand. So I
have created a new task queue, taskqueue_thread, that runs inside a kernel
thread. (It also runs outside of Giant -- clients must explicitly acquire
and release Giant in their taskqueue functions.)
scsi_cd.c: Remove sysctl variable creation code from cdregister(), and
move it to a new function, cdsysctlinit(). Queue
cdsysctlinit() to the taskqueue_thread taskqueue once we
have fully registered the cd(4) driver instance.
scsi_da.c: Remove sysctl variable creation code from daregister(), and
move it to move it to a new function, dasysctlinit().
Queue dasysctlinit() to the taskqueue_thread taskqueue once
we have fully registered the da(4) instance.
taskqueue.h: Declare the new taskqueue_thread taskqueue, update some
comments.
subr_taskqueue.c:
Create the new kernel thread taskqueue. This taskqueue
runs outside of Giant, so any functions queued to it would
need to explicitly acquire/release Giant if they need it.
cd.4: Update the cd(4) man page to talk about the minimum command
size sysctl/loader tunable. Also note that the changer
variables are available as loader tunables as well.
da.4: Update the da(4) man page to cover the retry_count,
default_timeout and minimum_cmd_size sysctl variables/loader
tunables. Remove references to /dev/r???, they aren't used
any longer.
cd.9: Update the cd(9) man page to describe the CD_Q_10_BYTE_ONLY
quirk.
taskqueue.9: Update the taskqueue(9) man page to describe the new thread
task queue, and the taskqueue_swi_giant queue.
MFC after: 3 days
2003-09-03 04:46:28 +00:00
|
|
|
for (;;) {
|
2004-08-08 02:37:22 +00:00
|
|
|
taskqueue_run(tq);
|
|
|
|
msleep(tq, &tq->tq_mutex, PWAIT, "-", 0);
|
Move dynamic sysctl(8) variable creation for the cd(4) and da(4) drivers
out of cdregister() and daregister(), which are run from interrupt context.
The sysctl code does blocking mallocs (M_WAITOK), which causes problems
if malloc(9) actually needs to sleep.
The eventual fix for this issue will involve moving the CAM probe process
inside a kernel thread. For now, though, I have fixed the issue by moving
dynamic sysctl variable creation for these two drivers to a task queue
running in a kernel thread.
The existing task queues (taskqueue_swi and taskqueue_swi_giant) run in
software interrupt handlers, which wouldn't fix the problem at hand. So I
have created a new task queue, taskqueue_thread, that runs inside a kernel
thread. (It also runs outside of Giant -- clients must explicitly acquire
and release Giant in their taskqueue functions.)
scsi_cd.c: Remove sysctl variable creation code from cdregister(), and
move it to a new function, cdsysctlinit(). Queue
cdsysctlinit() to the taskqueue_thread taskqueue once we
have fully registered the cd(4) driver instance.
scsi_da.c: Remove sysctl variable creation code from daregister(), and
move it to move it to a new function, dasysctlinit().
Queue dasysctlinit() to the taskqueue_thread taskqueue once
we have fully registered the da(4) instance.
taskqueue.h: Declare the new taskqueue_thread taskqueue, update some
comments.
subr_taskqueue.c:
Create the new kernel thread taskqueue. This taskqueue
runs outside of Giant, so any functions queued to it would
need to explicitly acquire/release Giant if they need it.
cd.4: Update the cd(4) man page to talk about the minimum command
size sysctl/loader tunable. Also note that the changer
variables are available as loader tunables as well.
da.4: Update the da(4) man page to cover the retry_count,
default_timeout and minimum_cmd_size sysctl variables/loader
tunables. Remove references to /dev/r???, they aren't used
any longer.
cd.9: Update the cd(9) man page to describe the CD_Q_10_BYTE_ONLY
quirk.
taskqueue.9: Update the taskqueue(9) man page to describe the new thread
task queue, and the taskqueue_swi_giant queue.
MFC after: 3 days
2003-09-03 04:46:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-08-08 02:37:22 +00:00
|
|
|
void
|
Move dynamic sysctl(8) variable creation for the cd(4) and da(4) drivers
out of cdregister() and daregister(), which are run from interrupt context.
The sysctl code does blocking mallocs (M_WAITOK), which causes problems
if malloc(9) actually needs to sleep.
The eventual fix for this issue will involve moving the CAM probe process
inside a kernel thread. For now, though, I have fixed the issue by moving
dynamic sysctl variable creation for these two drivers to a task queue
running in a kernel thread.
The existing task queues (taskqueue_swi and taskqueue_swi_giant) run in
software interrupt handlers, which wouldn't fix the problem at hand. So I
have created a new task queue, taskqueue_thread, that runs inside a kernel
thread. (It also runs outside of Giant -- clients must explicitly acquire
and release Giant in their taskqueue functions.)
scsi_cd.c: Remove sysctl variable creation code from cdregister(), and
move it to a new function, cdsysctlinit(). Queue
cdsysctlinit() to the taskqueue_thread taskqueue once we
have fully registered the cd(4) driver instance.
scsi_da.c: Remove sysctl variable creation code from daregister(), and
move it to move it to a new function, dasysctlinit().
Queue dasysctlinit() to the taskqueue_thread taskqueue once
we have fully registered the da(4) instance.
taskqueue.h: Declare the new taskqueue_thread taskqueue, update some
comments.
subr_taskqueue.c:
Create the new kernel thread taskqueue. This taskqueue
runs outside of Giant, so any functions queued to it would
need to explicitly acquire/release Giant if they need it.
cd.4: Update the cd(4) man page to talk about the minimum command
size sysctl/loader tunable. Also note that the changer
variables are available as loader tunables as well.
da.4: Update the da(4) man page to cover the retry_count,
default_timeout and minimum_cmd_size sysctl variables/loader
tunables. Remove references to /dev/r???, they aren't used
any longer.
cd.9: Update the cd(9) man page to describe the CD_Q_10_BYTE_ONLY
quirk.
taskqueue.9: Update the taskqueue(9) man page to describe the new thread
task queue, and the taskqueue_swi_giant queue.
MFC after: 3 days
2003-09-03 04:46:28 +00:00
|
|
|
taskqueue_thread_enqueue(void *context)
|
|
|
|
{
|
2004-08-08 02:37:22 +00:00
|
|
|
struct taskqueue **tqp, *tq;
|
|
|
|
|
|
|
|
tqp = context;
|
|
|
|
tq = *tqp;
|
2004-06-28 16:28:23 +00:00
|
|
|
|
2004-08-08 02:37:22 +00:00
|
|
|
mtx_assert(&tq->tq_mutex, MA_OWNED);
|
|
|
|
wakeup(tq);
|
Move dynamic sysctl(8) variable creation for the cd(4) and da(4) drivers
out of cdregister() and daregister(), which are run from interrupt context.
The sysctl code does blocking mallocs (M_WAITOK), which causes problems
if malloc(9) actually needs to sleep.
The eventual fix for this issue will involve moving the CAM probe process
inside a kernel thread. For now, though, I have fixed the issue by moving
dynamic sysctl variable creation for these two drivers to a task queue
running in a kernel thread.
The existing task queues (taskqueue_swi and taskqueue_swi_giant) run in
software interrupt handlers, which wouldn't fix the problem at hand. So I
have created a new task queue, taskqueue_thread, that runs inside a kernel
thread. (It also runs outside of Giant -- clients must explicitly acquire
and release Giant in their taskqueue functions.)
scsi_cd.c: Remove sysctl variable creation code from cdregister(), and
move it to a new function, cdsysctlinit(). Queue
cdsysctlinit() to the taskqueue_thread taskqueue once we
have fully registered the cd(4) driver instance.
scsi_da.c: Remove sysctl variable creation code from daregister(), and
move it to move it to a new function, dasysctlinit().
Queue dasysctlinit() to the taskqueue_thread taskqueue once
we have fully registered the da(4) instance.
taskqueue.h: Declare the new taskqueue_thread taskqueue, update some
comments.
subr_taskqueue.c:
Create the new kernel thread taskqueue. This taskqueue
runs outside of Giant, so any functions queued to it would
need to explicitly acquire/release Giant if they need it.
cd.4: Update the cd(4) man page to talk about the minimum command
size sysctl/loader tunable. Also note that the changer
variables are available as loader tunables as well.
da.4: Update the da(4) man page to cover the retry_count,
default_timeout and minimum_cmd_size sysctl variables/loader
tunables. Remove references to /dev/r???, they aren't used
any longer.
cd.9: Update the cd(9) man page to describe the CD_Q_10_BYTE_ONLY
quirk.
taskqueue.9: Update the taskqueue(9) man page to describe the new thread
task queue, and the taskqueue_swi_giant queue.
MFC after: 3 days
2003-09-03 04:46:28 +00:00
|
|
|
}
|
|
|
|
|
2000-05-28 15:45:30 +00:00
|
|
|
TASKQUEUE_DEFINE(swi, taskqueue_swi_enqueue, 0,
|
2003-02-26 03:15:42 +00:00
|
|
|
swi_add(NULL, "task queue", taskqueue_swi_run, NULL, SWI_TQ,
|
|
|
|
INTR_MPSAFE, &taskqueue_ih));
|
|
|
|
|
|
|
|
TASKQUEUE_DEFINE(swi_giant, taskqueue_swi_giant_enqueue, 0,
|
|
|
|
swi_add(NULL, "Giant task queue", taskqueue_swi_giant_run,
|
|
|
|
NULL, SWI_TQ_GIANT, 0, &taskqueue_giant_ih));
|
Move dynamic sysctl(8) variable creation for the cd(4) and da(4) drivers
out of cdregister() and daregister(), which are run from interrupt context.
The sysctl code does blocking mallocs (M_WAITOK), which causes problems
if malloc(9) actually needs to sleep.
The eventual fix for this issue will involve moving the CAM probe process
inside a kernel thread. For now, though, I have fixed the issue by moving
dynamic sysctl variable creation for these two drivers to a task queue
running in a kernel thread.
The existing task queues (taskqueue_swi and taskqueue_swi_giant) run in
software interrupt handlers, which wouldn't fix the problem at hand. So I
have created a new task queue, taskqueue_thread, that runs inside a kernel
thread. (It also runs outside of Giant -- clients must explicitly acquire
and release Giant in their taskqueue functions.)
scsi_cd.c: Remove sysctl variable creation code from cdregister(), and
move it to a new function, cdsysctlinit(). Queue
cdsysctlinit() to the taskqueue_thread taskqueue once we
have fully registered the cd(4) driver instance.
scsi_da.c: Remove sysctl variable creation code from daregister(), and
move it to move it to a new function, dasysctlinit().
Queue dasysctlinit() to the taskqueue_thread taskqueue once
we have fully registered the da(4) instance.
taskqueue.h: Declare the new taskqueue_thread taskqueue, update some
comments.
subr_taskqueue.c:
Create the new kernel thread taskqueue. This taskqueue
runs outside of Giant, so any functions queued to it would
need to explicitly acquire/release Giant if they need it.
cd.4: Update the cd(4) man page to talk about the minimum command
size sysctl/loader tunable. Also note that the changer
variables are available as loader tunables as well.
da.4: Update the da(4) man page to cover the retry_count,
default_timeout and minimum_cmd_size sysctl variables/loader
tunables. Remove references to /dev/r???, they aren't used
any longer.
cd.9: Update the cd(9) man page to describe the CD_Q_10_BYTE_ONLY
quirk.
taskqueue.9: Update the taskqueue(9) man page to describe the new thread
task queue, and the taskqueue_swi_giant queue.
MFC after: 3 days
2003-09-03 04:46:28 +00:00
|
|
|
|
2004-08-08 02:37:22 +00:00
|
|
|
TASKQUEUE_DEFINE_THREAD(thread);
|
2003-09-05 23:09:22 +00:00
|
|
|
|
|
|
|
int
|
|
|
|
taskqueue_enqueue_fast(struct taskqueue *queue, struct task *task)
|
|
|
|
{
|
|
|
|
struct task *ins;
|
|
|
|
struct task *prev;
|
|
|
|
|
|
|
|
mtx_lock_spin(&queue->tq_mutex);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Count multiple enqueues.
|
|
|
|
*/
|
|
|
|
if (task->ta_pending) {
|
|
|
|
task->ta_pending++;
|
|
|
|
mtx_unlock_spin(&queue->tq_mutex);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Optimise the case when all tasks have the same priority.
|
|
|
|
*/
|
|
|
|
prev = STAILQ_LAST(&queue->tq_queue, task, ta_link);
|
|
|
|
if (!prev || prev->ta_priority >= task->ta_priority) {
|
|
|
|
STAILQ_INSERT_TAIL(&queue->tq_queue, task, ta_link);
|
|
|
|
} else {
|
|
|
|
prev = 0;
|
|
|
|
for (ins = STAILQ_FIRST(&queue->tq_queue); ins;
|
|
|
|
prev = ins, ins = STAILQ_NEXT(ins, ta_link))
|
|
|
|
if (ins->ta_priority < task->ta_priority)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (prev)
|
|
|
|
STAILQ_INSERT_AFTER(&queue->tq_queue, prev, task, ta_link);
|
|
|
|
else
|
|
|
|
STAILQ_INSERT_HEAD(&queue->tq_queue, task, ta_link);
|
|
|
|
}
|
|
|
|
|
|
|
|
task->ta_pending = 1;
|
|
|
|
if (queue->tq_enqueue)
|
|
|
|
queue->tq_enqueue(queue->tq_context);
|
|
|
|
|
|
|
|
mtx_unlock_spin(&queue->tq_mutex);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
taskqueue_run_fast(struct taskqueue *queue)
|
|
|
|
{
|
|
|
|
struct task *task;
|
|
|
|
int pending;
|
|
|
|
|
|
|
|
mtx_lock_spin(&queue->tq_mutex);
|
|
|
|
while (STAILQ_FIRST(&queue->tq_queue)) {
|
|
|
|
/*
|
|
|
|
* Carefully remove the first task from the queue and
|
|
|
|
* zero its pending count.
|
|
|
|
*/
|
|
|
|
task = STAILQ_FIRST(&queue->tq_queue);
|
|
|
|
STAILQ_REMOVE_HEAD(&queue->tq_queue, ta_link);
|
|
|
|
pending = task->ta_pending;
|
|
|
|
task->ta_pending = 0;
|
|
|
|
mtx_unlock_spin(&queue->tq_mutex);
|
|
|
|
|
|
|
|
task->ta_func(task->ta_context, pending);
|
|
|
|
|
|
|
|
mtx_lock_spin(&queue->tq_mutex);
|
|
|
|
}
|
|
|
|
mtx_unlock_spin(&queue->tq_mutex);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct taskqueue *taskqueue_fast;
|
|
|
|
static void *taskqueue_fast_ih;
|
|
|
|
|
|
|
|
static void
|
|
|
|
taskqueue_fast_schedule(void *context)
|
|
|
|
{
|
|
|
|
swi_sched(taskqueue_fast_ih, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
taskqueue_fast_run(void *dummy)
|
|
|
|
{
|
|
|
|
taskqueue_run_fast(taskqueue_fast);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
taskqueue_define_fast(void *arg)
|
|
|
|
{
|
2004-06-28 16:28:23 +00:00
|
|
|
|
|
|
|
taskqueue_fast = malloc(sizeof(struct taskqueue), M_TASKQUEUE,
|
|
|
|
M_NOWAIT | M_ZERO);
|
2003-09-05 23:09:22 +00:00
|
|
|
if (!taskqueue_fast) {
|
|
|
|
printf("%s: Unable to allocate fast task queue!\n", __func__);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
STAILQ_INIT(&taskqueue_fast->tq_queue);
|
|
|
|
taskqueue_fast->tq_name = "fast";
|
|
|
|
taskqueue_fast->tq_enqueue = taskqueue_fast_schedule;
|
2003-09-06 21:05:18 +00:00
|
|
|
mtx_init(&taskqueue_fast->tq_mutex, "taskqueue_fast", NULL, MTX_SPIN);
|
2003-09-05 23:09:22 +00:00
|
|
|
|
|
|
|
mtx_lock(&taskqueue_queues_mutex);
|
|
|
|
STAILQ_INSERT_TAIL(&taskqueue_queues, taskqueue_fast, tq_link);
|
|
|
|
mtx_unlock(&taskqueue_queues_mutex);
|
|
|
|
|
|
|
|
swi_add(NULL, "Fast task queue", taskqueue_fast_run,
|
|
|
|
NULL, SWI_TQ_FAST, 0, &taskqueue_fast_ih);
|
|
|
|
}
|
|
|
|
SYSINIT(taskqueue_fast, SI_SUB_CONFIGURE, SI_ORDER_SECOND,
|
2004-06-28 16:28:23 +00:00
|
|
|
taskqueue_define_fast, NULL);
|