Be more systematic about conversion of on-disk formats in a endian/width

agnostic way.

Collapse the MBR and MBREXT methods into one file and make them endian/width
agnostic.

Sponsored by:	DARPA & NAI Labs.

1 files changed, 182 insertions, 2 deletions

diff --git a/sys/geom/geom_mbr.c b/sys/geom/geom_mbr.c
index 17788f3..b49e06b 100644
--- a/sys/geom/geom_mbr.c
+++ b/sys/geom/geom_mbr.c
@@ -35,7 +35,6 @@
  * $FreeBSD$
  */
 
-
 #include <sys/param.h>
 #ifndef _KERNEL
 #include <stdio.h>
@@ -60,6 +59,41 @@
 #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];
@@ -140,6 +174,11 @@ g_mbr_taste(struct g_method *mp, struct g_provider *pp, struct thread *tp, int i
 	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_mbr_taste(struct g_method *mp, struct g_provider *pp, struct thread *tp, int i
 			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 @@ static struct g_method g_mbr_method	= {
 };
 
 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);