Index: head/sys/geom/geom_dev.c =================================================================== --- head/sys/geom/geom_dev.c (revision 104451) +++ head/sys/geom/geom_dev.c (revision 104452) @@ -1,417 +1,421 @@ /*- * Copyright (c) 2002 Poul-Henning Kamp * Copyright (c) 2002 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by Poul-Henning Kamp * and NAI Labs, the Security Research Division of Network Associates, Inc. * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the * DARPA CHATS research program. * * 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. The names of the authors may not be used to endorse or promote * products derived from this software without specific prior written * permission. * * 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. * * $FreeBSD$ */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #define CDEV_MAJOR 4 static d_open_t g_dev_open; static d_close_t g_dev_close; static d_strategy_t g_dev_strategy; static d_ioctl_t g_dev_ioctl; static d_psize_t g_dev_psize; static struct cdevsw g_dev_cdevsw = { /* open */ g_dev_open, /* close */ g_dev_close, /* read */ physread, /* write */ physwrite, /* ioctl */ g_dev_ioctl, /* poll */ nopoll, /* mmap */ nommap, /* strategy */ g_dev_strategy, /* name */ "g_dev", /* maj */ CDEV_MAJOR, /* dump */ nodump, /* psize */ g_dev_psize, /* flags */ D_DISK | D_CANFREE | D_TRACKCLOSE, /* kqfilter */ nokqfilter }; static g_taste_t g_dev_taste; static g_orphan_t g_dev_orphan; static struct g_class g_dev_class = { "DEV", g_dev_taste, NULL, G_CLASS_INITIALIZER }; static void g_dev_clone(void *arg __unused, char *name, int namelen __unused, dev_t *dev) { struct g_geom *gp; if (*dev != NODEV) return; g_trace(G_T_TOPOLOGY, "g_dev_clone(%s)", name); g_waitidle(); /* XXX: can I drop Giant here ??? */ /* g_topology_lock(); */ LIST_FOREACH(gp, &g_dev_class.geom, geom) { if (strcmp(gp->name, name)) continue; *dev = gp->softc; g_trace(G_T_TOPOLOGY, "g_dev_clone(%s) = %p", name, *dev); return; } /* g_topology_unlock(); */ return; } static void g_dev_register_cloner(void *foo __unused) { static int once; /* XXX: why would this happen more than once ?? */ if (!once) { EVENTHANDLER_REGISTER(dev_clone, g_dev_clone, 0, 1000); once++; } } SYSINIT(geomdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE,g_dev_register_cloner,NULL); static struct g_geom * g_dev_taste(struct g_class *mp, struct g_provider *pp, int insist __unused) { struct g_geom *gp; struct g_consumer *cp; static int unit; int error; dev_t dev; g_trace(G_T_TOPOLOGY, "dev_taste(%s,%s)", mp->name, pp->name); g_topology_assert(); LIST_FOREACH(cp, &pp->consumers, consumers) if (cp->geom->class == mp) return (NULL); gp = g_new_geomf(mp, pp->name); gp->orphan = g_dev_orphan; cp = g_new_consumer(gp); error = g_attach(cp, pp); KASSERT(error == 0, ("g_dev_taste(%s) failed to g_attach, err=%d", pp->name, error)); /* * XXX: I'm not 100% sure we can call make_dev(9) without Giant * yet. Once we can, we don't need to drop topology here either. */ g_topology_unlock(); mtx_lock(&Giant); dev = make_dev(&g_dev_cdevsw, unit2minor(unit++), UID_ROOT, GID_OPERATOR, 0640, gp->name); mtx_unlock(&Giant); g_topology_lock(); gp->softc = dev; dev->si_drv1 = gp; dev->si_drv2 = cp; return (gp); } static int g_dev_open(dev_t dev, int flags, int fmt, struct thread *td) { struct g_geom *gp; struct g_consumer *cp; int error, r, w, e; gp = dev->si_drv1; cp = dev->si_drv2; if (gp == NULL || cp == NULL) return(ENXIO); g_trace(G_T_ACCESS, "g_dev_open(%s, %d, %d, %p)", gp->name, flags, fmt, td); DROP_GIANT(); g_topology_lock(); g_silence(); r = flags & FREAD ? 1 : 0; w = flags & FWRITE ? 1 : 0; #ifdef notyet e = flags & O_EXCL ? 1 : 0; #else e = 0; #endif error = g_access_rel(cp, r, w, e); g_topology_unlock(); PICKUP_GIANT(); g_waitidle(); return(error); } static int g_dev_close(dev_t dev, int flags, int fmt, struct thread *td) { struct g_geom *gp; struct g_consumer *cp; int error, r, w, e; gp = dev->si_drv1; cp = dev->si_drv2; if (gp == NULL || cp == NULL) return(ENXIO); g_trace(G_T_ACCESS, "g_dev_close(%s, %d, %d, %p)", gp->name, flags, fmt, td); DROP_GIANT(); g_topology_lock(); g_silence(); r = flags & FREAD ? -1 : 0; w = flags & FWRITE ? -1 : 0; #ifdef notyet e = flags & O_EXCL ? -1 : 0; #else e = 0; #endif error = g_access_rel(cp, r, w, e); g_topology_unlock(); PICKUP_GIANT(); g_waitidle(); return (error); } static int g_dev_ioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct thread *td) { struct g_geom *gp, *gp2; struct g_consumer *cp; struct g_provider *pp2; struct g_kerneldump kd; int i, error; u_int u; struct g_ioctl *gio; +#if 0 struct sbuf *usb, *sb; +#endif gp = dev->si_drv1; cp = dev->si_drv2; pp2 = cp->provider; gp2 = pp2->geom; error = 0; DROP_GIANT(); i = IOCPARM_LEN(cmd); switch (cmd) { case DIOCGSECTORSIZE: error = g_io_getattr("GEOM::sectorsize", cp, &i, data); break; case DIOCGMEDIASIZE: error = g_io_getattr("GEOM::mediasize", cp, &i, data); break; case DIOCGFWSECTORS: error = g_io_getattr("GEOM::fwsectors", cp, &i, data); break; case DIOCGFWHEADS: error = g_io_getattr("GEOM::fwheads", cp, &i, data); break; case DIOCGFRONTSTUFF: error = g_io_getattr("GEOM::frontstuff", cp, &i, data); break; case DIOCSKERNELDUMP: u = *((u_int *)data); if (!u) { set_dumper(NULL); error = 0; break; } kd.offset = 0; kd.length = OFF_MAX; i = sizeof kd; error = g_io_getattr("GEOM::kerneldump", cp, &i, &kd); if (!error) dev->si_flags |= SI_DUMPDEV; break; +#if 0 case GEOMGETCONF: /* we bogusly pass cp to avoid getting any consumers listed */ sb = g_conf_specific(gp2->class, gp2, pp2, cp); usb = (struct sbuf *)data; if (usb->s_size - 1 < sbuf_len(sb)) error = ENOMEM; else error = copyout(sbuf_data(sb), usb->s_buf, sbuf_len(sb) + 1); if (!error) usb->s_len = sbuf_len(sb); break; +#endif default: gio = g_malloc(sizeof *gio, M_WAITOK); gio->cmd = cmd; gio->data = data; gio->fflag = fflag; gio->td = td; i = sizeof *gio; if (cmd & IOC_IN) error = g_io_setattr("GEOM::ioctl", cp, i, gio); else error = g_io_getattr("GEOM::ioctl", cp, &i, gio); g_free(gio); break; } PICKUP_GIANT(); g_waitidle(); if (error == ENOIOCTL) { if (g_debugflags & G_T_TOPOLOGY) { i = IOCGROUP(cmd); printf("IOCTL(0x%lx) \"%s\"", cmd, gp->name); if (i > ' ' && i <= '~') printf(" '%c'", (int)IOCGROUP(cmd)); else printf(" 0x%lx", IOCGROUP(cmd)); printf("/%ld ", cmd & 0xff); if (cmd & IOC_IN) printf("I"); if (cmd & IOC_OUT) printf("O"); printf("(%ld) = ENOIOCTL\n", IOCPARM_LEN(cmd)); } error = ENOTTY; } return (error); } static int g_dev_psize(dev_t dev) { struct g_consumer *cp; int i, error; off_t mediasize; cp = dev->si_drv2; i = sizeof mediasize; error = g_io_getattr("GEOM::mediasize", cp, &i, &mediasize); if (error) return (-1); return (mediasize >> DEV_BSHIFT); } static void g_dev_done(struct bio *bp2) { struct bio *bp; bp = bp2->bio_linkage; bp->bio_error = bp2->bio_error; if (bp->bio_error != 0) { g_trace(G_T_BIO, "g_dev_done(%p) had error %d", bp2, bp->bio_error); bp->bio_flags |= BIO_ERROR; } else { g_trace(G_T_BIO, "g_dev_done(%p/%p) resid %ld completed %lld", bp2, bp, bp->bio_resid, bp2->bio_completed); } bp->bio_resid = bp->bio_bcount - bp2->bio_completed; g_destroy_bio(bp2); mtx_lock(&Giant); biodone(bp); mtx_unlock(&Giant); } static void g_dev_strategy(struct bio *bp) { struct g_geom *gp; struct g_consumer *cp; struct bio *bp2; dev_t dev; dev = bp->bio_dev; gp = dev->si_drv1; cp = dev->si_drv2; bp2 = g_clone_bio(bp); bp2->bio_offset = (off_t)bp->bio_blkno << DEV_BSHIFT; bp2->bio_length = (off_t)bp->bio_bcount; bp2->bio_done = g_dev_done; g_trace(G_T_BIO, "g_dev_strategy(%p/%p) offset %lld length %lld data %p cmd %d", bp, bp2, bp->bio_offset, bp2->bio_length, bp2->bio_data, bp2->bio_cmd); g_io_request(bp2, cp); } /* * g_dev_orphan() * * Called from below when the provider orphaned us. It is our responsibility * to get the access counts back to zero, until we do so the stack below will * not unravel. We must clear the kernel-dump settings, if this is the * current dumpdev. We call destroy_dev(9) to send our dev_t the way of * punched cards and if we have non-zero access counts, we call down with * them negated before we detattch and selfdestruct. */ static void g_dev_orphan(struct g_consumer *cp) { struct g_geom *gp; dev_t dev; gp = cp->geom; g_trace(G_T_TOPOLOGY, "g_dev_orphan(%p(%s))", cp, gp->name); g_topology_assert(); if (cp->biocount > 0) return; dev = gp->softc; if (dev->si_flags & SI_DUMPDEV) set_dumper(NULL); /* XXX: we may need Giant for now */ destroy_dev(dev); if (cp->acr > 0 || cp->acw > 0 || cp->ace > 0) g_access_rel(cp, -cp->acr, -cp->acw, -cp->ace); g_detach(cp); g_destroy_consumer(cp); g_destroy_geom(gp); } DECLARE_GEOM_CLASS(g_dev_class, g_dev); Index: head/sys/geom/geom_dump.c =================================================================== --- head/sys/geom/geom_dump.c (revision 104451) +++ head/sys/geom/geom_dump.c (revision 104452) @@ -1,271 +1,269 @@ /*- * Copyright (c) 2002 Poul-Henning Kamp * Copyright (c) 2002 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by Poul-Henning Kamp * and NAI Labs, the Security Research Division of Network Associates, Inc. * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the * DARPA CHATS research program. * * 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. The names of the authors may not be used to endorse or promote * products derived from this software without specific prior written * permission. * * 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. * * $FreeBSD$ */ #include #include #ifndef _KERNEL #include #include #include #include #else #include #include #endif #include #include #include static void g_confdot_consumer(struct sbuf *sb, struct g_consumer *cp) { sbuf_printf(sb, "z%p [label=\"r%dw%de%d\\nbio #%d\"];\n", cp, cp->acr, cp->acw, cp->ace, cp->biocount); if (cp->provider) sbuf_printf(sb, "z%p -> z%p;\n", cp, cp->provider); } static void g_confdot_provider(struct sbuf *sb, struct g_provider *pp) { sbuf_printf(sb, "z%p [shape=hexagon,label=\"%s\\nr%dw%de%d\\nerr#%d\"];\n", pp, pp->name, pp->acr, pp->acw, pp->ace, pp->error); } static void g_confdot_geom(struct sbuf *sb, struct g_geom *gp) { struct g_consumer *cp; struct g_provider *pp; sbuf_printf(sb, "z%p [shape=box,label=\"%s\\n%s\\nr#%d\"];\n", gp, gp->class->name, gp->name, gp->rank); LIST_FOREACH(cp, &gp->consumer, consumer) { g_confdot_consumer(sb, cp); sbuf_printf(sb, "z%p -> z%p;\n", gp, cp); } LIST_FOREACH(pp, &gp->provider, provider) { g_confdot_provider(sb, pp); sbuf_printf(sb, "z%p -> z%p;\n", pp, gp); } } static void g_confdot_class(struct sbuf *sb, struct g_class *mp) { struct g_geom *gp; LIST_FOREACH(gp, &mp->geom, geom) g_confdot_geom(sb, gp); } -struct sbuf * -g_confdot(void) +void +g_confdot(void *p) { struct g_class *mp; struct sbuf *sb; - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); - sbuf_clear(sb); + sb = p; + g_topology_assert(); sbuf_printf(sb, "digraph geom {\n"); LIST_FOREACH(mp, &g_classes, class) g_confdot_class(sb, mp); sbuf_printf(sb, "};\n"); sbuf_finish(sb); - return (sb); + wakeup(p); } static void g_conf_consumer(struct sbuf *sb, struct g_consumer *cp) { sbuf_printf(sb, "\t\n", cp); sbuf_printf(sb, "\t \n", cp->geom); if (cp->provider != NULL) sbuf_printf(sb, "\t \n", cp->provider); sbuf_printf(sb, "\t r%dw%de%d\n", cp->acr, cp->acw, cp->ace); if (cp->geom->dumpconf) { sbuf_printf(sb, "\t \n"); cp->geom->dumpconf(sb, "\t ", cp->geom, cp, NULL); sbuf_printf(sb, "\t \n"); } sbuf_printf(sb, "\t\n"); } static void g_conf_provider(struct sbuf *sb, struct g_provider *pp) { sbuf_printf(sb, "\t\n", pp); sbuf_printf(sb, "\t \n", pp->geom); sbuf_printf(sb, "\t r%dw%de%d\n", pp->acr, pp->acw, pp->ace); sbuf_printf(sb, "\t %s\n", pp->name); if (pp->geom->dumpconf) { sbuf_printf(sb, "\t \n"); pp->geom->dumpconf(sb, "\t ", pp->geom, NULL, pp); sbuf_printf(sb, "\t \n"); } sbuf_printf(sb, "\t\n"); } static void g_conf_geom(struct sbuf *sb, struct g_geom *gp, struct g_provider *pp, struct g_consumer *cp) { struct g_consumer *cp2; struct g_provider *pp2; sbuf_printf(sb, " \n", gp); sbuf_printf(sb, " \n", gp->class); sbuf_printf(sb, " %s\n", gp->name); sbuf_printf(sb, " %d\n", gp->rank); if (gp->dumpconf) { sbuf_printf(sb, " \n"); gp->dumpconf(sb, "\t", gp, NULL, NULL); sbuf_printf(sb, " \n"); } LIST_FOREACH(cp2, &gp->consumer, consumer) { if (cp != NULL && cp != cp2) continue; g_conf_consumer(sb, cp2); } LIST_FOREACH(pp2, &gp->provider, provider) { if (pp != NULL && pp != pp2) continue; g_conf_provider(sb, pp2); } sbuf_printf(sb, " \n"); } static void g_conf_class(struct sbuf *sb, struct g_class *mp, struct g_geom *gp, struct g_provider *pp, struct g_consumer *cp) { struct g_geom *gp2; sbuf_printf(sb, " \n", mp); sbuf_printf(sb, " %s\n", mp->name); LIST_FOREACH(gp2, &mp->geom, geom) { if (gp != NULL && gp != gp2) continue; g_conf_geom(sb, gp2, pp, cp); } sbuf_printf(sb, " \n"); } -struct sbuf * -g_conf_specific(struct g_class *mp, struct g_geom *gp, struct g_provider *pp, struct g_consumer *cp) +void +g_conf_specific(struct sbuf *sb, struct g_class *mp, struct g_geom *gp, struct g_provider *pp, struct g_consumer *cp) { struct g_class *mp2; - struct sbuf *sb; - sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); - sbuf_clear(sb); + g_topology_assert(); sbuf_printf(sb, "\n"); #ifndef _KERNEL sbuf_printf(sb, " %cFreeBSD%c\n", '$', '$'); #endif LIST_FOREACH(mp2, &g_classes, class) { if (mp != NULL && mp != mp2) continue; g_conf_class(sb, mp2, gp, pp, cp); } sbuf_printf(sb, "\n"); sbuf_finish(sb); - return (sb); } -struct sbuf * -g_conf() +void +g_confxml(void *p) { - return (g_conf_specific(NULL, NULL, NULL, NULL)); + g_conf_specific(p, NULL, NULL, NULL, NULL); + wakeup(p); } void g_trace(int level, char *fmt, ...) { va_list ap; g_sanity(NULL); if (!(g_debugflags & level)) return; va_start(ap, fmt); vprintf(fmt, ap); printf("\n"); } void g_hexdump(void *ptr, int length) { int i, j, k; unsigned char *cp; cp = ptr; for (i = 0; i < length; i+= 16) { printf("%04x ", i); for (j = 0; j < 16; j++) { k = i + j; if (k < length) printf(" %02x", cp[k]); else printf(" "); } printf(" |"); for (j = 0; j < 16; j++) { k = i + j; if (k >= length) printf(" "); else if (cp[k] >= ' ' && cp[k] <= '~') printf("%c", cp[k]); else printf("."); } printf("|\n"); } } Index: head/sys/geom/geom_int.h =================================================================== --- head/sys/geom/geom_int.h (revision 104451) +++ head/sys/geom/geom_int.h (revision 104452) @@ -1,93 +1,93 @@ /*- * Copyright (c) 2002 Poul-Henning Kamp * Copyright (c) 2002 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by Poul-Henning Kamp * and NAI Labs, the Security Research Division of Network Associates, Inc. * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the * DARPA CHATS research program. * * 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. The names of the authors may not be used to endorse or promote * products derived from this software without specific prior written * permission. * * 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. * * $FreeBSD$ */ LIST_HEAD(class_list_head, g_class); TAILQ_HEAD(g_tailq_head, g_geom); TAILQ_HEAD(event_tailq_head, g_event); extern struct event_tailq_head events; extern int g_debugflags; /* 1 G_T_TOPOLOGY */ /* 2 G_T_BIO */ /* 4 G_T_ACCESS */ /* 8 enable sanity checks */ /* * Various internal actions are tracked by tagging g_event[s] onto * an internal eventqueue. */ enum g_events { EV_NEW_CLASS, /* class */ EV_NEW_PROVIDER, /* provider */ EV_SPOILED, /* provider, consumer */ EV_CALL_ME, /* func, arg */ EV_LAST }; struct g_event { enum g_events event; TAILQ_ENTRY(g_event) events; struct g_class *class; struct g_geom *geom; struct g_provider *provider; struct g_consumer *consumer; void *arg; g_call_me_t *func; }; /* geom_dump.c */ -struct sbuf * g_conf(void); -struct sbuf * g_conf_specific(struct g_class *mp, struct g_geom *gp, struct g_provider *pp, struct g_consumer *cp); -struct sbuf * g_confdot(void); +void g_confxml(void *); +void g_conf_specific(struct sbuf *sb, struct g_class *mp, struct g_geom *gp, struct g_provider *pp, struct g_consumer *cp); +void g_confdot(void *); /* geom_event.c */ void g_event_init(void); void g_post_event(enum g_events ev, struct g_class *mp, struct g_geom *gp, struct g_provider *pp, struct g_consumer *cp); void g_run_events(void); /* geom_subr.c */ extern struct class_list_head g_classes; extern char *g_wait_event, *g_wait_sim, *g_wait_up, *g_wait_down; /* geom_io.c */ void g_io_init(void); void g_io_schedule_down(struct thread *tp); void g_io_schedule_up(struct thread *tp); /* geom_kern.c / geom_kernsim.c */ void g_init(void); Index: head/sys/geom/geom_kern.c =================================================================== --- head/sys/geom/geom_kern.c (revision 104451) +++ head/sys/geom/geom_kern.c (revision 104452) @@ -1,214 +1,222 @@ /*- * Copyright (c) 2002 Poul-Henning Kamp * Copyright (c) 2002 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by Poul-Henning Kamp * and NAI Labs, the Security Research Division of Network Associates, Inc. * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the * DARPA CHATS research program. * * 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. The names of the authors may not be used to endorse or promote * products derived from this software without specific prior written * permission. * * 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. * * $FreeBSD$ */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include MALLOC_DEFINE(M_GEOM, "GEOM", "Geom data structures"); struct sx topology_lock; static struct proc *g_up_proc; int g_debugflags; /* * G_UP and G_DOWN are the two threads which push I/O through the * stack. * * Things are procesed in a FIFO order, but these threads could be * part of I/O prioritization by deciding which bios/bioqs to service * in what order. * * We have only one thread in each direction, it is belived that until * a very non-trivial workload in the UP/DOWN path this will be enough, * but more than one can actually be run without problems. * * Holding the "mymutex" is a debugging feature: It prevents people * from sleeping in the UP/DOWN I/O path by mistake or design (doing * so almost invariably result in deadlocks since it stalls all I/O * processing in the given direction. */ static void g_up_procbody(void) { struct proc *p = g_up_proc; struct thread *tp = FIRST_THREAD_IN_PROC(p); struct mtx mymutex; bzero(&mymutex, sizeof mymutex); mtx_init(&mymutex, "g_up", MTX_DEF, 0); mtx_lock(&mymutex); tp->td_base_pri = PRIBIO; for(;;) { g_io_schedule_up(tp); msleep(&g_wait_up, &mymutex, PRIBIO, "g_up", hz/10); } } struct kproc_desc g_up_kp = { "g_up", g_up_procbody, &g_up_proc, }; static struct proc *g_down_proc; static void g_down_procbody(void) { struct proc *p = g_down_proc; struct thread *tp = FIRST_THREAD_IN_PROC(p); struct mtx mymutex; bzero(&mymutex, sizeof mymutex); mtx_init(&mymutex, "g_down", MTX_DEF, 0); mtx_lock(&mymutex); tp->td_base_pri = PRIBIO; for(;;) { g_io_schedule_down(tp); msleep(&g_wait_down, &mymutex, PRIBIO, "g_down", hz/10); } } struct kproc_desc g_down_kp = { "g_down", g_down_procbody, &g_down_proc, }; static struct proc *g_event_proc; static void g_event_procbody(void) { struct proc *p = g_down_proc; struct thread *tp = FIRST_THREAD_IN_PROC(p); tp->td_base_pri = PRIBIO; for(;;) { g_run_events(); tsleep(&g_wait_event, PRIBIO, "g_events", hz/10); } } struct kproc_desc g_event_kp = { "g_event", g_event_procbody, &g_event_proc, }; void g_init(void) { printf("Initializing GEOMetry subsystem\n"); if (bootverbose) g_debugflags |= G_T_TOPOLOGY; sx_init(&topology_lock, "GEOM topology"); g_io_init(); g_event_init(); mtx_lock(&Giant); kproc_start(&g_event_kp); kproc_start(&g_up_kp); kproc_start(&g_down_kp); mtx_unlock(&Giant); } static int -sysctl_kern_geom_dotconf(SYSCTL_HANDLER_ARGS) +sysctl_kern_geom_confdot(SYSCTL_HANDLER_ARGS) { - int i, error; + int error; struct sbuf *sb; - i = 0; - sb = g_confdot(); - error = sysctl_handle_opaque(oidp, sbuf_data(sb), sbuf_len(sb), req); + sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sbuf_clear(sb); + g_call_me(g_confdot, sb); + do { + tsleep(sb, PZERO, "g_dot", hz); + } while(!sbuf_done(sb)); + error = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb)); sbuf_delete(sb); - return (error); + return error; } - + static int -sysctl_kern_geom_xmlconf(SYSCTL_HANDLER_ARGS) +sysctl_kern_geom_confxml(SYSCTL_HANDLER_ARGS) { - int i, error; + int error; struct sbuf *sb; - i = 0; - sb = g_conf(); - error = sysctl_handle_opaque(oidp, sbuf_data(sb), sbuf_len(sb), req); + sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sbuf_clear(sb); + g_call_me(g_confxml, sb); + do { + tsleep(sb, PZERO, "g_xml", hz); + } while(!sbuf_done(sb)); + error = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb)); sbuf_delete(sb); - return (error); + return error; } SYSCTL_NODE(_kern, OID_AUTO, geom, CTLFLAG_RW, 0, "GEOMetry management"); -SYSCTL_PROC(_kern_geom, OID_AUTO, xmlconf, CTLTYPE_STRING|CTLFLAG_RD, - 0, 0, sysctl_kern_geom_xmlconf, "A", +SYSCTL_PROC(_kern_geom, OID_AUTO, confxml, CTLTYPE_STRING|CTLFLAG_RD, + 0, 0, sysctl_kern_geom_confxml, "A", "Dump the GEOM config"); -SYSCTL_PROC(_kern_geom, OID_AUTO, dotconf, CTLTYPE_STRING|CTLFLAG_RD, - 0, 0, sysctl_kern_geom_dotconf, "A", +SYSCTL_PROC(_kern_geom, OID_AUTO, confdot, CTLTYPE_STRING|CTLFLAG_RD, + 0, 0, sysctl_kern_geom_confdot, "A", "Dump the GEOM config"); SYSCTL_INT(_kern_geom, OID_AUTO, debugflags, CTLTYPE_INT|CTLFLAG_RW, &g_debugflags, 0, ""); SYSCTL_INT(_debug_sizeof, OID_AUTO, g_class, CTLTYPE_INT|CTLFLAG_RD, 0, sizeof(struct g_class), ""); SYSCTL_INT(_debug_sizeof, OID_AUTO, g_geom, CTLTYPE_INT|CTLFLAG_RD, 0, sizeof(struct g_geom), ""); SYSCTL_INT(_debug_sizeof, OID_AUTO, g_provider, CTLTYPE_INT|CTLFLAG_RD, 0, sizeof(struct g_provider), ""); SYSCTL_INT(_debug_sizeof, OID_AUTO, g_consumer, CTLTYPE_INT|CTLFLAG_RD, 0, sizeof(struct g_consumer), ""); SYSCTL_INT(_debug_sizeof, OID_AUTO, g_bioq, CTLTYPE_INT|CTLFLAG_RD, 0, sizeof(struct g_bioq), ""); SYSCTL_INT(_debug_sizeof, OID_AUTO, g_event, CTLTYPE_INT|CTLFLAG_RD, 0, sizeof(struct g_event), "");