Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use proper NetBSD conventions for deferred kthread creation, not the 

other semantics from an earlier incarnation.

Call kcont_init() from init_main before device autoconfiguration,
so kcont is availble to device drivers if required.

Also ensure the kthread process runs any pending continuations once
the kthread is finally up and running. For now, use a non-null timeout
to poll the queue periodically.  Draining any pending requests just
before the kthread enters its ltsleep()/kc_run loop is cleaner, but
this is the version I tested with an early-in-boot kcont request.)
This commit is contained in:
jonathan 2004-03-27 00:42:38 +00:00
parent 84b05f6e6e
commit 63fe9ef057
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/init_main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: init_main.c,v 1.233 2004/03/09 02:35:45 junyoung Exp $ */
/* $NetBSD: init_main.c,v 1.234 2004/03/27 00:42:38 jonathan Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1992, 1993
@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.233 2004/03/09 02:35:45 junyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.234 2004/03/27 00:42:38 jonathan Exp $");
#include "fs_nfs.h"
#include "opt_nfsserver.h"
@ -94,6 +94,7 @@ __KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.233 2004/03/09 02:35:45 junyoung Exp
#include <sys/errno.h>
#include <sys/callout.h>
#include <sys/kernel.h>
#include <sys/kcont.h>
#include <sys/mount.h>
#include <sys/proc.h>
#include <sys/kthread.h>
@ -267,6 +268,9 @@ main(void)
/* Initialize sockets. */
soinit();
/* Initialize kcont. */
kcont_init();
/*
* The following things must be done before autoconfiguration.
*/

21
sys/kern/kern_kcont.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_kcont.c,v 1.8 2004/03/25 23:02:58 enami Exp $ */
/* $NetBSD: kern_kcont.c,v 1.9 2004/03/27 00:42:38 jonathan Exp $ */
/*
* Copyright 2003 Jonathan Stone.
@ -37,16 +37,18 @@
/*
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_kcont.c,v 1.8 2004/03/25 23:02:58 enami Exp $ ");
__KERNEL_RCSID(0, "$NetBSD: kern_kcont.c,v 1.9 2004/03/27 00:42:38 jonathan Exp $ ");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/errno.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/pool.h>
#include <sys/kthread.h>
#include <sys/proc.h>
#include <sys/systm.h>
#include <lib/libkern/libkern.h>
#include <machine/intr.h> /* IPL_*, and schedsoftnet() */
@ -65,6 +67,7 @@ static __inline struct kc *kcont_dequeue_atomic(kcq_t *kcq);
static void kcont_worker(void * /*arg*/);
static void kcont_create_worker(void *);
#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
@ -340,6 +343,14 @@ kcont_run_softserial(void *arg)
}
#endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */
static void
kcont_create_worker(void *arg)
{
if (kthread_create1(kcont_worker, NULL, NULL, "kcont"))
panic("fork kcont");
}
/*
* Main entrypoint for kcont worker kthreads to execute
* a continuation which requested deferral to process context.
@ -352,8 +363,8 @@ kcont_worker(void *arg)
(void)arg; /* kill GCC warning */
while (1) {
status = ltsleep(&kcq_process_ctxt, PCATCH, "kcont", 0, NULL);
if (status != 0)
status = ltsleep(&kcq_process_ctxt, PCATCH, "kcont", hz, NULL);
if (status != 0 && status != EWOULDBLOCK)
break;
kcont_run(&kcq_process_ctxt, NULL, 0, KC_IPL_DEFER_PROCESS);
}
@ -395,5 +406,5 @@ kcont_init(void)
* locking should have at least one worker kthread per CPU).
*/
SIMPLEQ_INIT(&kcq_process_ctxt);
kthread_create(kcont_worker, NULL);
kthread_create(kcont_create_worker, NULL);
}