Date: Sun, 24 Mar 2002 04:19:05 -0800 (PST) From: Poul-Henning Kamp <phk@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 8328 for review Message-ID: <200203241219.g2OCJ5J10154@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8328 Change 8328 by phk@phk_flat on 2002/03/24 04:18:48 IFC Affected files ... ... //depot/projects/sparc64/sys/conf/files#45 integrate ... //depot/projects/sparc64/sys/geom/geom.h#3 integrate ... //depot/projects/sparc64/sys/geom/geom_enc.c#1 branch ... //depot/projects/sparc64/sys/geom/geom_mbr.c#2 integrate ... //depot/projects/sparc64/sys/geom/geom_mbrext.c#2 delete ... //depot/projects/sparc64/sys/geom/geom_sunlabel.c#2 integrate Differences ... ==== //depot/projects/sparc64/sys/conf/files#45 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.614 2002/03/23 15:46:53 nsouch Exp $ +# $FreeBSD: src/sys/conf/files,v 1.615 2002/03/24 11:21:33 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -691,11 +691,11 @@ geom/geom_dev.c optional geom geom/geom_disk.c optional geom geom/geom_dump.c optional geom +geom/geom_enc.c optional geom geom/geom_event.c optional geom geom/geom_io.c optional geom geom/geom_kern.c optional geom geom/geom_mbr.c optional geom -geom/geom_mbrext.c optional geom geom/geom_slice.c optional geom geom/geom_subr.c optional geom geom/geom_sunlabel.c optional geom ==== //depot/projects/sparc64/sys/geom/geom.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom.h,v 1.3 2002/03/17 19:15:28 phk Exp $ + * $FreeBSD: src/sys/geom/geom.h,v 1.4 2002/03/24 11:21:40 phk Exp $ */ #include <sys/lock.h> @@ -198,6 +198,13 @@ # define G_T_BIO 2 # define G_T_ACCESS 4 +/* geom_enc.c */ +uint32_t g_dec_be2(u_char *p); +uint32_t g_dec_be4(u_char *p); +uint32_t g_dec_le2(u_char *p); +uint32_t g_dec_le4(u_char *p); +void g_enc_le4(u_char *p, uint32_t u); + /* geom_event.c */ void g_event_init(void); void g_orphan_provider(struct g_provider *pp, int error); ==== //depot/projects/sparc64/sys/geom/geom_mbr.c#2 (text+ko) ==== @@ -32,10 +32,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_mbr.c,v 1.1 2002/03/11 21:42:35 phk Exp $ + * $FreeBSD: src/sys/geom/geom_mbr.c,v 1.2 2002/03/24 11:21:41 phk Exp $ */ - #include <sys/param.h> #ifndef _KERNEL #include <stdio.h> @@ -60,7 +59,42 @@ #include <geom/geom_slice.h> #define MBR_METHOD_NAME "MBR-method" +#define MBREXT_METHOD_NAME "MBREXT-method" + +static void +g_dec_dos_partition(u_char *ptr, struct dos_partition *d) +{ + + d->dp_flag = ptr[0]; + d->dp_shd = ptr[1]; + d->dp_ssect = ptr[2]; + d->dp_scyl = ptr[3]; + d->dp_typ = ptr[4]; + d->dp_ehd = ptr[5]; + d->dp_esect = ptr[6]; + d->dp_ecyl = ptr[7]; + d->dp_start = g_dec_le4(ptr + 8); + d->dp_size = g_dec_le4(ptr + 12); +} +#if 0 +static void +g_enc_dos_partition(u_char *ptr, struct dos_partition *d) +{ + + ptr[0] = d->dp_flag; + ptr[1] = d->dp_shd; + ptr[2] = d->dp_ssect; + ptr[3] = d->dp_scyl; + ptr[4] = d->dp_typ; + ptr[5] = d->dp_ehd; + ptr[6] = d->dp_esect; + ptr[7] = d->dp_ecyl; + g_enc_le4(ptr + 8, d->dp_start); + g_enc_le4(ptr + 12, d->dp_size); +} +#endif + struct g_mbr_softc { int type [NDOSPART]; struct dos_partition dospart[NDOSPART]; @@ -140,6 +174,11 @@ struct g_mbr_softc *ms; u_char *buf; + if (sizeof(struct dos_partition) != 16) { + printf("WARNING: struct dos_partition compiles to %d bytes, should be 16.\n", + sizeof(struct dos_partition)); + return (NULL); + } g_trace(G_T_TOPOLOGY, "mbr_taste(%s,%s)", mp->name, pp->name); g_topology_assert(); gp = g_slice_new(mp, NDOSPART, pp, &cp, &ms, sizeof *ms, g_mbr_start); @@ -163,7 +202,10 @@ g_free(buf); break; } - bcopy(buf + DOSPARTOFF, dp, sizeof(dp)); + for (i = 0; i < NDOSPART; i++) + g_dec_dos_partition( + buf + DOSPARTOFF + i * sizeof(struct dos_partition), + dp + i); g_free(buf); if (bcmp(dp, historical_bogus_partition_table, sizeof historical_bogus_partition_table) == 0) @@ -209,3 +251,141 @@ }; DECLARE_GEOM_METHOD(g_mbr_method, g_mbr); + +#define NDOSEXTPART 32 +struct g_mbrext_softc { + int type [NDOSEXTPART]; +}; + +static int +g_mbrext_start(struct bio *bp) +{ + struct g_provider *pp; + struct g_geom *gp; + struct g_mbrext_softc *mp; + struct g_slicer *gsp; + int index; + + pp = bp->bio_to; + index = pp->index; + gp = pp->geom; + gsp = gp->softc; + mp = gsp->softc; + if (bp->bio_cmd == BIO_GETATTR) { + if (g_haveattr_int(bp, "MBR::type", mp->type[index])) + return (1); + } + return (0); +} + +static void +g_mbrext_dumpconf(struct sbuf *sb, char *indent, struct g_geom *gp, struct g_consumer *cp __unused, struct g_provider *pp) +{ + struct g_mbrext_softc *mp; + struct g_slicer *gsp; + + g_slice_dumpconf(sb, indent, gp, cp, pp); + gsp = gp->softc; + mp = gsp->softc; + if (pp != NULL) { + sbuf_printf(sb, "%s<type>%d</type>\n", + indent, mp->type[pp->index]); + } +} + +static void +g_mbrext_print(int i, struct dos_partition *dp) +{ + g_hexdump(dp, sizeof(dp[0])); + printf("[%d] f:%02x typ:%d", i, dp->dp_flag, dp->dp_typ); + printf(" s(CHS):%d/%d/%d", dp->dp_scyl, dp->dp_shd, dp->dp_ssect); + printf(" e(CHS):%d/%d/%d", dp->dp_ecyl, dp->dp_ehd, dp->dp_esect); + printf(" s:%d l:%d\n", dp->dp_start, dp->dp_size); +} + +static struct g_geom * +g_mbrext_taste(struct g_method *mp, struct g_provider *pp, struct thread *tp __unused, int insist __unused) +{ + struct g_geom *gp; + struct g_consumer *cp; + struct g_provider *pp2; + int error, i, j, slice; + struct g_mbrext_softc *ms; + off_t off; + u_char *buf; + struct dos_partition dp[4]; + + g_trace(G_T_TOPOLOGY, "g_mbrext_taste(%s,%s)", mp->name, pp->name); + g_topology_assert(); + if (strcmp(pp->geom->method->name, MBR_METHOD_NAME)) + return (NULL); + gp = g_slice_new(mp, NDOSEXTPART, pp, &cp, &ms, sizeof *ms, g_mbrext_start); + if (gp == NULL) + return (NULL); + g_topology_unlock(); + gp->dumpconf = g_mbrext_dumpconf; + off = 0; + slice = 0; + while (1) { /* a trick to allow us to use break */ + j = sizeof i; + error = g_io_getattr("MBR::type", cp, &j, &i, tp); + if (error || i != DOSPTYP_EXT) + break; + for (;;) { + buf = g_read_data(cp, off, DEV_BSIZE, &error); + if (buf == NULL || error != 0) + break; + if (buf[0x1fe] != 0x55 && buf[0x1ff] != 0xaa) + break; + for (i = 0; i < NDOSPART; i++) + g_dec_dos_partition( + buf + DOSPARTOFF + i * sizeof(struct dos_partition), + dp + i); + g_free(buf); + g_mbrext_print(0, dp); + g_mbrext_print(1, dp + 1); + if (dp[0].dp_flag == 0 && dp[0].dp_size != 0) { + pp2 = g_slice_addslice(gp, slice, + (((off_t)dp[0].dp_start) << 9ULL) + off, + ((off_t)dp[0].dp_size) << 9ULL, + "%*.*s%d", + strlen(gp->name) - 1, + strlen(gp->name) - 1, + gp->name, + slice + 5); + ms->type[slice] = dp[0].dp_typ; + slice++; + g_error_provider(pp2, 0); + } + if (dp[1].dp_flag != 0) + break; + if (dp[1].dp_typ != DOSPTYP_EXT) + break; + if (dp[1].dp_size == 0) + break; + off = ((off_t)dp[1].dp_start) << 9ULL; + } + break; + } + g_topology_lock(); + error = g_access_rel(cp, -1, 0, 0); + if (slice > 0) + return (gp); + + g_topology_assert(); + g_std_spoiled(cp); + g_topology_assert(); + return (NULL); +} + + +static struct g_method g_mbrext_method = { + MBREXT_METHOD_NAME, + g_mbrext_taste, + g_slice_access, + g_slice_orphan, + NULL, + G_METHOD_INITSTUFF +}; + +DECLARE_GEOM_METHOD(g_mbrext_method, g_mbrext); ==== //depot/projects/sparc64/sys/geom/geom_sunlabel.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_sunlabel.c,v 1.1 2002/03/15 21:44:08 phk Exp $ + * $FreeBSD: src/sys/geom/geom_sunlabel.c,v 1.2 2002/03/24 11:21:41 phk Exp $ */ @@ -59,19 +59,6 @@ #define BSD_METHOD_NAME "SUNLABEL-method" -static u_int -g_u16be(u_char *p) -{ - return ((p[0] << 8) | p[1]); -} - -static u_int -g_u32be(u_char *p) -{ - return ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]); -} - - struct g_sunlabel_softc { int foo; }; @@ -141,43 +128,43 @@ break; /* The second last short is a magic number */ - if (g_u16be(buf + 508) != 0xdabe) + if (g_dec_be2(buf + 508) != 0xdabe) break; /* The shortword parity of the entire thing must be even */ u = 0; for (i = 0; i < 512; i += 2) - u ^= g_u16be(buf + i); + u ^= g_dec_be2(buf + i); if (u != 0) break; if (bootverbose) { g_hexdump(buf, 128); for (i = 0; i < 8; i++) { printf("part %d %u %u\n", i, - g_u32be(buf + 444 + i * 8), - g_u32be(buf + 448 + i * 8)); + g_dec_be4(buf + 444 + i * 8), + g_dec_be4(buf + 448 + i * 8)); } - printf("v_version = %d\n", g_u32be(buf + 128)); - printf("v_nparts = %d\n", g_u16be(buf + 140)); + printf("v_version = %d\n", g_dec_be4(buf + 128)); + printf("v_nparts = %d\n", g_dec_be2(buf + 140)); for (i = 0; i < 8; i++) { printf("v_part[%d] = %d %d\n", - i, g_u16be(buf + 142 + i * 4), - g_u16be(buf + 144 + i * 4)); + i, g_dec_be2(buf + 142 + i * 4), + g_dec_be2(buf + 144 + i * 4)); } - printf("v_sanity %x\n", g_u32be(buf + 186)); - printf("v_version = %d\n", g_u32be(buf + 128)); - printf("v_rpm %d\n", g_u16be(buf + 420)); - printf("v_totalcyl %d\n", g_u16be(buf + 422)); - printf("v_cyl %d\n", g_u16be(buf + 432)); - printf("v_alt %d\n", g_u16be(buf + 434)); - printf("v_head %d\n", g_u16be(buf + 436)); - printf("v_sec %d\n", g_u16be(buf + 438)); + printf("v_sanity %x\n", g_dec_be4(buf + 186)); + printf("v_version = %d\n", g_dec_be4(buf + 128)); + printf("v_rpm %d\n", g_dec_be2(buf + 420)); + printf("v_totalcyl %d\n", g_dec_be2(buf + 422)); + printf("v_cyl %d\n", g_dec_be2(buf + 432)); + printf("v_alt %d\n", g_dec_be2(buf + 434)); + printf("v_head %d\n", g_dec_be2(buf + 436)); + printf("v_sec %d\n", g_dec_be2(buf + 438)); } - csize = g_u16be(buf + 436) * g_u16be(buf + 438); + csize = g_dec_be2(buf + 436) * g_dec_be2(buf + 438); for (i = 0; i < 8; i++) { - v = g_u32be(buf + 444 + i * 8); - u = g_u32be(buf + 448 + i * 8); + v = g_dec_be4(buf + 444 + i * 8); + u = g_dec_be4(buf + 448 + i * 8); if (u == 0) continue; npart++; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203241219.g2OCJ5J10154>