Index: head/sys/dev/vinum/vinum.c =================================================================== --- head/sys/dev/vinum/vinum.c (revision 44399) +++ head/sys/dev/vinum/vinum.c (revision 44400) @@ -1,510 +1,451 @@ /*- * Copyright (c) 1997, 1998 * Nan Yang Computer Services Limited. All rights reserved. * * This software is distributed under the so-called ``Berkeley * License'': * * 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 Nan Yang Computer * Services Limited. * 4. Neither the name of the Company nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * This software is provided ``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 company 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. * * $Id: vinum.c,v 1.23 1999/01/15 05:03:15 grog Exp grog $ */ -#define STATIC /* nothing while we're testing XXX */ +#define STATIC static /* nothing while we're testing XXX */ #define REALLYKERNEL #include "opt_vinum.h" #include #include /* for sync(2) */ #ifdef VINUMDEBUG #include int debug = 0; #endif #include STATIC struct cdevsw vinum_cdevsw = { vinumopen, vinumclose, vinumread, vinumwrite, vinumioctl, nostop, nullreset, nodevtotty, seltrue, nommap, vinumstrategy, "vinum", NULL, -1, vinumdump, vinumsize, D_DISK, 0, -1 }; /* Called by main() during pseudo-device attachment. */ STATIC void vinumattach(void *); -STATIC void vinumgetdisklabel(dev_t); -int vinum_inactive(void); -void free_vinum(int); - #ifndef ACTUALLY_LKM_NOT_KERNEL STATIC int vinum_modevent(module_t mod, modeventtype_t type, void *unused); #endif /* Why aren't these declared anywhere? XXX */ int setjmp(jmp_buf); void longjmp(jmp_buf, int); extern jmp_buf command_fail; /* return here if config fails */ struct _vinum_conf vinum_conf; /* configuration information */ -STATIC int vinum_devsw_installed = 0; - /* * Called by main() during pseudo-device attachment. All we need * to do is allocate enough space for devices to be configured later, and * add devsw entries. */ void vinumattach(void *dummy) { char *buf; /* pointer to temporary buffer */ struct _ioctl_reply *ioctl_reply; /* struct to return */ struct uio uio; struct iovec iovec; /* modload should prevent multiple loads, so this is worth a panic */ if ((vinum_conf.flags & VF_LOADED) != NULL) panic("vinum: already loaded"); - printf("vinum: loaded\n"); + log(LOG_INFO, "vinum: loaded\n"); vinum_conf.flags |= VF_LOADED; /* we're loaded now */ daemonq = NULL; /* initialize daemon's work queue */ dqend = NULL; cdevsw_add_generic(BDEV_MAJOR, CDEV_MAJOR, &vinum_cdevsw); #ifdef DEVFS #error DEVFS not finished yet #endif uio.uio_iov = &iovec; uio.uio_iovcnt = 1; /* just one buffer */ uio.uio_offset = 0; /* start at the beginning */ uio.uio_resid = 512; /* one sector */ uio.uio_segflg = UIO_SYSSPACE; /* we're in system space */ uio.uio_rw = UIO_READ; /* do we need this? */ uio.uio_procp = curproc; /* do it for our own process */ iovec.iov_len = 512; buf = (char *) Malloc(iovec.iov_len); /* get a buffer */ CHECKALLOC(buf, "vinum: no memory\n"); /* can't get 512 bytes? */ iovec.iov_base = buf; /* read into buf */ /* allocate space: drives... */ DRIVE = (struct drive *) Malloc(sizeof(struct drive) * INITIAL_DRIVES); CHECKALLOC(DRIVE, "vinum: no memory\n"); + bzero(DRIVE, sizeof(struct drive) * INITIAL_DRIVES); vinum_conf.drives_allocated = INITIAL_DRIVES; /* number of drive slots allocated */ vinum_conf.drives_used = 0; /* and number in use */ /* volumes, ... */ VOL = (struct volume *) Malloc(sizeof(struct volume) * INITIAL_VOLUMES); CHECKALLOC(VOL, "vinum: no memory\n"); + bzero(VOL, sizeof(struct volume) * INITIAL_VOLUMES); vinum_conf.volumes_allocated = INITIAL_VOLUMES; /* number of volume slots allocated */ vinum_conf.volumes_used = 0; /* and number in use */ /* plexes, ... */ PLEX = (struct plex *) Malloc(sizeof(struct plex) * INITIAL_PLEXES); CHECKALLOC(PLEX, "vinum: no memory\n"); + bzero(PLEX, sizeof(struct plex) * INITIAL_PLEXES); vinum_conf.plexes_allocated = INITIAL_PLEXES; /* number of plex slots allocated */ vinum_conf.plexes_used = 0; /* and number in use */ /* and subdisks */ SD = (struct sd *) Malloc(sizeof(struct sd) * INITIAL_SUBDISKS); CHECKALLOC(SD, "vinum: no memory\n"); + bzero(SD, sizeof(struct sd) * INITIAL_SUBDISKS); vinum_conf.subdisks_allocated = INITIAL_SUBDISKS; /* number of sd slots allocated */ vinum_conf.subdisks_used = 0; /* and number in use */ ioctl_reply = NULL; /* no reply on longjmp */ } /* * Check if we have anything open. If so, return 0 (not inactive), * otherwise 1 (inactive) */ int vinum_inactive(void) { int i; int can_do = 1; /* assume we can do it */ + if (vinum_conf.flags & VF_OPEN) /* open by vinum(8)? */ + return 0; /* can't do it while we're open */ lock_config(); for (i = 0; i < vinum_conf.volumes_used; i++) { - if (VOL[i].opencount != 0) { /* volume is open */ + if ((VOL[i].flags & VF_OPEN)) { /* volume is open */ can_do = 0; break; } } unlock_config(); return can_do; } /* * Free all structures. * If cleardrive is 0, save the configuration; otherwise * remove the configuration from the drive. * * Before coming here, ensure that no volumes are open. */ void free_vinum(int cleardrive) { int i; if (cleardrive) { for (i = 0; i < vinum_conf.drives_used; i++) remove_drive(i); /* remove the drive */ } else { /* keep the config */ - save_config(); if (DRIVE != NULL) { for (i = 0; i < vinum_conf.drives_used; i++) free_drive(&DRIVE[i]); /* close files and things */ Free(DRIVE); } } - queue_daemon_request(daemonrq_return, NULL); /* tell daemon to stop */ + while ((vinum_conf.flags & (VF_STOPPING | VF_DAEMONOPEN)) + == (VF_STOPPING | VF_DAEMONOPEN)) { /* at least one daemon open, we're stopping */ + queue_daemon_request(daemonrq_return, NULL); /* stop the daemon */ + tsleep(&vinumclose, PUSER, "vstop", 0); /* and wait for it */ + } if (SD != NULL) Free(SD); if (PLEX != NULL) { for (i = 0; i < vinum_conf.plexes_used; i++) { struct plex *plex = &vinum_conf.plex[i]; if (plex->state != plex_unallocated) { /* we have real data there */ if (plex->sdnos) Free(plex->sdnos); } } Free(PLEX); } if (VOL != NULL) Free(VOL); bzero(&vinum_conf, sizeof(vinum_conf)); - while ((daemon_options & daemon_stopped) == 0) /* daemon hasn't stopped yet, */ - tsleep(&vinum_daemon, PRIBIO, "vdaemn", 10 * hz); /* wait for it to stop */ - tsleep(&vinum_daemon, PRIBIO, "diedie", 3 * hz); /* and wait another 3 secs XXX */ } -#ifdef ACTUALLY_LKM_NOT_KERNEL /* stuff for LKMs */ - -MOD_MISC(vinum); - -/* - * Function called when loading the driver. - */ - STATIC int -vinum_load(struct lkm_table *lkmtp, int cmd) -{ - vinumattach(NULL); - return 0; /* OK */ -} - -/* - * Function called when unloading the driver. - */ -STATIC int -vinum_unload(struct lkm_table *lkmtp, int cmd) -{ - if (vinum_inactive()) { /* is anything open? */ - struct sync_args dummyarg = - {0}; - - printf("vinum: unloaded\n"); - sync(curproc, &dummyarg); /* write out buffers */ - free_vinum(0); /* no: clean up */ - cdevsw[CDEV_MAJOR] = NULL; /* and cdevsw */ - return 0; - } else - return EBUSY; -} - -/* - * Dispatcher function for the module (load/unload/stat). - */ -int -vinum_mod(struct lkm_table *lkmtp, int cmd, int ver) -{ - MOD_DISPATCH(vinum, /* module name */ - lkmtp, /* LKM table */ - cmd, /* command */ - ver, - vinum_load, /* load with this function */ - vinum_unload, /* and unload with this */ - lkm_nullcmd); -} - -#else /* not LKM */ - -STATIC int vinum_modevent(module_t mod, modeventtype_t type, void *unused) { struct sync_args dummyarg = {0}; switch (type) { case MOD_LOAD: vinumattach(NULL); return 0; /* OK */ case MOD_UNLOAD: if (!vinum_inactive()) /* is anything open? */ - return EBUSY; + return EBUSY; /* yes, we can't do it */ + vinum_conf.flags |= VF_STOPPING; /* note that we want to stop */ sync(curproc, &dummyarg); /* write out buffers */ - free_vinum(0); /* no: clean up */ - cdevsw[CDEV_MAJOR] = NULL; /* and cdevsw */ + free_vinum(0); /* clean up */ + cdevsw[CDEV_MAJOR] = NULL; /* no cdevsw any more */ + log(LOG_INFO, "vinum: unloaded\n"); /* tell the world */ return 0; default: break; } return 0; } moduledata_t vinum_mod = { "vinum", vinum_modevent, 0 }; DECLARE_MODULE(vinum, vinum_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE); -#endif /* LKM */ - /* ARGSUSED */ /* * Open a vinum object * At the moment, we only open volumes and the * super device. It's a nice concept to be * able to open drives, subdisks and plexes, but * I can't think what good it could be */ int vinumopen(dev_t dev, int flags, int fmt, struct proc *p) { - int s; /* spl */ int error; unsigned int index; struct volume *vol; struct plex *plex; struct sd *sd; struct devcode *device; device = (struct devcode *) &dev; error = 0; /* First, decide what we're looking at */ switch (device->type) { case VINUM_VOLUME_TYPE: index = Volno(dev); if (index >= vinum_conf.volumes_used) return ENXIO; /* no such device */ vol = &VOL[index]; switch (vol->state) { case volume_unallocated: case volume_uninit: return ENXIO; case volume_up: - vol->opencount = 1; - vol->pid = p->p_pid; /* and say who we are (do we need this? XXX) */ + vol->flags |= VF_OPEN; /* note we're open */ return 0; case volume_down: return EIO; default: return EINVAL; } case VINUM_PLEX_TYPE: if (Volno(dev) >= vinum_conf.volumes_used) return ENXIO; index = Plexno(dev); /* get plex index in vinum_conf */ if (index >= vinum_conf.plexes_used) return ENXIO; /* no such device */ plex = &PLEX[index]; switch (plex->state) { case plex_unallocated: return EINVAL; default: - s = splhigh(); - if (plex->pid /* it's open already */ - && (plex->pid != p->p_pid)) { /* and not by us, */ - splx(s); - return EBUSY; /* one at a time, please */ - } - plex->pid = p->p_pid; /* and say who we are (do we need this? XXX) */ - splx(s); + plex->flags |= VF_OPEN; /* note we're open */ return 0; } case VINUM_SD_TYPE: if ((Volno(dev) >= vinum_conf.volumes_used) || /* no such volume */ (Plexno(dev) >= vinum_conf.plexes_used)) /* or no such plex */ return ENXIO; /* no such device */ index = Sdno(dev); /* get the subdisk number */ if (index >= vinum_conf.subdisks_used) return ENXIO; /* no such device */ sd = &SD[index]; /* * Opening a subdisk is always a special operation, so we * ignore the state as long as it represents a real subdisk */ switch (sd->state) { case sd_unallocated: case sd_uninit: return EINVAL; default: - s = splhigh(); - if (sd->pid /* it's open already */ - && (sd->pid != p->p_pid)) { /* and not by us, */ - splx(s); - return EBUSY; /* one at a time, please */ - } - sd->pid = p->p_pid; /* and say who we are (do we need this? XXX) */ - splx(s); + sd->flags |= VF_OPEN; /* note we're open */ return 0; } + /* Vinum drives are disks. We already have a disk + * driver, so don't handle them here */ case VINUM_DRIVE_TYPE: default: return ENODEV; /* don't know what to do with these */ case VINUM_SUPERDEV_TYPE: error = suser(p->p_ucred, &p->p_acflag); /* are we root? */ - if (error == 0) /* yes, can do */ - vinum_conf.opencount = 1; /* we're open */ + if (error == 0) { /* yes, can do */ + if (Volno(dev) == 1) /* daemon device */ + vinum_conf.flags |= VF_DAEMONOPEN; /* we're open */ + else + vinum_conf.flags |= VF_OPEN; /* we're open */ + } return error; + } } /* ARGSUSED */ int vinumclose(dev_t dev, int flags, int fmt, struct proc *p) { unsigned int index; struct volume *vol; - struct plex *plex; - struct sd *sd; struct devcode *device = (struct devcode *) &dev; index = Volno(dev); /* First, decide what we're looking at */ switch (device->type) { case VINUM_VOLUME_TYPE: if (index >= vinum_conf.volumes_used) return ENXIO; /* no such device */ vol = &VOL[index]; switch (vol->state) { case volume_unallocated: case volume_uninit: return ENXIO; case volume_up: - vol->opencount = 0; /* reset our flags */ - vol->pid = NULL; /* and forget who owned us */ + vol->flags &= ~VF_OPEN; /* reset our flags */ return 0; case volume_down: return EIO; default: return EINVAL; } case VINUM_PLEX_TYPE: if (Volno(dev) >= vinum_conf.volumes_used) return ENXIO; index = Plexno(dev); /* get plex index in vinum_conf */ if (index >= vinum_conf.plexes_used) return ENXIO; /* no such device */ - plex = &PLEX[index]; - plex->pid = 0; + PLEX[index].flags &= ~VF_OPEN; /* reset our flags */ return 0; case VINUM_SD_TYPE: if ((Volno(dev) >= vinum_conf.volumes_used) || /* no such volume */ (Plexno(dev) >= vinum_conf.plexes_used)) /* or no such plex */ return ENXIO; /* no such device */ index = Sdno(dev); /* get the subdisk number */ if (index >= vinum_conf.subdisks_used) return ENXIO; /* no such device */ - sd = &SD[index]; - sd->pid = 0; + SD[index].flags &= ~VF_OPEN; /* reset our flags */ return 0; case VINUM_SUPERDEV_TYPE: /* * don't worry about whether we're root: * nobody else would get this far. */ - vinum_conf.opencount = 0; /* no longer open */ - return 0; /* no worries closing super dev */ + if (Volno(dev) == 0) /* normal superdev */ + vinum_conf.flags &= ~VF_OPEN; /* no longer open */ + else { + vinum_conf.flags &= ~VF_DAEMONOPEN; /* no longer open */ + if (vinum_conf.flags & VF_STOPPING) /* we're stopping, */ + wakeup(&vinumclose); /* we can continue stopping now */ + } + return 0; case VINUM_DRIVE_TYPE: default: return ENODEV; /* don't know what to do with these */ } } /* size routine */ int vinumsize(dev_t dev) { struct volume *vol; int size; vol = &VOL[Volno(dev)]; if (vol->state == volume_up) size = vol->size; else return 0; /* err on the size of conservatism */ return size; } int vinumdump(dev_t dev) { /* Not implemented. */ return ENXIO; }