Index: head/tools/regression/geom/geom_simdev.c =================================================================== --- head/tools/regression/geom/geom_simdev.c (revision 93791) +++ head/tools/regression/geom/geom_simdev.c (revision 93792) @@ -1,159 +1,159 @@ /*- * 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 +static g_orphan_t g_dev_orphan; static struct g_geom * dev_taste(struct g_class *mp, struct g_provider *pp, int insist __unused) { struct g_geom *gp; struct g_consumer *cp; 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) { g_topology_unlock(); return (NULL); } } gp = g_new_geomf(mp, pp->name); + gp->orphan = g_dev_orphan; cp = g_new_consumer(gp); g_attach(cp, pp); return (gp); } static void g_dev_orphan(struct g_consumer *cp) { struct g_geom *gp; gp = cp->geom; gp->flags |= G_GEOM_WITHER; g_trace(G_T_TOPOLOGY, "g_dev_orphan(%p(%s))", cp, gp->name); if (cp->biocount > 0) return; if (cp->acr > 0 || cp->acw > 0 || cp->ace > 0) g_access_rel(cp, -cp->acr, -cp->acw, -cp->ace); g_dettach(cp); g_destroy_consumer(cp); g_destroy_geom(gp); } static struct g_class dev_class = { "DEV-class", dev_taste, - NULL, - g_dev_orphan, NULL, G_CLASS_INITSTUFF }; static struct g_geom * g_dev_findg(char *name) { struct g_geom *gp; LIST_FOREACH(gp, &dev_class.geom, geom) if (!strcmp(gp->name, name)) break; return (gp); } void g_dev_init(void *junk __unused) { g_add_class(&dev_class); } struct g_consumer * g_dev_opendev(char *name, int r, int w, int e) { struct g_geom *gp; struct g_consumer *cp; int error; gp = g_dev_findg(name); if (gp == NULL) return (NULL); g_topology_lock(); cp = LIST_FIRST(&gp->consumer); error = g_access_rel(cp, r, w, e); g_topology_unlock(); if (error) return(NULL); return(cp); } static void g_dev_done(struct bio *bp) { if (bp->bio_from->biocount > 0) return; g_topology_lock(); g_dev_orphan(bp->bio_from); g_topology_unlock(); } int g_dev_request(char *name, struct bio *bp) { struct g_geom *gp; gp = g_dev_findg(name); if (gp == NULL) return (-1); bp->bio_done = g_dev_done; g_io_request(bp, LIST_FIRST(&gp->consumer)); return (1); } Index: head/tools/regression/geom/geom_simdisk.c =================================================================== --- head/tools/regression/geom/geom_simdisk.c (revision 93791) +++ head/tools/regression/geom/geom_simdisk.c (revision 93792) @@ -1,261 +1,265 @@ /*- * 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 "geom_simdisk.h" struct g_class g_simdisk_class = { "SIMDISK-class", NULL, - g_std_access, NULL, - NULL, G_CLASS_INITSTUFF }; static void g_simdisk_start(struct bio *bp) { off_t ot, off; unsigned nsec; u_char *op; int i; struct g_geom *gp = bp->bio_to->geom; struct simdisk_softc *sc = gp->softc; struct sector *dsp; printf("SIMDISK: OP%d %qd at %qd\n", bp->bio_cmd, bp->bio_length, bp->bio_offset); if (sc->stop) { TAILQ_INSERT_TAIL(&sc->sort, bp, bio_sort); return; } if (bp->bio_cmd == BIO_READ) { off = bp->bio_offset; nsec = bp->bio_length /= sc->sectorsize; op = bp->bio_data; while (nsec) { dsp = g_simdisk_findsector(sc, off, 0); if (dsp == NULL) { dsp = g_simdisk_findsector(sc, off, 1); ot = lseek(sc->fd, off, SEEK_SET); if (ot != off) { bp->bio_error = EIO; g_io_deliver(bp); return; } i = read(sc->fd, dsp->data, sc->sectorsize); if (i < 0) { bp->bio_error = errno; g_io_deliver(bp); return; } if (i == 0) memset(dsp->data, 0, sc->sectorsize); } memcpy(op, dsp->data, sc->sectorsize); bp->bio_completed += sc->sectorsize; off += sc->sectorsize; op += sc->sectorsize; nsec--; } g_io_deliver(bp); return; } if (bp->bio_cmd == BIO_GETATTR) { if (g_haveattr_int(bp, "GEOM::sectorsize", sc->sectorsize)) return; if (g_haveattr_int(bp, "GEOM::fwsectors", sc->fwsectors)) return; if (g_haveattr_int(bp, "GEOM::fwheads", sc->fwheads)) return; if (g_haveattr_int(bp, "GEOM::fwcylinders", sc->fwcylinders)) return; if (g_haveattr_off_t(bp, "GEOM::mediasize", sc->mediasize)) return; } bp->bio_error = EOPNOTSUPP; g_io_deliver(bp); } void g_simdisk_init(void) { g_add_class(&g_simdisk_class); } struct g_geom * g_simdisk_create(char *name, struct simdisk_softc *sc) { struct g_geom *gp; struct g_provider *pp; static int unit; printf("g_simdisk_create(\"%s\", %p)\n", name, sc); g_topology_lock(); gp = g_new_geomf(&g_simdisk_class, "%s", name); gp->start = g_simdisk_start; gp->softc = sc; + gp->access = g_std_access; pp = g_new_providerf(gp, "%s", name); + pp->mediasize=sc->mediasize; g_error_provider(pp, 0); unit++; g_topology_unlock(); return (gp); } struct g_geom * g_simdisk_new(char *name, char *path) { struct simdisk_softc *sc; + struct stat st; sc = calloc(1, sizeof *sc); sc->fd = open(path, O_RDONLY); if (sc->fd < 0) err(1, path); + fstat(sc->fd, &st); + sc->mediasize = st.st_size; sc->sectorsize = 512; LIST_INIT(&sc->sectors); TAILQ_INIT(&sc->sort); return (g_simdisk_create(name, sc)); } void g_simdisk_destroy(char *name) { struct g_geom *gp; LIST_FOREACH(gp, &g_simdisk_class.geom, geom) { if (strcmp(name, gp->name)) continue; gp->flags |= G_GEOM_WITHER; g_orphan_provider(LIST_FIRST(&gp->provider), ENXIO); return; } } struct sector * g_simdisk_findsector(struct simdisk_softc *sc, off_t off, int create) { struct sector *dsp; LIST_FOREACH(dsp, &sc->sectors, sectors) { if (dsp->offset < off) continue; if (dsp->offset == off) return (dsp); break; } if (!create) return (NULL); printf("Creating sector at offset %lld (%u)\n", off, (unsigned)(off / sc->sectorsize)); dsp = calloc(1, sizeof *dsp + sc->sectorsize); dsp->data = (u_char *)(dsp + 1); dsp->offset = off; g_simdisk_insertsector(sc, dsp); return (dsp); } void g_simdisk_insertsector(struct simdisk_softc *sc, struct sector *dsp) { struct sector *dsp2, *dsp3; if (LIST_EMPTY(&sc->sectors)) { LIST_INSERT_HEAD(&sc->sectors, dsp, sectors); return; } dsp3 = NULL; LIST_FOREACH(dsp2, &sc->sectors, sectors) { dsp3 = dsp2; if (dsp2->offset > dsp->offset) { LIST_INSERT_BEFORE(dsp2, dsp, sectors); return; } } LIST_INSERT_AFTER(dsp3, dsp, sectors); } void g_simdisk_stop(char *name) { struct g_geom *gp; struct simdisk_softc *sc; g_trace(G_T_TOPOLOGY, "g_simdisk_stop(%s)", name); LIST_FOREACH(gp, &g_simdisk_class.geom, geom) { if (strcmp(name, gp->name)) continue; sc = gp->softc; sc->stop = 1; return; } } void g_simdisk_restart(char *name) { struct g_geom *gp; struct simdisk_softc *sc; struct bio *bp; g_trace(G_T_TOPOLOGY, "g_simdisk_restart(%s)", name); LIST_FOREACH(gp, &g_simdisk_class.geom, geom) { if (strcmp(name, gp->name)) continue; sc = gp->softc; sc->stop = 0; bp = TAILQ_FIRST(&sc->sort); while (bp != NULL) { TAILQ_REMOVE(&sc->sort, bp, bio_sort); g_simdisk_start(bp); bp = TAILQ_FIRST(&sc->sort); } return; } } Index: head/tools/regression/geom/geom_simdisk.h =================================================================== --- head/tools/regression/geom/geom_simdisk.h (revision 93791) +++ head/tools/regression/geom/geom_simdisk.h (revision 93792) @@ -1,63 +1,64 @@ /*- * 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$ */ struct sector { LIST_ENTRY(sector) sectors; off_t offset; unsigned char *data; }; struct simdisk_softc { int fd; int sectorsize; off_t mediasize; + off_t lastsector; LIST_HEAD(,sector) sectors; struct sbuf *sbuf; struct sector *sp; int stop; u_int fwsectors; u_int fwheads; u_int fwcylinders; TAILQ_HEAD(,bio) sort; }; extern struct g_class g_simdisk_class; struct sector * g_simdisk_findsector(struct simdisk_softc *sc, off_t off, int create); struct g_geom *g_simdisk_create(char *name, struct simdisk_softc *sc); void g_simdisk_insertsector(struct simdisk_softc *sc, struct sector *dsp); Index: head/tools/regression/geom/geom_simdisk_xml.c =================================================================== --- head/tools/regression/geom/geom_simdisk_xml.c (revision 93791) +++ head/tools/regression/geom/geom_simdisk_xml.c (revision 93792) @@ -1,240 +1,244 @@ /*- * 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 "xmlparse.h" #include #include #include #include #include "geom_simdisk.h" void g_simdisk_xml_save(char *name, char *file) { struct g_geom *gp; struct simdisk_softc *sc; struct sector *dsp; int i, j; FILE *f; u_char *p; LIST_FOREACH(gp, &g_simdisk_class.geom, geom) { if (strcmp(name, gp->name)) continue; sc = gp->softc; f = fopen(file, "w"); if (f == NULL) err(1, file); fprintf(f, "\n"); fprintf(f, "\n"); #if 0 { struct sbuf *sb; sb = g_conf_specific(&g_simdisk_class, gp, NULL, NULL); fprintf(f, " %s\n", sbuf_data(sb)); } #endif fprintf(f, " %u\n", sc->sectorsize); fprintf(f, " %llu\n", sc->mediasize); fprintf(f, " %u\n", sc->fwsectors); fprintf(f, " %u\n", sc->fwheads); fprintf(f, " %u\n", sc->fwcylinders); LIST_FOREACH(dsp, &sc->sectors, sectors) { fprintf(f, " \n"); fprintf(f, " %llu\n", dsp->offset); fprintf(f, " \n"); p = dsp->data; for (j = 0 ; j < sc->sectorsize; j += 32) { fprintf(f, "\t"); for (i = 0; i < 32; i++) fprintf(f, "%02x", *p++); fprintf(f, "\n"); } fprintf(f, " \n"); fprintf(f, " \n"); } fprintf(f, "\n"); fclose(f); } } static void startElement(void *userData, const char *name, const char **atts __unused) { struct simdisk_softc *sc; sc = userData; if (!strcasecmp(name, "sector")) { sc->sp = calloc(1, sizeof(*sc->sp) + sc->sectorsize); sc->sp->data = (u_char *)(sc->sp + 1); } sbuf_clear(sc->sbuf); } static void endElement(void *userData, const char *name) { struct simdisk_softc *sc; char *p; u_char *q; int i, j; + off_t o; sc = userData; if (!strcasecmp(name, "comment")) { sbuf_clear(sc->sbuf); return; } sbuf_finish(sc->sbuf); if (!strcasecmp(name, "sectorsize")) { sc->sectorsize = strtoul(sbuf_data(sc->sbuf), &p, 0); if (*p != '\0') errx(1, "strtoul croaked on sectorsize"); } else if (!strcasecmp(name, "mediasize")) { - sc->mediasize = strtoull(sbuf_data(sc->sbuf), &p, 0); + o = strtoull(sbuf_data(sc->sbuf), &p, 0); if (*p != '\0') errx(1, "strtoul croaked on mediasize"); + if (o > 0) + sc->mediasize = o; } else if (!strcasecmp(name, "fwsectors")) { sc->fwsectors = strtoul(sbuf_data(sc->sbuf), &p, 0); if (*p != '\0') errx(1, "strtoul croaked on fwsectors"); } else if (!strcasecmp(name, "fwheads")) { sc->fwheads = strtoul(sbuf_data(sc->sbuf), &p, 0); if (*p != '\0') errx(1, "strtoul croaked on fwheads"); } else if (!strcasecmp(name, "fwcylinders")) { sc->fwcylinders = strtoul(sbuf_data(sc->sbuf), &p, 0); if (*p != '\0') errx(1, "strtoul croaked on fwcylinders"); } else if (!strcasecmp(name, "offset")) { sc->sp->offset= strtoull(sbuf_data(sc->sbuf), &p, 0); if (*p != '\0') errx(1, "strtoul croaked on offset"); } else if (!strcasecmp(name, "fill")) { j = strtoul(sbuf_data(sc->sbuf), NULL, 16); memset(sc->sp->data, j, sc->sectorsize); } else if (!strcasecmp(name, "hexdata")) { q = sc->sp->data; p = sbuf_data(sc->sbuf); for (i = 0; i < sc->sectorsize; i++) { if (!isxdigit(*p)) errx(1, "I croaked on hexdata %d:(%02x)", i, *p); if (isdigit(*p)) j = (*p - '0') << 4; else j = (tolower(*p) - 'a' + 10) << 4; p++; if (!isxdigit(*p)) errx(1, "I croaked on hexdata %d:(%02x)", i, *p); if (isdigit(*p)) j |= *p - '0'; else j |= tolower(*p) - 'a' + 10; p++; *q++ = j; } } else if (!strcasecmp(name, "sector")) { g_simdisk_insertsector(sc, sc->sp); sc->sp = NULL; } else if (!strcasecmp(name, "diskimage")) { } else if (!strcasecmp(name, "FreeBSD")) { } else { printf("<%s>[[%s]]\n", name, sbuf_data(sc->sbuf)); } sbuf_clear(sc->sbuf); } static void characterData(void *userData, const XML_Char *s, int len) { const char *b, *e; struct simdisk_softc *sc; sc = userData; b = s; e = s + len - 1; while (isspace(*b) && b < e) b++; while (isspace(*e) && e > b) e--; if (e != b || !isspace(*b)) sbuf_bcat(sc->sbuf, b, e - b + 1); } struct g_geom * g_simdisk_xml_load(char *name, char *file) { XML_Parser parser = XML_ParserCreate(NULL); struct stat st; char *p; struct simdisk_softc *sc; int fd, i; sc = calloc(1, sizeof *sc); sc->fd = -1; sc->sbuf = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND); + sc->mediasize = 1024 * 1024 * 1024 * (off_t)1024; LIST_INIT(&sc->sectors); TAILQ_INIT(&sc->sort); XML_SetUserData(parser, sc); XML_SetElementHandler(parser, startElement, endElement); XML_SetCharacterDataHandler(parser, characterData); fd = open(file, O_RDONLY); if (fd < 0) err(1, file); fstat(fd, &st); p = mmap(NULL, st.st_size, PROT_READ, MAP_NOCORE|MAP_PRIVATE, fd, 0); i = XML_Parse(parser, p, st.st_size, 1); if (i != 1) errx(1, "XML_Parse complains: return %d", i); munmap(p, st.st_size); close(fd); XML_ParserFree(parser); return (g_simdisk_create(name, sc)); }