Terry Lambert's loadable kernel module support w/improvements from the

NetBSD group.

12 files changed, 1080 insertions, 28 deletions

diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 54c2a58..51fb178 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.52 1994/08/13 14:21:42 davidg Exp $
+ *	$Id: machdep.c,v 1.53 1994/08/18 22:34:40 wollman Exp $
  */
 
 #include "npx.h"
@@ -1097,7 +1097,7 @@ init386(first)
 	 * page with etext in it, the data segment goes to the end of
 	 * the address space
 	 */
-	gdt_segs[GCODE_SEL].ssd_limit = i386_btop(i386_round_page(&etext)) - 1;
+	gdt_segs[GCODE_SEL].ssd_limit = i386_btop(0) - 1 /* i386_btop(i386_round_page(&etext)) - 1 */;
 	gdt_segs[GDATA_SEL].ssd_limit = i386_btop(0) - 1;
 	for (x=0; x < NGDT; x++) ssdtosd(gdt_segs+x, gdt+x);
 
diff --git a/sys/conf/files b/sys/conf/files
index c2a2048..501d284 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -46,6 +46,7 @@ kern/kern_exit.c	standard
 kern/kern_fork.c	standard
 kern/kern_ktrace.c	standard
 kern/kern_lockf.c	standard
+kern/kern_lkm.c		optional lkm
 kern/kern_malloc.c	standard
 kern/kern_physio.c	standard
 kern/kern_proc.c	standard
diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c
index 3f03743..2213333 100644
--- a/sys/i386/i386/conf.c
+++ b/sys/i386/i386/conf.c
@@ -41,7 +41,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)conf.c	5.8 (Berkeley) 5/12/91
- *	$Id: conf.c,v 1.26 1994/05/25 08:52:45 rgrimes Exp $
+ *	$Id: conf.c,v 1.27 1994/08/18 22:34:39 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -69,6 +69,35 @@ typedef int d_mmap_t __P((/* XXX */));
 d_rdwr_t rawread, rawwrite;
 d_strategy_t swstrategy;
 
+#ifdef LKM
+int lkmenodev();
+#define	lkmopen		(d_open_t *)lkmenodev
+#define	lkmclose	(d_close_t *)lkmenodev
+#define lkmread		(d_rdwr_t *)lkmenodev
+#define lkmwrite	(d_rdwr_t *)lkmenodev
+#define	lkmstrategy	(d_strategy_t *)lkmenodev
+#define	lkmioctl	(d_ioctl_t *)lkmenodev
+#define	lkmdump		(d_dump_t *)lkmenodev
+#define	lkmsize		(d_psize_t *)0
+#define lkmstop		(d_stop_t *)lkmenodev
+#define lkmreset	(d_reset_t *)lkmenodev
+#define lkmmmap		(d_mmap_t *)lkmenodev
+#define lkmselect	(d_select_t *)lkmenodev
+#else
+#define	lkmopen		(d_open_t *)enxio
+#define	lkmclose	(d_close_t *)enxio
+#define lkmread		(d_rdwr_t *)enxio
+#define lkmwrite	(d_rdwr_t *)enxio
+#define	lkmstrategy	(d_strategy_t *)enxio
+#define	lkmioctl	(d_ioctl_t *)enxio
+#define	lkmdump		(d_dump_t *)enxio
+#define	lkmsize		(d_psize_t *)0
+#define lkmstop		(d_stop_t *)enxio
+#define lkmreset	(d_reset_t *)enxio
+#define lkmmmap		(d_mmap_t *)enxio
+#define lkmselect	(d_select_t *)enxio
+#endif
+
 #include "wd.h"
 #if (NWD > 0)
 d_open_t wdopen;
@@ -226,7 +255,21 @@ struct bdevsw	bdevsw[] =
 	  cddump,	cdsize,		0 },
 	{ mcdopen,	mcdclose,	mcdstrategy,	mcdioctl,	/*7*/
 	  mcddump,	mcdsize,	0 },
-	{ 0, } /* block major 8 is reserved for local use */
+#ifdef LKM
+	{ lkmopen,	lkmclose,	lkmstrategy,	lkmioctl,	/*8*/
+	  lkmdump,	lkmsize,	NULL },
+	{ lkmopen,	lkmclose,	lkmstrategy,	lkmioctl,	/*9*/
+	  lkmdump,	lkmsize,	NULL },
+	{ lkmopen,	lkmclose,	lkmstrategy,	lkmioctl,	/*10*/
+	  lkmdump,	lkmsize,	NULL },
+	{ lkmopen,	lkmclose,	lkmstrategy,	lkmioctl,	/*11*/
+	  lkmdump,	lkmsize,	NULL },
+	{ lkmopen,	lkmclose,	lkmstrategy,	lkmioctl,	/*12*/
+	  lkmdump,	lkmsize,	NULL },
+	{ lkmopen,	lkmclose,	lkmstrategy,	lkmioctl,	/*13*/
+	  lkmdump,	lkmsize,	NULL },
+#endif
+	{ 0, } /* block major 14 is reserved for local use */
 /*
  * If you need a bdev major number, please contact the FreeBSD team
  * by sending mail to "FreeBSD-hackers@freefall.cdrom.com".
@@ -503,6 +546,16 @@ d_ioctl_t ukioctl;
 #define	ukioctl		(d_ioctl_t *)enxio
 #endif
 
+#ifdef LKM
+d_open_t lkmcopen;
+d_close_t lkmcclose;
+d_ioctl_t lkmcioctl;
+#else
+#define	lkmcopen	(d_open_t *)enxio
+#define lkmcclose	(d_close_t *)enxio
+#define lkmcioctl	(d_ioctl_t *)enxio
+#endif
+
 #define noopen		(d_open_t *)enodev
 #define noclose		(d_close_t *)enodev
 #define noread		(d_rdwr_t *)enodev
@@ -618,6 +671,27 @@ struct cdevsw	cdevsw[] =
 	{ ukopen,	ukclose,	noread,         nowrite,      	/*31*/
 	  ukioctl,	nostop,		nullreset,	NULL,	/* unknown */
 	  seltrue,	nommap,		NULL },			/* scsi */
+	{ lkmcopen,	lkmcclose,	noread,		nowrite,	/*32*/
+	  lkmcioctl,	nostop,		nullreset,	NULL,
+	  noselect,	nommap,		NULL },
+	{ lkmopen,	lkmclose,	lkmread,	lkmwrite,	/*33*/
+	  lkmioctl,	lkmstop,	lkmreset,	NULL,
+	  lkmselect,	lkmmmap,	NULL },
+	{ lkmopen,	lkmclose,	lkmread,	lkmwrite,	/*34*/
+	  lkmioctl,	lkmstop,	lkmreset,	NULL,
+	  lkmselect,	lkmmmap,	NULL },
+	{ lkmopen,	lkmclose,	lkmread,	lkmwrite,	/*35*/
+	  lkmioctl,	lkmstop,	lkmreset,	NULL,
+	  lkmselect,	lkmmmap,	NULL },
+	{ lkmopen,	lkmclose,	lkmread,	lkmwrite,	/*36*/
+	  lkmioctl,	lkmstop,	lkmreset,	NULL,
+	  lkmselect,	lkmmmap,	NULL },
+	{ lkmopen,	lkmclose,	lkmread,	lkmwrite,	/*37*/
+	  lkmioctl,	lkmstop,	lkmreset,	NULL,
+	  lkmselect,	lkmmmap,	NULL },
+	{ lkmopen,	lkmclose,	lkmread,	lkmwrite,	/*38*/
+	  lkmioctl,	lkmstop,	lkmreset,	NULL,
+	  lkmselect,	lkmmmap,	NULL },
 	{ 0, } /* character device 32 is reserved for local use */
 /*
  * If you need a cdev major number, please contact the FreeBSD team
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 54c2a58..51fb178 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.52 1994/08/13 14:21:42 davidg Exp $
+ *	$Id: machdep.c,v 1.53 1994/08/18 22:34:40 wollman Exp $
  */
 
 #include "npx.h"
@@ -1097,7 +1097,7 @@ init386(first)
 	 * page with etext in it, the data segment goes to the end of
 	 * the address space
 	 */
-	gdt_segs[GCODE_SEL].ssd_limit = i386_btop(i386_round_page(&etext)) - 1;
+	gdt_segs[GCODE_SEL].ssd_limit = i386_btop(0) - 1 /* i386_btop(i386_round_page(&etext)) - 1 */;
 	gdt_segs[GDATA_SEL].ssd_limit = i386_btop(0) - 1;
 	for (x=0; x < NGDT; x++) ssdtosd(gdt_segs+x, gdt+x);
 
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 80cab90..53886e2 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
+ * created from	$Id: syscalls.master,v 1.3 1994/08/02 07:42:44 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -172,6 +172,19 @@ int	ftruncate();
 int	__sysctl();
 int	mlock();
 int	munlock();
+#ifdef LKM
+int	lkmnosys();
+int	lkmnosys();
+int	lkmnosys();
+int	lkmnosys();
+int	lkmnosys();
+int	lkmnosys();
+int	lkmnosys();
+int	lkmnosys();
+int	lkmnosys();
+int	lkmnosys();
+#else
+#endif
 
 #ifdef COMPAT_43
 #define compat(n, name) n, __CONCAT(o,name)
@@ -231,6 +244,9 @@ int	ogetdirentries();
 #ifdef LFS
 #else
 #endif
+#ifdef LKM
+#else
+#endif
 
 #else /* COMPAT_43 */
 #define compat(n, name) 0, nosys
@@ -478,7 +494,29 @@ struct sysent sysent[] = {
 	{ 0, nosys },			/* 207 = nosys */
 	{ 0, nosys },			/* 208 = nosys */
 	{ 0, nosys },			/* 209 = nosys */
+#ifdef LKM
+	{ 0, lkmnosys },			/* 210 = lkmnosys */
+	{ 0, lkmnosys },			/* 211 = lkmnosys */
+	{ 0, lkmnosys },			/* 212 = lkmnosys */
+	{ 0, lkmnosys },			/* 213 = lkmnosys */
+	{ 0, lkmnosys },			/* 214 = lkmnosys */
+	{ 0, lkmnosys },			/* 215 = lkmnosys */
+	{ 0, lkmnosys },			/* 216 = lkmnosys */
+	{ 0, lkmnosys },			/* 217 = lkmnosys */
+	{ 0, lkmnosys },			/* 218 = lkmnosys */
+	{ 0, lkmnosys },			/* 219 = lkmnosys */
+#else
 	{ 0, nosys },			/* 210 = nosys */
+	{ 0, nosys },			/* 211 = nosys */
+	{ 0, nosys },			/* 212 = nosys */
+	{ 0, nosys },			/* 213 = nosys */
+	{ 0, nosys },			/* 214 = nosys */
+	{ 0, nosys },			/* 215 = nosys */
+	{ 0, nosys },			/* 216 = nosys */
+	{ 0, nosys },			/* 217 = nosys */
+	{ 0, nosys },			/* 218 = nosys */
+	{ 0, nosys },			/* 219 = nosys */
+#endif
 };
 
 int	nsysent = sizeof(sysent) / sizeof(sysent[0]);
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
new file mode 100644
index 0000000..c546da4
--- /dev/null
+++ b/sys/kern/kern_lkm.c
@@ -0,0 +1,889 @@
+/*	$NetBSD: kern_lkm.c,v 1.18 1994/06/29 06:32:31 cgd Exp $	*/
+
+/*
+ * Copyright (c) 1994 Christopher G. Demetriou
+ * Copyright (c) 1992 Terrence R. Lambert.
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by Terrence R. Lambert.
+ * 4. The name Terrence R. Lambert may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY TERRENCE R. LAMBERT ``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 TERRENCE R. LAMBERT 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.
+ */
+
+/*
+ * XXX it's not really safe to unload *any* of the types which are
+ * currently loadable; e.g. you could unload a syscall which was being
+ * blocked in, etc.  In the long term, a solution should be come up
+ * with, but "not right now." -- cgd
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/proc.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/mount.h>
+#include <sys/exec.h>
+#include <sys/imgact.h>
+#include <sys/lkm.h>
+
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/vm_kern.h>
+
+#define PAGESIZE 1024		/* kmem_alloc() allocation quantum */
+
+#define	LKM_ALLOC	0x01
+#define	LKM_WANT	0x02
+
+#define	LKMS_IDLE	0x00
+#define	LKMS_RESERVED	0x01
+#define	LKMS_LOADING	0x02
+#define	LKMS_LOADED	0x04
+#define	LKMS_UNLOADING	0x08
+
+static int	lkm_v = 0;
+static int	lkm_state = LKMS_IDLE;
+
+#ifndef MAXLKMS
+#define	MAXLKMS		20
+#endif
+
+static struct lkm_table	lkmods[MAXLKMS];	/* table of loaded modules */
+static struct lkm_table	*curp;			/* global for in-progress ops */
+
+/*ARGSUSED*/
+int
+lkmcopen(dev, flag, devtype, p)
+	dev_t dev;
+	int flag;
+	int devtype;
+	struct proc *p;
+{
+	int error;
+
+	if (minor(dev) != 0)
+		return(ENXIO);		/* bad minor # */
+
+	/*
+	 * Use of the loadable kernel module device must be exclusive; we
+	 * may try to remove this restriction later, but it's really no
+	 * hardship.
+	 */
+	while (lkm_v & LKM_ALLOC) {
+		if (flag & FNONBLOCK)		/* don't hang */
+			return(EBUSY);
+		lkm_v |= LKM_WANT;
+		/*
+		 * Sleep pending unlock; we use tsleep() to allow
+		 * an alarm out of the open.
+		 */
+		if (error = tsleep((caddr_t)&lkm_v, TTIPRI|PCATCH, "lkmopn", 0))
+			return(error);	/* leave LKM_WANT set -- no problem */
+	}
+	lkm_v |= LKM_ALLOC;
+
+	return(0);		/* pseudo-device open */
+}
+
+/*
+ * Unreserve the memory associated with the current loaded module; done on
+ * a coerced close of the lkm device (close on premature exit of modload)
+ * or explicitly by modload as a result of a link failure.
+ */
+static void
+lkmunreserve()
+{
+
+	if (lkm_state == LKMS_IDLE)
+		return;
+
+	/*
+	 * Actually unreserve the memory
+	 */
+	if (curp && curp->area) {
+		kmem_free(kmem_map, curp->area, curp->size);/**/
+		curp->area = 0;
+	}
+
+	lkm_state = LKMS_IDLE;
+}
+
+int
+lkmcclose(dev, flag, mode, p)
+	dev_t dev;
+	int flag;
+	int mode;
+	struct proc *p;
+{
+
+	if (!(lkm_v & LKM_ALLOC)) {
+#ifdef DEBUG
+		printf("LKM: close before open!\n");
+#endif	/* DEBUG */
+		return(EBADF);
+	}
+
+	/* do this before waking the herd... */
+	if (curp && !curp->used) {
+		/*
+		 * If we close before setting used, we have aborted
+		 * by way of error or by way of close-on-exit from
+		 * a premature exit of "modload".
+		 */
+		lkmunreserve();	/* coerce state to LKM_IDLE */
+	}
+
+	lkm_v &= ~LKM_ALLOC;
+	wakeup((caddr_t)&lkm_v);	/* thundering herd "problem" here */
+
+	return(0);		/* pseudo-device closed */
+}
+
+/*ARGSUSED*/
+int
+lkmcioctl(dev, cmd, data, flag)
+	dev_t dev;
+	int cmd;
+	caddr_t data;
+	int flag;
+{
+	int err = 0;
+	int i;
+	struct lmc_resrv *resrvp;
+	struct lmc_loadbuf *loadbufp;
+	struct lmc_unload *unloadp;
+	struct lmc_stat	 *statp;
+	int (*funcp)();
+	char istr[MAXLKMNAME];
+
+	switch(cmd) {
+	case LMRESERV:		/* reserve pages for a module */
+		if ((flag & FWRITE) == 0) /* only allow this if writing */
+			return EPERM;
+
+		resrvp = (struct lmc_resrv *)data;
+
+		/*
+		 * Find a free slot.
+		 */
+		for (i = 0; i < MAXLKMS; i++)
+			if (!lkmods[i].used)
+				break;
+		if (i == MAXLKMS) {
+			err = ENOMEM;		/* no slots available */
+			break;
+		}
+		curp = &lkmods[i];
+		curp->id = i;		/* self reference slot offset */
+
+		resrvp->slot = i;		/* return slot */
+
+		/*
+		 * Get memory for module
+		 */
+		curp->size = resrvp->size;
+
+		curp->area = kmem_alloc(kmem_map, curp->size);/**/
+
+		curp->offset = 0;		/* load offset */
+
+		resrvp->addr = curp->area; /* ret kernel addr */
+
+#ifdef DEBUG
+		printf("LKM: LMRESERV (actual   = 0x%08x)\n", curp->area);
+		printf("LKM: LMRESERV (adjusted = 0x%08x)\n",
+			trunc_page(curp->area));
+#endif	/* DEBUG */
+		lkm_state = LKMS_RESERVED;
+		break;
+
+	case LMLOADBUF:		/* Copy in; stateful, follows LMRESERV */
+		if ((flag & FWRITE) == 0) /* only allow this if writing */
+			return EPERM;
+
+		loadbufp = (struct lmc_loadbuf *)data;
+		i = loadbufp->cnt;
+		if ((lkm_state != LKMS_RESERVED && lkm_state != LKMS_LOADING)
+		    || i < 0
+		    || i > MODIOBUF
+		    || i > curp->size - curp->offset) {
+			err = ENOMEM;
+			break;
+		}
+
+		/* copy in buffer full of data */
+		if (err = copyin((caddr_t)loadbufp->data, (caddr_t)curp->area + curp->offset, i))
+			break;
+
+		if ((curp->offset + i) < curp->size) {
+			lkm_state = LKMS_LOADING;
+#ifdef DEBUG
+			printf("LKM: LMLOADBUF (loading @ %d of %d, i = %d)\n",
+			curp->offset, curp->size, i);
+#endif	/* DEBUG */
+		} else {
+			lkm_state = LKMS_LOADED;
+#ifdef DEBUG
+			printf("LKM: LMLOADBUF (loaded)\n");
+#endif	/* DEBUG */
+		}
+		curp->offset += i;
+		break;
+
+	case LMUNRESRV:		/* discard reserved pages for a module */
+		if ((flag & FWRITE) == 0) /* only allow this if writing */
+			return EPERM;
+
+		lkmunreserve();	/* coerce state to LKM_IDLE */
+#ifdef DEBUG
+		printf("LKM: LMUNRESERV\n");
+#endif	/* DEBUG */
+		break;
+
+	case LMREADY:		/* module loaded: call entry */
+		if ((flag & FWRITE) == 0) /* only allow this if writing */
+			return EPERM;
+
+		switch (lkm_state) {
+		case LKMS_LOADED:
+			break;
+		case LKMS_LOADING:
+			/* The remainder must be bss, so we clear it */
+			bzero((caddr_t)curp->area + curp->offset,
+			      curp->size - curp->offset);
+			break;
+		default:
+
+#ifdef DEBUG
+			printf("lkm_state is %02x\n", lkm_state);
+#endif	/* DEBUG */
+			return ENXIO;
+		}
+
+		curp->entry = (int (*)()) (*((int *) (data)));
+
+		/* call entry(load)... (assigns "private" portion) */
+		if (err = (*(curp->entry))(curp, LKM_E_LOAD, LKM_VERSION)) {
+			/*
+			 * Module may refuse loading or may have a
+			 * version mismatch...
+			 */
+			lkm_state = LKMS_UNLOADING;	/* for lkmunreserve */
+			lkmunreserve();			/* free memory */
+			curp->used = 0;			/* free slot */
+			break;
+		}
+
+		curp->used = 1;
+#ifdef DEBUG
+		printf("LKM: LMREADY\n");
+#endif	/* DEBUG */
+		lkm_state = LKMS_IDLE;
+		break;
+
+	case LMUNLOAD:		/* unload a module */
+		if ((flag & FWRITE) == 0) /* only allow this if writing */
+			return EPERM;
+
+		unloadp = (struct lmc_unload *)data;
+
+		if ((i = unloadp->id) == -1) {		/* unload by name */
+			/*
+			 * Copy name and lookup id from all loaded
+			 * modules.  May fail.
+			 */
+		 	if (err = copyinstr(unloadp->name, istr, MAXLKMNAME-1, NULL))
+				break;
+
+			/*
+			 * look up id...
+			 */
+			for (i = 0; i < MAXLKMS; i++) {
+				if (!lkmods[i].used)
+					continue;
+				if (!strcmp(istr,
+				        lkmods[i].private.lkm_any->lkm_name))
+					break;
+			}
+		}
+
+		/*
+		 * Range check the value; on failure, return EINVAL
+		 */
+		if (i < 0 || i >= MAXLKMS) {
+			err = EINVAL;
+			break;
+		}
+
+		curp = &lkmods[i];
+
+		if (!curp->used) {
+			err = ENOENT;
+			break;
+		}
+
+		/* call entry(unload) */
+		if ((*(curp->entry))(curp, LKM_E_UNLOAD, LKM_VERSION)) {
+			err = EBUSY;
+			break;
+		}
+
+		lkm_state = LKMS_UNLOADING;	/* non-idle for lkmunreserve */
+		lkmunreserve();			/* free memory */
+		curp->used = 0;			/* free slot */
+		break;
+
+	case LMSTAT:		/* stat a module by id/name */
+		/* allow readers and writers to stat */
+
+		statp = (struct lmc_stat *)data;
+
+		if ((i = statp->id) == -1) {		/* stat by name */
+			/*
+			 * Copy name and lookup id from all loaded
+			 * modules.
+			 */
+		 	copystr(statp->name, istr, MAXLKMNAME-1, NULL);
+			/*
+			 * look up id...
+			 */
+			for (i = 0; i < MAXLKMS; i++) {
+				if (!lkmods[i].used)
+					continue;
+				if (!strcmp(istr,
+				        lkmods[i].private.lkm_any->lkm_name))
+					break;
+			}
+
+			if (i == MAXLKMS) {		/* Not found */
+				err = ENOENT;
+				break;
+			}
+		}
+
+		/*
+		 * Range check the value; on failure, return EINVAL
+		 */
+		if (i < 0 || i >= MAXLKMS) {
+			err = EINVAL;
+			break;
+		}
+
+		curp = &lkmods[i];
+
+		if (!curp->used) {			/* Not found */
+			err = ENOENT;
+			break;
+		}
+
+		/*
+		 * Copy out stat information for this module...
+		 */
+		statp->id	= curp->id;
+		statp->offset	= curp->private.lkm_any->lkm_offset;
+		statp->type	= curp->private.lkm_any->lkm_type;
+		statp->area	= curp->area;
+		statp->size	= curp->size / PAGESIZE;
+		statp->private	= (unsigned long)curp->private.lkm_any;
+		statp->ver	= curp->private.lkm_any->lkm_ver;
+		copystr(curp->private.lkm_any->lkm_name, 
+			  statp->name,
+			  MAXLKMNAME - 2,
+			  NULL);
+
+		break;
+
+	default:		/* bad ioctl()... */
+		err = ENOTTY;
+		break;
+	}
+
+	return (err);
+}
+
+/*
+ * Acts like "nosys" but can be identified in sysent for dynamic call
+ * number assignment for a limited number of calls.
+ *
+ * Place holder for system call slots reserved for loadable modules.
+ */
+int
+lkmnosys()
+{
+
+	return(nosys());
+}
+
+/*
+ * Acts like "enodev", but can be identified in cdevsw and bdevsw for
+ * dynamic driver major number assignment for a limited number of
+ * drivers.
+ *
+ * Place holder for device switch slots reserved for loadable modules.
+ */
+int
+lkmenodev()
+{
+
+	return(enodev());
+}
+
+int
+lkmexists(lkmtp)
+	struct lkm_table *lkmtp;
+{
+	int i;
+
+	/*
+	 * see if name exists...
+	 */
+	for (i = 0; i < MAXLKMS; i++) {
+		/*
+		 * An unused module and the one we are testing are not
+		 * considered.
+		 */
+		if (!lkmods[i].used || &lkmods[i] == lkmtp)
+			continue;
+		if (!strcmp(lkmtp->private.lkm_any->lkm_name,
+			lkmods[i].private.lkm_any->lkm_name))
+			return(1);		/* already loaded... */
+	}
+
+	return(0);		/* module not loaded... */
+}
+
+/*
+ * For the loadable system call described by the structure pointed to
+ * by lkmtp, load/unload/stat it depending on the cmd requested.
+ */
+static int
+_lkm_syscall(lkmtp, cmd)
+	struct lkm_table *lkmtp;
+	int cmd;
+{
+	struct lkm_syscall *args = lkmtp->private.lkm_syscall;
+	int i;
+	int err = 0;
+	extern int nsysent;	/* from init_sysent.c */
+
+	switch(cmd) {
+	case LKM_E_LOAD:
+		/* don't load twice! */
+		if (lkmexists(lkmtp))
+			return(EEXIST);
+		if ((i = args->lkm_offset) == -1) {	/* auto */
+			/*
+			 * Search the table looking for a slot...
+			 */
+			for (i = 0; i < nsysent; i++)
+				if (sysent[i].sy_call == lkmnosys)
+					break;		/* found it! */
+			/* out of allocable slots? */
+			if (i == nsysent) {
+				err = ENFILE;
+				break;
+			}
+		} else {				/* assign */
+			if (i < 0 || i >= nsysent) {
+				err = EINVAL;
+				break;
+			}
+		}
+
+		/* save old */
+		bcopy(&sysent[i], &(args->lkm_oldent), sizeof(struct sysent));
+
+		/* replace with new */
+		bcopy(args->lkm_sysent, &sysent[i], sizeof(struct sysent));
+
+		/* done! */
+		args->lkm_offset = i;	/* slot in sysent[] */
+
+		break;
+
+	case LKM_E_UNLOAD:
+		/* current slot... */
+		i = args->lkm_offset;
+
+		/* replace current slot contents with old contents */
+		bcopy(&(args->lkm_oldent), &sysent[i], sizeof(struct sysent));
+
+		break;
+
+	case LKM_E_STAT:	/* no special handling... */
+		break;
+	}
+
+	return(err);
+}
+
+/*
+ * For the loadable virtual file system described by the structure pointed
+ * to by lkmtp, load/unload/stat it depending on the cmd requested.
+ */
+static int
+_lkm_vfs(lkmtp, cmd)
+	struct lkm_table *lkmtp;
+	int cmd;
+{
+	struct lkm_vfs *args = lkmtp->private.lkm_vfs;
+	int i;
+	int err = 0;
+
+#if 0
+	switch(cmd) {
+	case LKM_E_LOAD:
+		/* don't load twice! */
+		if (lkmexists(lkmtp))
+			return(EEXIST);
+
+		/* make sure there's no VFS in the table with this name */
+		for (i = 0; i < nvfssw; i++)
+			if (vfssw[i] != (struct vfsops *)0 &&
+			    strncmp(vfssw[i]->vfs_name,
+			    args->lkm_vfsops->vfs_name, MFSNAMELEN) == 0)
+				return (EEXIST);
+
+		/* pick the last available empty slot */
+		for (i = nvfssw - 1; i >= 0; i--)
+			if (vfssw[i] == (struct vfsops *)0)
+				break;
+		if (i == -1) {		/* or if none, punt */
+			err = EINVAL;
+			break;
+		}
+
+		/*
+		 * Set up file system
+		 */
+		vfssw[i] = args->lkm_vfsops;
+
+		/*
+		 * Call init function for this VFS...
+		 */
+	 	(*(vfssw[i]->vfs_init))();
+
+		/* done! */
+		args->lkm_offset = i;	/* slot in vfssw[] */
+		break;
+
+	case LKM_E_UNLOAD:
+#ifdef notyet
+		/* current slot... */
+		i = args->lkm_offset;
+
+		/* replace current slot contents with old contents */
+		vfssw[i] = (struct vfsops *)0;
+#else
+		/* it's not safe to remove a vfs */
+		err = EBUSY;
+#endif
+		break;
+
+	case LKM_E_STAT:	/* no special handling... */
+		break;
+	}
+#else
+	err = EINVAL;
+#endif
+	return(err);
+}
+
+/*
+ * For the loadable device driver described by the structure pointed to
+ * by lkmtp, load/unload/stat it depending on the cmd requested.
+ */
+static int
+_lkm_dev(lkmtp, cmd)
+	struct lkm_table *lkmtp;
+	int cmd;
+{
+	struct lkm_dev *args = lkmtp->private.lkm_dev;
+	int i;
+	int err = 0;
+	extern int nblkdev, nchrdev;	/* from conf.c */
+
+	switch(cmd) {
+	case LKM_E_LOAD:
+		/* don't load twice! */
+		if (lkmexists(lkmtp))
+			return(EEXIST);
+		switch(args->lkm_devtype) {
+		case LM_DT_BLOCK:
+			if ((i = args->lkm_offset) == -1) {	/* auto */
+				/*
+				 * Search the table looking for a slot...
+				 */
+				for (i = 0; i < nblkdev; i++)
+					if (bdevsw[i].d_open == lkmenodev)
+						break;		/* found it! */
+				/* out of allocable slots? */
+				if (i == nblkdev) {
+					err = ENFILE;
+					break;
+				}
+			} else {				/* assign */
+				if (i < 0 || i >= nblkdev) {
+					err = EINVAL;
+					break;
+				}
+			}
+
+			/* save old */
+			bcopy(&bdevsw[i], &(args->lkm_olddev.bdev), sizeof(struct bdevsw));
+
+			/* replace with new */
+			bcopy(args->lkm_dev.bdev, &bdevsw[i], sizeof(struct bdevsw));
+
+			/* done! */
+			args->lkm_offset = i;	/* slot in bdevsw[] */
+			break;
+
+		case LM_DT_CHAR:
+			if ((i = args->lkm_offset) == -1) {	/* auto */
+				/*
+				 * Search the table looking for a slot...
+				 */
+				for (i = 0; i < nchrdev; i++)
+					if (cdevsw[i].d_open == lkmenodev)
+						break;		/* found it! */
+				/* out of allocable slots? */
+				if (i == nchrdev) {
+					err = ENFILE;
+					break;
+				}
+			} else {				/* assign */
+				if (i < 0 || i >= nchrdev) {
+					err = EINVAL;
+					break;
+				}
+			}
+
+			/* save old */
+			bcopy(&cdevsw[i], &(args->lkm_olddev.cdev), sizeof(struct cdevsw));
+
+			/* replace with new */
+			bcopy(args->lkm_dev.cdev, &cdevsw[i], sizeof(struct cdevsw));
+
+			/* done! */
+			args->lkm_offset = i;	/* slot in cdevsw[] */
+
+			break;
+
+		default:
+			err = ENODEV;
+			break;
+		}
+		break;
+
+	case LKM_E_UNLOAD:
+		/* current slot... */
+		i = args->lkm_offset;
+
+		switch(args->lkm_devtype) {
+		case LM_DT_BLOCK:
+			/* replace current slot contents with old contents */
+			bcopy(&(args->lkm_olddev.bdev), &bdevsw[i], sizeof(struct bdevsw));
+			break;
+
+		case LM_DT_CHAR:
+			/* replace current slot contents with old contents */
+			bcopy(&(args->lkm_olddev.cdev), &cdevsw[i], sizeof(struct cdevsw));
+			break;
+
+		default:
+			err = ENODEV;
+			break;
+		}
+		break;
+
+	case LKM_E_STAT:	/* no special handling... */
+		break;
+	}
+
+	return(err);
+}
+
+#ifdef STREAMS
+/*
+ * For the loadable streams module described by the structure pointed to
+ * by lkmtp, load/unload/stat it depending on the cmd requested.
+ */
+static int
+_lkm_strmod(lkmtp, cmd)
+	struct lkm_table *lkmtp;
+	int cmd;
+{
+	struct lkm_strmod *args = lkmtp->private.lkm_strmod;
+	int i;
+	int err = 0;
+
+	switch(cmd) {
+	case LKM_E_LOAD:
+		/* don't load twice! */
+		if (lkmexists(lkmtp))
+			return(EEXIST);
+		break;
+
+	case LKM_E_UNLOAD:
+		break;
+
+	case LKM_E_STAT:	/* no special handling... */
+		break;
+	}
+
+	return(err);
+}
+#endif	/* STREAMS */
+
+/*
+ * For the loadable execution class described by the structure pointed to
+ * by lkmtp, load/unload/stat it depending on the cmd requested.
+ */
+static int
+_lkm_exec(lkmtp, cmd)
+	struct lkm_table *lkmtp;
+	int cmd;
+{
+	struct lkm_exec *args = lkmtp->private.lkm_exec;
+	int i;
+	int err = 0;
+
+#if 0
+	switch(cmd) {
+	case LKM_E_LOAD:
+		/* don't load twice! */
+		if (lkmexists(lkmtp))
+			return(EEXIST);
+		if ((i = args->lkm_offset) == -1) {	/* auto */
+			/*
+			 * Search the table looking for a slot...
+			 */
+			for (i = 0; i < nexecs; i++)
+				if (execsw[i].es_check == NULL)
+					break;		/* found it! */
+			/* out of allocable slots? */
+			if (i == nexecs) {
+				err = ENFILE;
+				break;
+			}
+		} else {				/* assign */
+			if (i < 0 || i >= nexecs) {
+				err = EINVAL;
+				break;
+			}
+		}
+
+		/* save old */
+		bcopy(&execsw[i], &(args->lkm_oldexec), sizeof(struct execsw));
+
+		/* replace with new */
+		bcopy(args->lkm_exec, &execsw[i], sizeof(struct execsw));
+
+		/* realize need to recompute max header size */
+		exec_maxhdrsz = 0;
+
+		/* done! */
+		args->lkm_offset = i;	/* slot in execsw[] */
+
+		break;
+
+	case LKM_E_UNLOAD:
+		/* current slot... */
+		i = args->lkm_offset;
+
+		/* replace current slot contents with old contents */
+		bcopy(&(args->lkm_oldexec), &execsw[i], sizeof(struct execsw));
+
+		/* realize need to recompute max header size */
+		exec_maxhdrsz = 0;
+
+		break;
+
+	case LKM_E_STAT:	/* no special handling... */
+		break;
+	}
+#else
+	err = EINVAL;
+#endif
+	return(err);
+}
+
+/*
+ * This code handles the per-module type "wiring-in" of loadable modules
+ * into existing kernel tables.  For "LM_MISC" modules, wiring and unwiring
+ * is assumed to be done in their entry routines internal to the module
+ * itself.
+ */
+int
+lkmdispatch(lkmtp, cmd)
+	struct lkm_table *lkmtp;	
+	int cmd;
+{
+	int err = 0;		/* default = success */
+
+	switch(lkmtp->private.lkm_any->lkm_type) {
+	case LM_SYSCALL:
+		err = _lkm_syscall(lkmtp, cmd);
+		break;
+
+	case LM_VFS:
+		err = _lkm_vfs(lkmtp, cmd);
+		break;
+
+	case LM_DEV:
+		err = _lkm_dev(lkmtp, cmd);
+		break;
+
+#ifdef STREAMS
+	case LM_STRMOD:
+	    {
+		struct lkm_strmod *args = lkmtp->private.lkm_strmod;
+	    }
+		break;
+
+#endif	/* STREAMS */
+
+	case LM_EXEC:
+		err = _lkm_exec(lkmtp, cmd);
+		break;
+
+	case LM_MISC:	/* ignore content -- no "misc-specific" procedure */
+		break;
+
+	default:
+		err = ENXIO;	/* unknown type */
+		break;
+	}
+
+	return(err);
+}
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index bafd07e..fcd0584 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -1,6 +1,6 @@
 #! /bin/sh -
 #	@(#)makesyscalls.sh	8.1 (Berkeley) 6/10/93
-# $Id$
+# $Id: makesyscalls.sh,v 1.2 1994/08/02 07:42:24 davidg Exp $
 
 set -e
 
@@ -101,14 +101,15 @@ awk < $1 "
 		if (NF < 5)
 			$5 = $4
 	}
-	$2 == "STD" {
+	$2 == "STD" || $2 == "NODEF" {
 		printf("int\t%s();\n", $4) > sysdcl
 		printf("\t{ %d, %s },\t\t\t/* %d = %s */\n", \
 		    $3, $4, syscall, $5) > sysent
 		printf("\t\"%s\",\t\t\t/* %d = %s */\n", \
 		    $5, syscall, $5) > sysnames
-		printf("#define\tSYS_%s\t%d\n", \
-		    $5, syscall) > syshdr
+		if ($2 == "STD")
+			printf("#define\tSYS_%s\t%d\n", \
+		    	    $5, syscall) > syshdr
 		syscall++
 		next
 	}
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 339b997..1d55538 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
+ * created from	$Id: syscalls.master,v 1.3 1994/08/02 07:42:44 davidg Exp $
  */
 
 char *syscallnames[] = {
@@ -247,5 +247,27 @@ char *syscallnames[] = {
 	"#207",			/* 207 = nosys */
 	"#208",			/* 208 = nosys */
 	"#209",			/* 209 = nosys */
+#ifdef LKM
+	"lkmnosys",			/* 210 = lkmnosys */
+	"lkmnosys",			/* 211 = lkmnosys */
+	"lkmnosys",			/* 212 = lkmnosys */
+	"lkmnosys",			/* 213 = lkmnosys */
+	"lkmnosys",			/* 214 = lkmnosys */
+	"lkmnosys",			/* 215 = lkmnosys */
+	"lkmnosys",			/* 216 = lkmnosys */
+	"lkmnosys",			/* 217 = lkmnosys */
+	"lkmnosys",			/* 218 = lkmnosys */
+	"lkmnosys",			/* 219 = lkmnosys */
+#else
 	"#210",			/* 210 = nosys */
+	"#211",			/* 211 = nosys */
+	"#212",			/* 212 = nosys */
+	"#213",			/* 213 = nosys */
+	"#214",			/* 214 = nosys */
+	"#215",			/* 215 = nosys */
+	"#216",			/* 216 = nosys */
+	"#217",			/* 217 = nosys */
+	"#218",			/* 218 = nosys */
+	"#219",			/* 219 = nosys */
+#endif
 };
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 0b4574b..0db6dc6 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-	$Id$
+	$Id: syscalls.master,v 1.3 1994/08/02 07:42:44 davidg Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;
 ; System call name/number master file.
@@ -275,4 +275,30 @@
 207	UNIMPL	0 nosys
 208	UNIMPL	0 nosys
 209	UNIMPL	0 nosys
+
+;
+; The following are reserved for loadable syscalls
+;
+#ifdef LKM
+210	NODEF	0 lkmnosys
+211	NODEF	0 lkmnosys
+212	NODEF	0 lkmnosys
+213	NODEF	0 lkmnosys
+214	NODEF	0 lkmnosys
+215	NODEF	0 lkmnosys
+216	NODEF	0 lkmnosys
+217	NODEF	0 lkmnosys
+218	NODEF	0 lkmnosys
+219	NODEF	0 lkmnosys
+#else
 210	UNIMPL	0 nosys
+211	UNIMPL	0 nosys
+212	UNIMPL	0 nosys
+213	UNIMPL	0 nosys
+214	UNIMPL	0 nosys
+215	UNIMPL	0 nosys
+216	UNIMPL	0 nosys
+217	UNIMPL	0 nosys
+218	UNIMPL	0 nosys
+219	UNIMPL	0 nosys
+#endif
diff --git a/sys/sys/exec.h b/sys/sys/exec.h
index 93f1c9d..f9e9555 100644
--- a/sys/sys/exec.h
+++ b/sys/sys/exec.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)exec.h	8.3 (Berkeley) 1/21/94
- * $Id$
+ * $Id: exec.h,v 1.3 1994/08/02 07:52:55 davidg Exp $
  */
 
 #include <machine/exec.h>
@@ -70,3 +70,16 @@ struct execve_args {
 	char	**argv;
 	char	**envv;
 };
+
+struct execsw {
+	int (*ex_imgact)(void * /* struct image_params * */);
+	const char *ex_name;
+};
+
+#ifdef KERNEL
+extern const struct execsw **execsw;
+
+extern int exec_extract_strings(void * /* struct image_params * */);
+extern int exec_new_vmspace(void * /* struct image_params * */);
+#endif
+
diff --git a/sys/sys/imgact.h b/sys/sys/imgact.h
index 3517e80..9e272fa 100644
--- a/sys/sys/imgact.h
+++ b/sys/sys/imgact.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: imgact.h,v 1.4 1994/08/13 03:50:34 wollman Exp $
+ *	$Id: imgact.h,v 1.5 1994/08/18 22:35:43 wollman Exp $
  */
 
 #ifndef __h_imgact
@@ -56,16 +56,4 @@ struct image_params {
 	char interpreter_name[64]; /* name of the interpreter */
 };
 
-struct execsw {
-	int (*ex_imgact)(struct image_params *);
-	const char *ex_name;
-};
-
-#ifdef KERNEL
-extern const struct execsw **execsw;
-
-extern int exec_extract_strings(struct image_params *);
-extern int exec_new_vmspace(struct image_params *);
-#endif
-
 #endif /* __h_imgact */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 98e85dd..58f6c72 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
+ * created from	$Id: syscalls.master,v 1.3 1994/08/02 07:42:44 davidg Exp $
  */
 
 #define	SYS_syscall	0