svn commit: r263461 - user/marcel/mkimg
Marcel Moolenaar
marcel at FreeBSD.org
Fri Mar 21 03:27:43 UTC 2014
Author: marcel
Date: Fri Mar 21 03:27:42 2014
New Revision: 263461
URL: http://svnweb.freebsd.org/changeset/base/263461
Log:
Dump my WIP of write support for GPT. This compiles, appears to be
complete, but isn't accepted by g_part_gpt. Time to debug and fix.
Modified:
user/marcel/mkimg/gpt.c
user/marcel/mkimg/mkimg.h
user/marcel/mkimg/scheme.c
user/marcel/mkimg/scheme.h
Modified: user/marcel/mkimg/gpt.c
==============================================================================
--- user/marcel/mkimg/gpt.c Fri Mar 21 01:34:19 2014 (r263460)
+++ user/marcel/mkimg/gpt.c Fri Mar 21 03:27:42 2014 (r263461)
@@ -28,9 +28,15 @@
__FBSDID("$FreeBSD$");
#include <sys/types.h>
+#include <sys/diskmbr.h>
+#include <sys/endian.h>
#include <sys/errno.h>
#include <sys/gpt.h>
+#include <stddef.h>
+#include <stdint.h>
#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
#include <uuid.h>
#include "mkimg.h"
@@ -39,29 +45,218 @@ __FBSDID("$FreeBSD$");
static uuid_t gpt_uuid_efi = GPT_ENT_TYPE_EFI;
static struct mkimg_alias gpt_aliases[] = {
- { "efi", ALIAS_PTR(&gpt_uuid_efi) },
+ { "efi", ALIAS_PTR2TYPE(&gpt_uuid_efi) },
{ NULL, 0 }
};
+/* CRC32 code derived from work by Gary S. Brown. */
+static const uint32_t crc32_tab[] = {
+ 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+ 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+ 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+ 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+ 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+ 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+ 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+ 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+ 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+ 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+ 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+ 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+ 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
+ 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+ 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+ 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+ 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
+ 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+ 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
+ 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+ 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+ 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+ 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
+ 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+ 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+ 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+ 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+ 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+ 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
+ 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+ 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
+ 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+ 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
+ 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+ 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+ 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+ 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
+ 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+ 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
+ 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+ 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
+ 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+ 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
+};
+
+static uint32_t
+crc32(const void *buf, size_t sz)
+{
+ const uint8_t *p = (const uint8_t *)buf;
+ uint32_t crc = ~0U;
+
+ while (sz--)
+ crc = crc32_tab[(crc ^ *p++) & 0xff] ^ (crc >> 8);
+ return (crc ^ ~0U);
+}
+
+static u_int
+gpt_tblsz(u_int parts, u_int secsz)
+{
+ u_int ents;
+
+ ents = secsz / sizeof(struct gpt_ent);
+ return ((parts + ents - 1) / ents);
+}
+
static u_int
gpt_metadata(u_int where, u_int parts, u_int secsz)
{
- u_int ents, secs;
+ u_int secs;
if (where != SCHEME_META_IMG_START && where != SCHEME_META_IMG_START)
return (0);
- ents = secsz / sizeof(struct gpt_ent);
- secs = (parts + ents - 1) / ents;
+ secs = gpt_tblsz(parts, secsz);
secs += (where == SCHEME_META_IMG_START) ? 2 : 1;
return (secs);
}
static int
-gpt_write(int fd __unused, off_t imgsz __unused, u_int parts __unused,
- u_int secsz __unused)
+gpt_filewrite(int fd, off_t ofs, void *buf, ssize_t bufsz)
+{
+
+ if (lseek(fd, ofs, SEEK_SET) != ofs)
+ return (errno);
+ if (write(fd, buf, bufsz) != bufsz)
+ return (errno);
+ return (0);
+}
+
+static int
+gpt_write_pmbr(int fd, off_t nblocks, u_int secsz)
+{
+ u_char *pmbr;
+ uint32_t secs;
+ int error;
+
+ secs = (nblocks > UINT32_MAX) ? UINT32_MAX : nblocks;
+
+ pmbr = malloc(secsz);
+ if (pmbr == NULL)
+ return (errno);
+ memset(pmbr, 0, secsz);
+ pmbr[DOSPARTOFF + 2] = 2;
+ pmbr[DOSPARTOFF + 4] = 0xee;
+ pmbr[DOSPARTOFF + 5] = 0xff;
+ pmbr[DOSPARTOFF + 6] = 0xff;
+ pmbr[DOSPARTOFF + 7] = 0xff;
+ le32enc(pmbr + DOSPARTOFF + 8, 1);
+ le32enc(pmbr + DOSPARTOFF + 12, secs);
+ le16enc(pmbr + DOSMAGICOFFSET, DOSMAGIC);
+ error = gpt_filewrite(fd, 0, pmbr, secsz);
+ free(pmbr);
+ return (error);
+}
+
+static struct gpt_ent *
+gpt_mktbl(u_int tblsz, u_int secsz)
+{
+ struct gpt_ent *tbl, *ent;
+ struct part *part;
+ uint64_t partsize;
+
+ tbl = calloc(tblsz, secsz);
+ if (tbl == NULL)
+ return (NULL);
+
+ STAILQ_FOREACH(part, &partlist, link) {
+ ent = tbl + part->index;
+ memcpy(&ent->ent_type, ALIAS_TYPE2PTR(part->type),
+ sizeof(uuid_t));
+ uuidgen(&ent->ent_uuid, 1);
+ ent->ent_lba_start = part->offset / secsz;
+ partsize = part->size / secsz;
+ ent->ent_lba_end = ent->ent_lba_start + partsize - 1;
+ /* TODO add support for labels */
+ }
+ return (tbl);
+}
+
+static int
+gpt_write_hdr(int fd, struct gpt_hdr *hdr, uint64_t self, uint64_t alt,
+ uint64_t tbl, u_int secsz)
+{
+
+ hdr->hdr_lba_self = self;
+ hdr->hdr_lba_alt = alt;
+ hdr->hdr_lba_table = tbl;
+ hdr->hdr_crc_self = 0;
+ hdr->hdr_crc_self = crc32(hdr, hdr->hdr_size);
+ return (gpt_filewrite(fd, self * secsz, hdr, secsz));
+}
+
+static int
+gpt_write(int fd, off_t imgsz, u_int parts, u_int secsz)
{
- return (ENOSYS);
+ struct gpt_ent *tbl;
+ struct gpt_hdr *hdr;
+ off_t nblocks;
+ u_int tblsz;
+ int error;
+
+ nblocks = imgsz / secsz;
+
+ /* PMBR */
+ error = gpt_write_pmbr(fd, nblocks, secsz);
+ if (error)
+ return (error);
+
+ /* GPT table(s) */
+ tblsz = gpt_tblsz(parts, secsz);
+ tbl = gpt_mktbl(tblsz, secsz);
+ if (tbl == NULL)
+ return (errno);
+ error = gpt_filewrite(fd, 2 * secsz, tbl, tblsz * secsz);
+ if (error)
+ goto out;
+ error = gpt_filewrite(fd, imgsz - (tblsz + 1) * secsz, tbl,
+ tblsz * secsz);
+ if (error)
+ goto out;
+
+ /* GPT header(s) */
+ hdr = malloc(secsz);
+ if (hdr == NULL) {
+ error = errno;
+ goto out;
+ }
+ memset(hdr, 0, secsz);
+ memcpy(hdr->hdr_sig, GPT_HDR_SIG, sizeof(hdr->hdr_sig));
+ hdr->hdr_revision = GPT_HDR_REVISION;
+ hdr->hdr_size = offsetof(struct gpt_hdr, padding);
+ hdr->hdr_lba_start = 2 + tblsz;
+ hdr->hdr_lba_end = nblocks - tblsz - 1;
+ uuidgen(&hdr->hdr_uuid, 1);
+ hdr->hdr_entries = parts;
+ hdr->hdr_entsz = sizeof(struct gpt_ent);
+ hdr->hdr_crc_table = crc32(tbl, hdr->hdr_entries * hdr->hdr_entsz);
+ error = gpt_write_hdr(fd, hdr, 1, nblocks - 1, 2, secsz);
+ if (!error)
+ error = gpt_write_hdr(fd, hdr, nblocks - 1, 1,
+ nblocks - tblsz -1, secsz);
+ free(hdr);
+
+ out:
+ free(tbl);
+ return (error);
}
static struct mkimg_scheme gpt_scheme = {
Modified: user/marcel/mkimg/mkimg.h
==============================================================================
--- user/marcel/mkimg/mkimg.h Fri Mar 21 01:34:19 2014 (r263460)
+++ user/marcel/mkimg/mkimg.h Fri Mar 21 03:27:42 2014 (r263461)
@@ -41,6 +41,7 @@ struct part {
#define PART_KIND_PIPE 2
#define PART_KIND_SIZE 3
u_int index; /* Partition index (0-based). */
+ uintptr_t type; /* Scheme-specific partition type. */
off_t offset; /* Byte-offset of partition in image. */
off_t size; /* Size in bytes of partition. */
};
Modified: user/marcel/mkimg/scheme.c
==============================================================================
--- user/marcel/mkimg/scheme.c Fri Mar 21 01:34:19 2014 (r263460)
+++ user/marcel/mkimg/scheme.c Fri Mar 21 03:27:42 2014 (r263461)
@@ -85,7 +85,7 @@ scheme_check_part(struct part *p)
}
if (alias == NULL)
return (EINVAL);
-
+ p->type = iter->type;
return (0);
}
Modified: user/marcel/mkimg/scheme.h
==============================================================================
--- user/marcel/mkimg/scheme.h Fri Mar 21 01:34:19 2014 (r263460)
+++ user/marcel/mkimg/scheme.h Fri Mar 21 03:27:42 2014 (r263461)
@@ -33,9 +33,11 @@
struct mkimg_alias {
const char *name;
- uintptr_t tp;
-#define ALIAS_PTR(p) (uintptr_t)(p)
-#define ALIAS_INT(i) (uintptr_t)(i)
+ uintptr_t type;
+#define ALIAS_PTR2TYPE(p) (uintptr_t)(p)
+#define ALIAS_INT2TYPE(i) (i)
+#define ALIAS_TYPE2PTR(p) (void *)(p)
+#define ALIAS_TYPE2INT(i) (i)
};
struct mkimg_scheme {
More information about the svn-src-user
mailing list