Changeset 99c23405 in mainline for uspace/lib/label/src/gpt.c

Timestamp:

2015-07-04T15:18:06Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

603c1d1f

Parents:

6bc542b

Message:

Persistent partition table modification when creating or deleting partition.

File:

• uspace/lib/label/src/gpt.c (modified) (9 diffs)

uspace/lib/label/src/gpt.c

@@ -54 +54 @@
 static int gpt_part_destroy(label_part_t *);
 
+static void gpt_unused_pte(gpt_entry_t *);
+static int gpt_part_to_pte(label_part_t *, gpt_entry_t *);
 static int gpt_pte_to_part(label_t *, gpt_entry_t *, int);
+static int gpt_pte_update(label_t *, gpt_entry_t *, int);
 
 const uint8_t efi_signature[8] = {
@@ -77 +80 @@
 {
         label_t *label = NULL;
-        gpt_header_t *gpt_hdr = NULL;
+        gpt_header_t *gpt_hdr[2];
         gpt_entry_t *eptr;
         uint8_t *etable = NULL;
@@ -84 +87 @@
         uint32_t esize;
         uint32_t bcnt;
-        uint64_t ba;
+        uint64_t ptba[2];
+        uint64_t h1ba;
         uint32_t entry;
         uint64_t ba_min, ba_max;
-        int i;
+        int i, j;
         int rc;
 
+        gpt_hdr[0] = NULL;
+        gpt_hdr[1] = NULL;
+
         rc = block_get_bsize(sid, &bsize);
         if (rc != EOK) {
@@ -101 +108 @@
         }
 
-        gpt_hdr = calloc(1, bsize);
-        if (gpt_hdr == NULL) {
+        gpt_hdr[0] = calloc(1, bsize);
+        if (gpt_hdr[0] == NULL) {
                 rc = ENOMEM;
                 goto error;
         }
 
-        rc = block_read_direct(sid, GPT_HDR_BA, 1, gpt_hdr);
+        gpt_hdr[1] = calloc(1, bsize);
+        if (gpt_hdr[1] == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        rc = block_read_direct(sid, GPT_HDR_BA, 1, gpt_hdr[0]);
+        if (rc != EOK) {
+                rc = EIO;
+                goto error;
+        }
+
+        h1ba = uint64_t_le2host(gpt_hdr[0]->alternate_lba);
+
+        rc = block_read_direct(sid, h1ba, 1, gpt_hdr[1]);
         if (rc != EOK) {
                 rc = EIO;
@@ -119 +140 @@
         list_initialize(&label->parts);
 
-        for (i = 0; i < 8; ++i) {
-                if (gpt_hdr->efi_signature[i] != efi_signature[i]) {
-                        rc = EINVAL;
-                        goto error;
+        for (j = 0; j < 2; j++) {
+                for (i = 0; i < 8; ++i) {
+                        if (gpt_hdr[j]->efi_signature[i] != efi_signature[i]) {
+                                rc = EINVAL;
+                                goto error;
+                        }
                 }
         }
 
-        num_entries = uint32_t_le2host(gpt_hdr->num_entries);
-        esize = uint32_t_le2host(gpt_hdr->entry_size);
+        num_entries = uint32_t_le2host(gpt_hdr[0]->num_entries);
+        esize = uint32_t_le2host(gpt_hdr[0]->entry_size);
         bcnt = (num_entries + esize - 1) / esize;
-        ba = uint64_t_le2host(gpt_hdr->entry_lba);
-        ba_min = uint64_t_le2host(gpt_hdr->first_usable_lba);
-        ba_max = uint64_t_le2host(gpt_hdr->last_usable_lba);
+        ptba[0] = uint64_t_le2host(gpt_hdr[0]->entry_lba);
+        ptba[1] = uint64_t_le2host(gpt_hdr[1]->entry_lba);
+        ba_min = uint64_t_le2host(gpt_hdr[0]->first_usable_lba);
+        ba_max = uint64_t_le2host(gpt_hdr[0]->last_usable_lba);
 
         if (num_entries < 1) {
@@ -154 +178 @@
         }
 
-        rc = block_read_direct(sid, ba, bcnt, etable);
+        rc = block_read_direct(sid, ptba[0], bcnt, etable);
         if (rc != EOK) {
                 rc = EIO;
@@ -169 +193 @@
         free(etable);
         etable = NULL;
-        free(gpt_hdr);
-        gpt_hdr = NULL;
+        free(gpt_hdr[0]);
+        gpt_hdr[0] = NULL;
+        free(gpt_hdr[1]);
+        gpt_hdr[1] = NULL;
 
         label->ops = &gpt_label_ops;
         label->ltype = lt_gpt;
+        label->svcid = sid;
         label->ablock0 = ba_min;
         label->anblocks = ba_max - ba_min + 1;
+        label->pri_entries = num_entries;
+        label->block_size = bsize;
+
+        label->lt.gpt.ptable_ba[0] = ptba[0];
+        label->lt.gpt.ptable_ba[1] = ptba[1];
+        label->lt.gpt.esize = esize;
+
         *rlabel = label;
         return EOK;
 error:
         free(etable);
-        free(gpt_hdr);
+        free(gpt_hdr[0]);
+        free(gpt_hdr[1]);
         free(label);
         return rc;
@@ -243 +278 @@
 {
         label_part_t *part;
+        gpt_entry_t pte;
+        int rc;
 
         part = calloc(1, sizeof(label_part_t));
-        if (part == NULL)
-                return ENOMEM;
+        if (part == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
 
         /* XXX Verify index, block0, nblocks */
 
+        if (pspec->index < 1 || pspec->index > label->pri_entries) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        /* XXX Check if index is used */
+
+        part->label = label;
         part->index = pspec->index;
         part->block0 = pspec->block0;
         part->nblocks = pspec->nblocks;
-
-        /* XXX Modify partition table */
-
-        part->label = label;
+        part->ptype = pspec->ptype;
+
+        /* Prepare partition table entry */
+        rc = gpt_part_to_pte(part, &pte);
+        if (rc != EOK) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        /* Modify partition tables */
+        rc = gpt_pte_update(label, &pte, pspec->index - 1);
+        if (rc != EOK) {
+                rc = EIO;
+                goto error;
+        }
+
         list_append(&part->llabel, &label->parts);
 
         *rpart = part;
         return EOK;
+error:
+        free(part);
+        return rc;
 }
 
 static int gpt_part_destroy(label_part_t *part)
 {
-        return ENOTSUP;
+        gpt_entry_t pte;
+        int rc;
+
+        /* Prepare unused partition table entry */
+        gpt_unused_pte(&pte);
+
+        /* Modify partition tables */
+        rc = gpt_pte_update(part->label, &pte, part->index - 1);
+        if (rc != EOK)
+                return EIO;
+
+        list_remove(&part->llabel);
+        free(part);
+        return EOK;
+}
+
+static void gpt_unused_pte(gpt_entry_t *pte)
+{
+        memset(pte, 0, sizeof(gpt_entry_t));
+}
+
+static int gpt_part_to_pte(label_part_t *part, gpt_entry_t *pte)
+{
+        uint64_t eblock;
+
+        eblock = part->block0 + part->nblocks - 1;
+        if (eblock < part->block0)
+                return EINVAL;
+
+        memset(pte, 0, sizeof(gpt_entry_t));
+        pte->part_type[0] = 0x12;
+        pte->part_id[0] = 0x34;
+        pte->start_lba = host2uint64_t_le(part->block0);
+        pte->end_lba = host2uint64_t_le(eblock);
+//      pte->attributes
+//      pte->part_name
+        return EOK;
 }
 
@@ -301 +399 @@
 }
 
+/** Update partition table entry at specified index.
+ *
+ * Replace partition entry at index @a index with the contents of
+ * @a pte.
+ */
+static int gpt_pte_update(label_t *label, gpt_entry_t *pte, int index)
+{
+        size_t pos;
+        size_t offs;
+        uint64_t ba;
+        uint8_t *buf;
+        gpt_entry_t *e;
+        int i;
+        int rc;
+
+        pos = index * label->lt.gpt.esize;
+        offs = pos % label->block_size;
+
+        buf = calloc(1, label->block_size);
+        if (buf == NULL)
+                return ENOMEM;
+
+        /* For both partition tables: read, modify, write */
+        for (i = 0; i < 2; i++) {
+                ba = label->lt.gpt.ptable_ba[i] +
+                    pos / label->block_size;
+
+                rc = block_read_direct(label->svcid, ba, 1, buf);
+                if (rc != EOK) {
+                        rc = EIO;
+                        goto error;
+                }
+
+                /* Replace single entry */
+                e = (gpt_entry_t *)(&buf[offs]);
+                *e = *pte;
+
+                rc = block_write_direct(label->svcid, ba, 1, buf);
+                if (rc != EOK) {
+                        rc = EIO;
+                        goto error;
+                }
+        }
+
+        free(buf);
+        return EOK;
+error:
+        free(buf);
+        return rc;
+}
+
 /** @}
  */