]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - super-ddf.c
DDF: Don't fail compare_super_ddf due to re-configure changes.
[thirdparty/mdadm.git] / super-ddf.c
index 3673cb33cfeebd17c7fa1a86089a2bbc36d85a3a..37ef665acd1dafd886b92f597d4d9c9085028cec 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * mdadm - manage Linux "md" devices aka RAID arrays.
  *
- * Copyright (C) 2006-2009 Neil Brown <neilb@suse.de>
+ * Copyright (C) 2006-2014 Neil Brown <neilb@suse.de>
  *
  *
  *    This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
  *    Author: Neil Brown
  *    Email: <neil@brown.name>
  *
- * Specifications for DDF takes from Common RAID DDF Specification Revision 1.2
+ * Specifications for DDF taken from Common RAID DDF Specification Revision 1.2
  * (July 28 2006).  Reused by permission of SNIA.
  */
 
@@ -237,8 +237,10 @@ struct phys_disk {
                be32    refnum;
                be16    type;
                be16    state;
-               be64    config_size; /* DDF structures must be after here */
-               char    path[18];       /* another horrible structure really */
+               be64    config_size;    /* DDF structures must be after here */
+               char    path[18];       /* Another horrible structure really
+                                        * but is "used for information
+                                        * purposes only" */
                __u8    pad[6];
        } entries[0];
 };
@@ -432,28 +434,34 @@ struct bad_block_log {
  * and reconstructed for writing.  This means that we only need
  * to make config changes once and they are automatically
  * propagated to all devices.
- * Note that the ddf_super has space of the conf and disk data
- * for this disk and also for a list of all such data.
- * The list is only used for the superblock that is being
- * built in Create or Assemble to describe the whole array.
+ * The global (config and disk data) records are each in a list
+ * of separate data structures.  When writing we find the entry
+ * or entries applicable to the particular device.
  */
 struct ddf_super {
-       struct ddf_header anchor, primary, secondary;
+       struct ddf_header       anchor, primary, secondary;
        struct ddf_controller_data controller;
-       struct ddf_header *active;
+       struct ddf_header       *active;
        struct phys_disk        *phys;
        struct virtual_disk     *virt;
        char                    *conf;
-       int pdsize, vdsize;
-       unsigned int max_part, mppe, conf_rec_len;
-       int currentdev;
-       int updates_pending;
+       int                     pdsize, vdsize;
+       unsigned int            max_part, mppe, conf_rec_len;
+       int                     currentdev;
+       int                     updates_pending;
        struct vcl {
                union {
                        char space[512];
                        struct {
                                struct vcl      *next;
                                unsigned int    vcnum; /* index into ->virt */
+                               /* For an array with a secondary level there are
+                                * multiple vd_config structures, all with the same
+                                * guid but with different sec_elmnt_seq.
+                                * One of these structures is in 'conf' below.
+                                * The others are in other_bvds, not in any
+                                * particular order.
+                                */
                                struct vd_config **other_bvds;
                                __u64           *block_sizes; /* NULL if all the same */
                        };
@@ -486,12 +494,48 @@ struct ddf_super {
        } *dlist, *add_list;
 };
 
+#ifndef MDASSEMBLE
+static int load_super_ddf_all(struct supertype *st, int fd,
+                             void **sbp, char *devname);
+static int get_svd_state(const struct ddf_super *, const struct vcl *);
+static int
+validate_geometry_ddf_container(struct supertype *st,
+                               int level, int layout, int raiddisks,
+                               int chunk, unsigned long long size,
+                               unsigned long long data_offset,
+                               char *dev, unsigned long long *freesize,
+                               int verbose);
+
+static int validate_geometry_ddf_bvd(struct supertype *st,
+                                    int level, int layout, int raiddisks,
+                                    int *chunk, unsigned long long size,
+                                    unsigned long long data_offset,
+                                    char *dev, unsigned long long *freesize,
+                                    int verbose);
+#endif
+
+static void free_super_ddf(struct supertype *st);
+static int all_ff(const char *guid);
+static unsigned int get_pd_index_from_refnum(const struct vcl *vc,
+                                            be32 refnum, unsigned int nmax,
+                                            const struct vd_config **bvd,
+                                            unsigned int *idx);
+static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info, char *map);
+static void uuid_from_ddf_guid(const char *guid, int uuid[4]);
+static void uuid_from_super_ddf(struct supertype *st, int uuid[4]);
+static void _ddf_array_name(char *name, const struct ddf_super *ddf, int i);
+static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info, char *map);
+static int init_super_ddf_bvd(struct supertype *st,
+                             mdu_array_info_t *info,
+                             unsigned long long size,
+                             char *name, char *homehost,
+                             int *uuid, unsigned long long data_offset);
+
 #ifndef offsetof
 #define offsetof(t,f) ((size_t)&(((t*)0)->f))
 #endif
 
 #if DEBUG
-static int all_ff(const char *guid);
 static void pr_state(struct ddf_super *ddf, const char *msg)
 {
        unsigned int i;
@@ -511,6 +555,8 @@ static void pr_state(const struct ddf_super *ddf, const char *msg) {}
 
 static void _ddf_set_updates_pending(struct ddf_super *ddf, const char *func)
 {
+       if (ddf->updates_pending)
+               return;
        ddf->updates_pending = 1;
        ddf->active->seq = cpu_to_be32((be32_to_cpu(ddf->active->seq)+1));
        pr_state(ddf, func);
@@ -518,11 +564,6 @@ static void _ddf_set_updates_pending(struct ddf_super *ddf, const char *func)
 
 #define ddf_set_updates_pending(x) _ddf_set_updates_pending((x), __func__)
 
-static unsigned int get_pd_index_from_refnum(const struct vcl *vc,
-                                            be32 refnum, unsigned int nmax,
-                                            const struct vd_config **bvd,
-                                            unsigned int *idx);
-
 static be32 calc_crc(void *buf, int len)
 {
        /* crcs are always at the same place as in the ddf_header */
@@ -533,7 +574,7 @@ static be32 calc_crc(void *buf, int len)
 
        newcrc = crc32(0, buf, len);
        ddf->crc = oldcrc;
-       /* The crc is store (like everything) bigendian, so convert
+       /* The crc is stored (like everything) bigendian, so convert
         * here for simplicity
         */
        return cpu_to_be32(newcrc);
@@ -982,16 +1023,16 @@ static int load_ddf_local(int fd, struct ddf_super *super,
        unsigned int i;
        unsigned int confsec;
        int vnum;
-       unsigned int max_virt_disks = be16_to_cpu
-               (super->active->max_vd_entries);
+       unsigned int max_virt_disks =
+               be16_to_cpu(super->active->max_vd_entries);
        unsigned long long dsize;
 
        /* First the local disk info */
        if (posix_memalign((void**)&dl, 512,
-                      sizeof(*dl) +
-                      (super->max_part) * sizeof(dl->vlist[0])) != 0) {
+                          sizeof(*dl) +
+                          (super->max_part) * sizeof(dl->vlist[0])) != 0) {
                pr_err("%s could not allocate disk info buffer\n",
-                       __func__);
+                      __func__);
                return 1;
        }
 
@@ -1050,7 +1091,7 @@ static int load_ddf_local(int fd, struct ddf_super *super,
                        if (dl->spare)
                                continue;
                        if (posix_memalign((void**)&dl->spare, 512,
-                                      super->conf_rec_len*512) != 0) {
+                                          super->conf_rec_len*512) != 0) {
                                pr_err("%s could not allocate spare info buf\n",
                                       __func__);
                                return 1;
@@ -1060,7 +1101,9 @@ static int load_ddf_local(int fd, struct ddf_super *super,
                        continue;
                }
                if (!be32_eq(vd->magic, DDF_VD_CONF_MAGIC))
+                       /* Must be vendor-unique - I cannot handle those */
                        continue;
+
                for (vcl = super->conflist; vcl; vcl = vcl->next) {
                        if (memcmp(vcl->conf.guid,
                                   vd->guid, DDF_GUID_LEN) == 0)
@@ -1079,8 +1122,8 @@ static int load_ddf_local(int fd, struct ddf_super *super,
                                continue;
                } else {
                        if (posix_memalign((void**)&vcl, 512,
-                                      (super->conf_rec_len*512 +
-                                       offsetof(struct vcl, conf))) != 0) {
+                                          (super->conf_rec_len*512 +
+                                           offsetof(struct vcl, conf))) != 0) {
                                pr_err("%s could not allocate vcl buf\n",
                                       __func__);
                                return 1;
@@ -1109,13 +1152,6 @@ static int load_ddf_local(int fd, struct ddf_super *super,
        return 0;
 }
 
-#ifndef MDASSEMBLE
-static int load_super_ddf_all(struct supertype *st, int fd,
-                             void **sbp, char *devname);
-#endif
-
-static void free_super_ddf(struct supertype *st);
-
 static int load_super_ddf(struct supertype *st, int fd,
                          char *devname)
 {
@@ -1126,7 +1162,7 @@ static int load_super_ddf(struct supertype *st, int fd,
        if (get_dev_size(fd, devname, &dsize) == 0)
                return 1;
 
-       if (!st->ignore_hw_compat && test_partition(fd))
+       if (test_partition(fd))
                /* DDF is not allowed on partitions */
                return 1;
 
@@ -1240,7 +1276,7 @@ static void free_super_ddf(struct supertype *st)
 
 static struct supertype *match_metadata_desc_ddf(char *arg)
 {
-       /* 'ddf' only support containers */
+       /* 'ddf' only supports containers */
        struct supertype *st;
        if (strcmp(arg, "ddf") != 0 &&
            strcmp(arg, "default") != 0
@@ -1508,19 +1544,13 @@ static void examine_super_ddf(struct supertype *st, char *homehost)
        printf(" Container GUID : "); print_guid(sb->anchor.guid, 1);
        printf("\n");
        printf("            Seq : %08x\n", be32_to_cpu(sb->active->seq));
-       printf("  Redundant hdr : %s\n", be32_eq(sb->secondary.magic,
+       printf("  Redundant hdr : %s\n", (be32_eq(sb->secondary.magic,
                                                 DDF_HEADER_MAGIC)
-              ?"yes" : "no");
+                                         ?"yes" : "no"));
        examine_vds(sb);
        examine_pds(sb);
 }
 
-static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info, char *map);
-
-static void uuid_from_ddf_guid(const char *guid, int uuid[4]);
-static void uuid_from_super_ddf(struct supertype *st, int uuid[4]);
-static void _ddf_array_name(char *name, const struct ddf_super *ddf, int i);
-
 static unsigned int get_vd_num_of_subarray(struct supertype *st)
 {
        /*
@@ -1566,7 +1596,8 @@ static void brief_examine_super_ddf(struct supertype *st, int verbose)
 
 static void brief_examine_subarrays_ddf(struct supertype *st, int verbose)
 {
-       /* We just write a generic DDF ARRAY entry
+       /* We write a DDF ARRAY member entry for each vd, identifying container
+        * by uuid and member by unit number and uuid.
         */
        struct ddf_super *ddf = st->sb;
        struct mdinfo info;
@@ -1620,7 +1651,7 @@ static int copy_metadata_ddf(struct supertype *st, int from, int to)
         * So it is easiest to find the earliest of primary and
         * secondary, and copy everything from there.
         *
-        * Anchor is 512 from end It contains primary_lba and secondary_lba
+        * Anchor is 512 from end It contains primary_lba and secondary_lba
         * we choose one of those
         */
 
@@ -1745,7 +1776,8 @@ static int match_home_ddf(struct supertype *st, char *homehost)
 {
        /* It matches 'this' host if the controller is a
         * Linux-MD controller with vendor_data matching
-        * the hostname
+        * the hostname.  It would be nice if we could
+        * test against controller found in /sys or somewhere...
         */
        struct ddf_super *ddf = st->sb;
        unsigned int len;
@@ -1766,11 +1798,14 @@ static int find_index_in_bvd(const struct ddf_super *ddf,
                             unsigned int *n_bvd)
 {
        /*
-        * Find the index of the n-th valid physical disk in this BVD
+        * Find the index of the n-th valid physical disk in this BVD.
+        * Unused entries can be sprinkled in with the used entries,
+        * but don't count.
         */
        unsigned int i, j;
-       for (i = 0, j = 0; i < ddf->mppe &&
-                    j < be16_to_cpu(conf->prim_elmnt_count); i++) {
+       for (i = 0, j = 0;
+            i < ddf->mppe && j < be16_to_cpu(conf->prim_elmnt_count);
+            i++) {
                if (be32_to_cpu(conf->phys_refnum[i]) != 0xffffffff) {
                        if (n == j) {
                                *n_bvd = i;
@@ -1784,6 +1819,13 @@ static int find_index_in_bvd(const struct ddf_super *ddf,
        return 0;
 }
 
+/* Given a member array instance number, and a raid disk within that instance,
+ * find the vd_config structure.  The offset of the given disk in the phys_refnum
+ * table is returned in n_bvd.
+ * For two-level members with a secondary raid level the vd_config for
+ * the appropriate BVD is returned.
+ * The return value is always &vlc->conf, where vlc is returned in last pointer.
+ */
 static struct vd_config *find_vdcr(struct ddf_super *ddf, unsigned int inst,
                                   unsigned int n,
                                   unsigned int *n_bvd, struct vcl **vcl)
@@ -1885,8 +1927,6 @@ static void uuid_from_super_ddf(struct supertype *st, int uuid[4])
                uuid_from_ddf_guid(ddf->anchor.guid, uuid);
 }
 
-static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info, char *map);
-
 static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info, char *map)
 {
        struct ddf_super *ddf = st->sb;
@@ -1910,9 +1950,10 @@ static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info, char *m
        info->array.chunk_size    = 0;
        info->container_enough    = 1;
 
-       info->disk.major = 0;
-       info->disk.minor = 0;
+       info->disk.major          = 0;
+       info->disk.minor          = 0;
        if (ddf->dlist) {
+               struct phys_disk_entry *pde = NULL;
                info->disk.number = be32_to_cpu(ddf->dlist->disk.refnum);
                info->disk.raid_disk = find_phys(ddf, ddf->dlist->disk.refnum);
 
@@ -1920,12 +1961,21 @@ static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info, char *m
                                                  entries[info->disk.raid_disk].
                                                  config_size);
                info->component_size = ddf->dlist->size - info->data_offset;
+               if (info->disk.raid_disk >= 0)
+                       pde = ddf->phys->entries + info->disk.raid_disk;
+               if (pde &&
+                   !(be16_to_cpu(pde->state) & DDF_Failed))
+                       info->disk.state = (1 << MD_DISK_SYNC) | (1 << MD_DISK_ACTIVE);
+               else
+                       info->disk.state = 1 << MD_DISK_FAULTY;
+
+               info->events = be32_to_cpu(ddf->active->seq);
        } else {
                info->disk.number = -1;
                info->disk.raid_disk = -1;
 //             info->disk.raid_disk = find refnum in the table and use index;
+               info->disk.state = (1 << MD_DISK_SYNC) | (1 << MD_DISK_ACTIVE);
        }
-       info->disk.state = (1 << MD_DISK_SYNC) | (1 << MD_DISK_ACTIVE);
 
        info->recovery_start = MaxSector;
        info->reshape_active = 0;
@@ -1943,8 +1993,6 @@ static void getinfo_super_ddf(struct supertype *st, struct mdinfo *info, char *m
                int i;
                for (i = 0 ; i < map_disks; i++) {
                        if (i < info->array.raid_disks &&
-                           (be16_to_cpu(ddf->phys->entries[i].state)
-                            & DDF_Online) &&
                            !(be16_to_cpu(ddf->phys->entries[i].state)
                              & DDF_Failed))
                                map[i] = 1;
@@ -2017,7 +2065,12 @@ static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info, cha
                info->disk.raid_disk = cd + conf->sec_elmnt_seq
                        * be16_to_cpu(conf->prim_elmnt_count);
                info->disk.number = dl->pdnum;
-               info->disk.state = (1<<MD_DISK_SYNC)|(1<<MD_DISK_ACTIVE);
+               info->disk.state = 0;
+               if (info->disk.number >= 0 &&
+                   (be16_to_cpu(ddf->phys->entries[info->disk.number].state) & DDF_Online) &&
+                   !(be16_to_cpu(ddf->phys->entries[info->disk.number].state) & DDF_Failed))
+                       info->disk.state = (1<<MD_DISK_SYNC)|(1<<MD_DISK_ACTIVE);
+               info->events = be32_to_cpu(ddf->active->seq);
        }
 
        info->container_member = ddf->currentconf->vcnum;
@@ -2094,7 +2147,7 @@ static int update_super_ddf(struct supertype *st, struct mdinfo *info,
 //     struct virtual_entry *ve = find_ve(ddf);
 
        /* we don't need to handle "force-*" or "assemble" as
-        * there is no need to 'trick' the kernel.  We the metadata is
+        * there is no need to 'trick' the kernel.  When the metadata is
         * first updated to activate the array, all the implied modifications
         * will just happen.
         */
@@ -2189,12 +2242,6 @@ static unsigned int find_vde_by_guid(const struct ddf_super *ddf,
 }
 #endif
 
-static int init_super_ddf_bvd(struct supertype *st,
-                             mdu_array_info_t *info,
-                             unsigned long long size,
-                             char *name, char *homehost,
-                             int *uuid, unsigned long long data_offset);
-
 static int init_super_ddf(struct supertype *st,
                          mdu_array_info_t *info,
                          unsigned long long size, char *name, char *homehost,
@@ -2211,12 +2258,12 @@ static int init_super_ddf(struct supertype *st,
         * We need to create the entire 'ddf' structure which includes:
         *  DDF headers - these are easy.
         *  Controller data - a Sector describing this controller .. not that
-        *                  this is a controller exactly.
+        *                    this is a controller exactly.
         *  Physical Disk Record - one entry per device, so
-        *                      leave plenty of space.
+        *                         leave plenty of space.
         *  Virtual Disk Records - again, just leave plenty of space.
-        *                   This just lists VDs, doesn't give details
-        *  Config records - describes the VDs that use this disk
+        *                         This just lists VDs, doesn't give details.
+        *  Config records - describe the VDs that use this disk
         *  DiskData  - describes 'this' device.
         *  BadBlockManagement - empty
         *  Diag Space - empty
@@ -2248,8 +2295,6 @@ static int init_super_ddf(struct supertype *st,
                return 0;
        }
        memset(ddf, 0, sizeof(*ddf));
-       ddf->dlist = NULL; /* no physical disks yet */
-       ddf->conflist = NULL; /* No virtual disks yet */
        st->sb = ddf;
 
        if (info == NULL) {
@@ -2261,8 +2306,7 @@ static int init_super_ddf(struct supertype *st,
         * start 32MB from the end, and put the primary header there.
         * Don't do secondary for now.
         * We don't know exactly where that will be yet as it could be
-        * different on each device.  To just set up the lengths.
-        *
+        * different on each device.  So just set up the lengths.
         */
 
        ddf->anchor.magic = DDF_HEADER_MAGIC;
@@ -2284,18 +2328,18 @@ static int init_super_ddf(struct supertype *st,
        ddf->anchor.workspace_len = cpu_to_be32(32768); /* Must be reserved */
        /* Put this at bottom of 32M reserved.. */
        ddf->anchor.workspace_lba = cpu_to_be64(~(__u64)0);
-       max_phys_disks = 1023;   /* Should be enough */
+       max_phys_disks = 1023;   /* Should be enough, 4095 is also allowed */
        ddf->anchor.max_pd_entries = cpu_to_be16(max_phys_disks);
-       max_virt_disks = 255;
-       ddf->anchor.max_vd_entries = cpu_to_be16(max_virt_disks); /* ?? */
-       ddf->anchor.max_partitions = cpu_to_be16(64); /* ?? */
+       max_virt_disks = 255; /* 15, 63, 255, 1024, 4095 are all allowed */
+       ddf->anchor.max_vd_entries = cpu_to_be16(max_virt_disks);
        ddf->max_part = 64;
-       ddf->mppe = 256;
+       ddf->anchor.max_partitions = cpu_to_be16(ddf->max_part);
+       ddf->mppe = 256; /* 16, 64, 256, 1024, 4096 are all allowed */
        ddf->conf_rec_len = 1 + ROUND_UP(ddf->mppe * (4+8), 512)/512;
        ddf->anchor.config_record_len = cpu_to_be16(ddf->conf_rec_len);
        ddf->anchor.max_primary_element_entries = cpu_to_be16(ddf->mppe);
        memset(ddf->anchor.pad3, 0xff, 54);
-       /* controller sections is one sector long immediately
+       /* Controller section is one sector long immediately
         * after the ddf header */
        sector = 1;
        ddf->anchor.controller_section_offset = cpu_to_be32(sector);
@@ -2439,17 +2483,18 @@ static int cmp_extent(const void *av, const void *bv)
 
 static struct extent *get_extents(struct ddf_super *ddf, struct dl *dl)
 {
-       /* find a list of used extents on the give physical device
+       /* Find a list of used extents on the give physical device
         * (dnum) of the given ddf.
         * Return a malloced array of 'struct extent'
-
-        * FIXME ignore DDF_Legacy devices?
-
         */
        struct extent *rv;
        int n = 0;
        unsigned int i;
-       __u16 state = be16_to_cpu(ddf->phys->entries[dl->pdnum].state);
+       __u16 state;
+
+       if (dl->pdnum < 0)
+               return NULL;
+       state = be16_to_cpu(ddf->phys->entries[dl->pdnum].state);
 
        if ((state & (DDF_Online|DDF_Failed|DDF_Missing)) != DDF_Online)
                return NULL;
@@ -2594,14 +2639,11 @@ static int init_super_ddf_bvd(struct supertype *st,
        return 1;
 }
 
-
 #ifndef MDASSEMBLE
-static int get_svd_state(const struct ddf_super *, const struct vcl *);
-
 static void add_to_super_ddf_bvd(struct supertype *st,
                                 mdu_disk_info_t *dk, int fd, char *devname)
 {
-       /* fd and devname identify a device with-in the ddf container (st).
+       /* fd and devname identify a device within the ddf container (st).
         * dk identifies a location in the new BVD.
         * We need to find suitable free space in that device and update
         * the phys_refnum and lba_offset for the newly created vd_config.
@@ -2649,6 +2691,7 @@ static void add_to_super_ddf_bvd(struct supertype *st,
        if (ddf->currentconf->block_sizes)
                blocks = ddf->currentconf->block_sizes[dk->raid_disk];
 
+       /* First-fit */
        do {
                esize = ex[i].start - pos;
                if (esize >= blocks)
@@ -2703,7 +2746,32 @@ static unsigned int find_unused_pde(const struct ddf_super *ddf)
        return DDF_NOTFOUND;
 }
 
-/* add a device to a container, either while creating it or while
+static void _set_config_size(struct phys_disk_entry *pde, const struct dl *dl)
+{
+       __u64 cfs, t;
+       cfs = min(dl->size - 32*1024*2ULL, be64_to_cpu(dl->primary_lba));
+       t = be64_to_cpu(dl->secondary_lba);
+       if (t != ~(__u64)0)
+               cfs = min(cfs, t);
+       /*
+        * Some vendor DDF structures interpret workspace_lba
+        * very differently than we do: Make a sanity check on the value.
+        */
+       t = be64_to_cpu(dl->workspace_lba);
+       if (t < cfs) {
+               __u64 wsp = cfs - t;
+               if (wsp > 1024*1024*2ULL && wsp > dl->size / 16) {
+                       pr_err("%s: %x:%x: workspace size 0x%llx too big, ignoring\n",
+                              __func__, dl->major, dl->minor, wsp);
+               } else
+                       cfs = t;
+       }
+       pde->config_size = cpu_to_be64(cfs);
+       dprintf("%s: %x:%x config_size %llx, DDF structure is %llx blocks\n",
+               __func__, dl->major, dl->minor, cfs, dl->size-cfs);
+}
+
+/* Add a device to a container, either while creating it or while
  * expanding a pre-existing container
  */
 static int add_to_super_ddf(struct supertype *st,
@@ -2825,7 +2893,7 @@ static int add_to_super_ddf(struct supertype *st,
        if (ddf->dlist == NULL ||
            be64_to_cpu(ddf->dlist->secondary_lba) != ~(__u64)0)
                __calc_lba(dd, ddf->dlist, secondary_lba, 32);
-       pde->config_size = dd->workspace_lba;
+       _set_config_size(pde, dd);
 
        sprintf(pde->path, "%17.17s","Information: nil") ;
        memset(pde->pad, 0xff, 6);
@@ -2859,7 +2927,7 @@ static int remove_from_super_ddf(struct supertype *st, mdu_disk_info_t *dk)
                if (dl->major == dk->major &&
                    dl->minor == dk->minor)
                        break;
-       if (!dl)
+       if (!dl || dl->pdnum < 0)
                return -1;
 
        if (st->update_tail) {
@@ -2882,7 +2950,6 @@ static int remove_from_super_ddf(struct supertype *st, mdu_disk_info_t *dk)
  * called when creating a container or adding another device to a
  * container.
  */
-#define NULL_CONF_SZ   4096
 
 static int __write_ddf_structure(struct dl *d, struct ddf_super *ddf, __u8 type)
 {
@@ -2955,7 +3022,7 @@ static int __write_ddf_structure(struct dl *d, struct ddf_super *ddf, __u8 type)
                                        (const struct vd_config **)&vdc,
                                        &dummy);
                }
-               if (c) {
+               if (vdc) {
                        dprintf("writing conf record %i on disk %08x for %s/%u\n",
                                i, be32_to_cpu(d->disk.refnum),
                                guid_str(vdc->guid),
@@ -3062,7 +3129,7 @@ static int write_init_super_ddf(struct supertype *st)
        struct ddf_super *ddf = st->sb;
        struct vcl *currentconf = ddf->currentconf;
 
-       /* we are done with currentconf reset it to point st at the container */
+       /* We are done with currentconf - reset it so st refers to the container */
        ddf->currentconf = NULL;
 
        if (st->update_tail) {
@@ -3073,6 +3140,7 @@ static int write_init_super_ddf(struct supertype *st)
                unsigned int i;
 
                if (!currentconf) {
+                       /* Must be adding a physical disk to the container */
                        int len = (sizeof(struct phys_disk) +
                                   sizeof(struct phys_disk_entry));
 
@@ -3135,8 +3203,9 @@ static int reserve_space(struct supertype *st, int raiddisks,
 {
        /* Find 'raiddisks' spare extents at least 'size' big (but
         * only caring about multiples of 'chunk') and remember
-        * them.
-        * If the cannot be found, fail.
+        * them.   If size==0, find the largest size possible.
+        * Report available size in *freesize
+        * If space cannot be found, fail.
         */
        struct dl *dl;
        struct ddf_super *ddf = st->sb;
@@ -3216,21 +3285,6 @@ static int reserve_space(struct supertype *st, int raiddisks,
        return 1;
 }
 
-static int
-validate_geometry_ddf_container(struct supertype *st,
-                               int level, int layout, int raiddisks,
-                               int chunk, unsigned long long size,
-                               unsigned long long data_offset,
-                               char *dev, unsigned long long *freesize,
-                               int verbose);
-
-static int validate_geometry_ddf_bvd(struct supertype *st,
-                                    int level, int layout, int raiddisks,
-                                    int *chunk, unsigned long long size,
-                                    unsigned long long data_offset,
-                                    char *dev, unsigned long long *freesize,
-                                    int verbose);
-
 static int validate_geometry_ddf(struct supertype *st,
                                 int level, int layout, int raiddisks,
                                 int *chunk, unsigned long long size,
@@ -3252,7 +3306,8 @@ static int validate_geometry_ddf(struct supertype *st,
        if (*chunk == UnSet)
                *chunk = DEFAULT_CHUNK;
 
-       if (level == -1000000) level = LEVEL_CONTAINER;
+       if (level == LEVEL_NONE)
+               level = LEVEL_CONTAINER;
        if (level == LEVEL_CONTAINER) {
                /* Must be a fresh device to add to a container */
                return validate_geometry_ddf_container(st, level, layout,
@@ -3264,7 +3319,8 @@ static int validate_geometry_ddf(struct supertype *st,
 
        if (!dev) {
                mdu_array_info_t array = {
-                       .level = level, .layout = layout,
+                       .level = level,
+                       .layout = layout,
                        .raid_disks = raiddisks
                };
                struct vd_config conf;
@@ -3312,7 +3368,6 @@ static int validate_geometry_ddf(struct supertype *st,
                close(fd);
                if (sra && sra->array.major_version == -1 &&
                    strcmp(sra->text_version, "ddf") == 0) {
-
                        /* load super */
                        /* find space for 'n' devices. */
                        /* remember the devices */
@@ -3433,8 +3488,7 @@ static int validate_geometry_ddf_bvd(struct supertype *st,
                int dcnt = 0;
                if (minsize == 0)
                        minsize = 8;
-               for (dl = ddf->dlist; dl ; dl = dl->next)
-               {
+               for (dl = ddf->dlist; dl ; dl = dl->next) {
                        int found = 0;
                        pos = 0;
 
@@ -3482,7 +3536,8 @@ static int validate_geometry_ddf_bvd(struct supertype *st,
        e = get_extents(ddf, dl);
        maxsize = 0;
        i = 0;
-       if (e) do {
+       if (e)
+               do {
                        unsigned long long esize;
                        esize = e[i].start - pos;
                        if (esize >= maxsize)
@@ -3659,13 +3714,13 @@ static unsigned int get_pd_index_from_refnum(const struct vcl *vc,
 
        for (i = 0, j = 0 ; i < nmax ; i++) {
                /* j counts valid entries for this BVD */
-               if (be32_to_cpu(vc->conf.phys_refnum[i]) != 0xffffffff)
-                       j++;
                if (be32_eq(vc->conf.phys_refnum[i], refnum)) {
                        *bvd = &vc->conf;
                        *idx = i;
-                       return sec * cnt + j - 1;
+                       return sec * cnt + j;
                }
+               if (be32_to_cpu(vc->conf.phys_refnum[i]) != 0xffffffff)
+                       j++;
        }
        if (vc->other_bvds == NULL)
                goto bad;
@@ -3676,13 +3731,13 @@ static unsigned int get_pd_index_from_refnum(const struct vcl *vc,
                if (sec == DDF_UNUSED_BVD)
                        continue;
                for (i = 0, j = 0 ; i < nmax ; i++) {
-                       if (be32_to_cpu(vd->phys_refnum[i]) != 0xffffffff)
-                               j++;
                        if (be32_eq(vd->phys_refnum[i], refnum)) {
                                *bvd = vd;
                                *idx = i;
-                               return sec * cnt + j - 1;
+                               return sec * cnt + j;
                        }
+                       if (be32_to_cpu(vd->phys_refnum[i]) != 0xffffffff)
+                               j++;
                }
        }
 bad:
@@ -3704,8 +3759,7 @@ static struct mdinfo *container_content_ddf(struct supertype *st, char *subarray
        struct mdinfo *rest = NULL;
        struct vcl *vc;
 
-       for (vc = ddf->conflist ; vc ; vc=vc->next)
-       {
+       for (vc = ddf->conflist ; vc ; vc=vc->next) {
                unsigned int i;
                struct mdinfo *this;
                char *ep;
@@ -3731,7 +3785,7 @@ static struct mdinfo *container_content_ddf(struct supertype *st, char *subarray
                this->array.md_minor      = -1;
                this->array.major_version = -1;
                this->array.minor_version = -2;
-               this->safe_mode_delay = DDF_SAFE_MODE_DELAY;
+               this->safe_mode_delay     = DDF_SAFE_MODE_DELAY;
                cptr = (__u32 *)(vc->conf.guid + 16);
                this->array.ctime         = DECADE + __be32_to_cpu(*cptr);
                this->array.utime         = DECADE +
@@ -3750,9 +3804,9 @@ static struct mdinfo *container_content_ddf(struct supertype *st, char *subarray
                }
                _ddf_array_name(this->name, ddf, i);
                memset(this->uuid, 0, sizeof(this->uuid));
-               this->component_size = be64_to_cpu(vc->conf.blocks);
-               this->array.size = this->component_size / 2;
-               this->container_member = i;
+               this->component_size      = be64_to_cpu(vc->conf.blocks);
+               this->array.size          = this->component_size / 2;
+               this->container_member    = i;
 
                ddf->currentconf = vc;
                uuid_from_super_ddf(st, this->uuid);
@@ -3795,17 +3849,17 @@ static struct mdinfo *container_content_ddf(struct supertype *st, char *subarray
                                continue;
 
                        dev = xcalloc(1, sizeof(*dev));
-                       dev->next = this->devs;
-                       this->devs = dev;
+                       dev->next        = this->devs;
+                       this->devs       = dev;
 
                        dev->disk.number = be32_to_cpu(d->disk.refnum);
-                       dev->disk.major = d->major;
-                       dev->disk.minor = d->minor;
+                       dev->disk.major  = d->major;
+                       dev->disk.minor  = d->minor;
                        dev->disk.raid_disk = i;
-                       dev->disk.state = (1<<MD_DISK_SYNC)|(1<<MD_DISK_ACTIVE);
+                       dev->disk.state  = (1<<MD_DISK_SYNC)|(1<<MD_DISK_ACTIVE);
                        dev->recovery_start = MaxSector;
 
-                       dev->events = be32_to_cpu(ddf->primary.seq);
+                       dev->events      = be32_to_cpu(ddf->active->seq);
                        dev->data_offset =
                                be64_to_cpu(LBA_OFFSET(ddf, bvd)[iphys]);
                        dev->component_size = be64_to_cpu(bvd->blocks);
@@ -3873,7 +3927,7 @@ static int compare_super_ddf(struct supertype *st, struct supertype *tst)
        /*
         * return:
         *  0 same, or first was empty, and second was copied
-        *  1 second had wrong number
+        *  1 second had wrong magic number - but that isn't possible
         *  2 wrong uuid
         *  3 wrong other info
         */
@@ -3892,53 +3946,25 @@ static int compare_super_ddf(struct supertype *st, struct supertype *tst)
        if (memcmp(first->anchor.guid, second->anchor.guid, DDF_GUID_LEN) != 0)
                return 2;
 
-       if (!be32_eq(first->anchor.seq, second->anchor.seq)) {
-               dprintf("%s: sequence number mismatch %u/%u\n", __func__,
-                       be32_to_cpu(first->anchor.seq),
-                       be32_to_cpu(second->anchor.seq));
-               return 3;
-       }
-       if (first->max_part != second->max_part ||
-           !be16_eq(first->phys->used_pdes, second->phys->used_pdes) ||
-           !be16_eq(first->virt->populated_vdes,
-                    second->virt->populated_vdes)) {
-               dprintf("%s: PD/VD number mismatch\n", __func__);
-               return 3;
-       }
-
-       max_pds =  be16_to_cpu(first->phys->used_pdes);
-       for (dl2 = second->dlist; dl2; dl2 = dl2->next) {
-               for (pd = 0; pd < max_pds; pd++)
-                       if (be32_eq(first->phys->entries[pd].refnum,
-                                   dl2->disk.refnum))
-                               break;
-               if (pd == max_pds) {
-                       dprintf("%s: no match for disk %08x\n", __func__,
-                               be32_to_cpu(dl2->disk.refnum));
-                       return 3;
-               }
-       }
+       /* It is only OK to compare info in the anchor.  Anything else
+        * could be changing due to a reconfig so must be ignored.
+        * guid really should be enough anyway.
+        */
 
-       max_vds = be16_to_cpu(first->active->max_vd_entries);
-       for (vl2 = second->conflist; vl2; vl2 = vl2->next) {
-               if (!be32_eq(vl2->conf.magic, DDF_VD_CONF_MAGIC))
-                       continue;
-               for (vd = 0; vd < max_vds; vd++)
-                       if (!memcmp(first->virt->entries[vd].guid,
-                                   vl2->conf.guid, DDF_GUID_LEN))
-                               break;
-               if (vd == max_vds) {
-                       dprintf("%s: no match for VD config\n", __func__);
-                       return 3;
-               }
+       if (!be32_eq(first->active->seq, second->active->seq)) {
+               dprintf("%s: sequence number mismatch %u<->%u\n", __func__,
+                       be32_to_cpu(first->active->seq),
+                       be32_to_cpu(second->active->seq));
+               return 0;
        }
-       /* FIXME should I look at anything else? */
 
        /*
-          At this point we are fairly sure that the meta data matches.
-          But the new disk may contain additional local data.
-          Add it to the super block.
+        * At this point we are fairly sure that the meta data matches.
+        * But the new disk may contain additional local data.
+        * Add it to the super block.
         */
+       max_vds = be16_to_cpu(first->active->max_vd_entries);
+       max_pds = be16_to_cpu(first->phys->used_pdes);
        for (vl2 = second->conflist; vl2; vl2 = vl2->next) {
                for (vl1 = first->conflist; vl1; vl1 = vl1->next)
                        if (!memcmp(vl1->conf.guid, vl2->conf.guid,
@@ -4061,7 +4087,7 @@ static int ddf_open_new(struct supertype *c, struct active_array *a, char *inst)
                        if (dl->major == dev->disk.major &&
                            dl->minor == dev->disk.minor)
                                break;
-               if (!dl) {
+               if (!dl || dl->pdnum < 0) {
                        pr_err("%s: device %d/%d of subarray %d not found in meta data\n",
                                __func__, dev->disk.major, dev->disk.minor, n);
                        return -1;
@@ -4082,6 +4108,56 @@ static int ddf_open_new(struct supertype *c, struct active_array *a, char *inst)
        return 0;
 }
 
+static void handle_missing(struct ddf_super *ddf, struct active_array *a, int inst)
+{
+       /* This member array is being activated.  If any devices
+        * are missing they must now be marked as failed.
+        */
+       struct vd_config *vc;
+       unsigned int n_bvd;
+       struct vcl *vcl;
+       struct dl *dl;
+       int pd;
+       int n;
+       int state;
+
+       for (n = 0; ; n++) {
+               vc = find_vdcr(ddf, inst, n, &n_bvd, &vcl);
+               if (!vc)
+                       break;
+               for (dl = ddf->dlist; dl; dl = dl->next)
+                       if (be32_eq(dl->disk.refnum, vc->phys_refnum[n_bvd]))
+                               break;
+               if (dl)
+                       /* Found this disk, so not missing */
+                       continue;
+
+               /* Mark the device as failed/missing. */
+               pd = find_phys(ddf, vc->phys_refnum[n_bvd]);
+               if (pd >= 0 && be16_and(ddf->phys->entries[pd].state,
+                                       cpu_to_be16(DDF_Online))) {
+                       be16_clear(ddf->phys->entries[pd].state,
+                                  cpu_to_be16(DDF_Online));
+                       be16_set(ddf->phys->entries[pd].state,
+                                cpu_to_be16(DDF_Failed|DDF_Missing));
+                       vc->phys_refnum[n_bvd] = cpu_to_be32(0);
+                       ddf_set_updates_pending(ddf);
+               }
+
+               /* Mark the array as Degraded */
+               state = get_svd_state(ddf, vcl);
+               if (ddf->virt->entries[inst].state !=
+                   ((ddf->virt->entries[inst].state & ~DDF_state_mask)
+                    | state)) {
+                       ddf->virt->entries[inst].state =
+                               (ddf->virt->entries[inst].state & ~DDF_state_mask)
+                               | state;
+                       a->check_degraded = 1;
+                       ddf_set_updates_pending(ddf);
+               }
+       }
+}
+
 /*
  * The array 'a' is to be marked clean in the metadata.
  * If '->resync_start' is not ~(unsigned long long)0, then the array is only
@@ -4097,6 +4173,7 @@ static int ddf_set_array_state(struct active_array *a, int consistent)
        int inst = a->info.container_member;
        int old = ddf->virt->entries[inst].state;
        if (consistent == 2) {
+               handle_missing(ddf, a, inst);
                /* Should check if a recovery should be started FIXME */
                consistent = 1;
                if (!is_resync_complete(&a->info))
@@ -4311,7 +4388,6 @@ static void ddf_set_disk(struct active_array *a, int n, int state)
        if (ddf->virt->entries[inst].state !=
            ((ddf->virt->entries[inst].state & ~DDF_state_mask)
             | state)) {
-
                ddf->virt->entries[inst].state =
                        (ddf->virt->entries[inst].state & ~DDF_state_mask)
                        | state;
@@ -4322,7 +4398,6 @@ static void ddf_set_disk(struct active_array *a, int n, int state)
 
 static void ddf_sync_metadata(struct supertype *st)
 {
-
        /*
         * Write all data to all devices.
         * Later, we might be able to track whether only local changes
@@ -4385,8 +4460,9 @@ static int kill_subarray_ddf(struct supertype *st)
         */
        struct vcl *victim = ddf->currentconf;
        struct vd_config *conf;
-       ddf->currentconf = NULL;
        unsigned int vdnum;
+
+       ddf->currentconf = NULL;
        if (!victim) {
                pr_err("%s: nothing to kill\n", __func__);
                return -1;
@@ -4487,7 +4563,6 @@ static void ddf_process_update(struct supertype *st,
        dprintf("Process update %x\n", be32_to_cpu(*magic));
 
        if (be32_eq(*magic, DDF_PHYS_RECORDS_MAGIC)) {
-
                if (update->len != (sizeof(struct phys_disk) +
                                    sizeof(struct phys_disk_entry)))
                        return;
@@ -4537,7 +4612,6 @@ static void ddf_process_update(struct supertype *st,
                                a->check_degraded = 1;
                }
        } else if (be32_eq(*magic, DDF_VIRT_RECORDS_MAGIC)) {
-
                if (update->len != (sizeof(struct virtual_disk) +
                                    sizeof(struct virtual_entry)))
                        return;
@@ -4547,7 +4621,6 @@ static void ddf_process_update(struct supertype *st,
                        if (_kill_subarray_ddf(ddf, vd->entries[0].guid))
                                return;
                } else {
-
                        ent = find_vde_by_guid(ddf, vd->entries[0].guid);
                        if (ent != DDF_NOTFOUND) {
                                dprintf("%s: VD %s exists already in slot %d\n",
@@ -4642,6 +4715,9 @@ static void ddf_process_update(struct supertype *st,
                for (dl = ddf->dlist; dl; dl = dl->next) {
                        unsigned int vn = 0;
                        int in_degraded = 0;
+
+                       if (dl->pdnum < 0)
+                               continue;
                        for (vcl = ddf->conflist; vcl ; vcl = vcl->next) {
                                unsigned int dn, ibvd;
                                const struct vd_config *conf;
@@ -4668,7 +4744,7 @@ static void ddf_process_update(struct supertype *st,
                                vstate = ddf->virt->entries[vcl->vcnum].state
                                        & DDF_state_mask;
                                if (vstate == DDF_state_degraded ||
-                                       vstate == DDF_state_part_optimal)
+                                   vstate == DDF_state_part_optimal)
                                        in_degraded = 1;
                        }
                        while (vn < ddf->max_part)
@@ -4823,7 +4899,7 @@ out:
  * arrange for their inclusion.
  * We only choose devices which are not already in the array,
  * and prefer those with a spare-assignment to this array.
- * otherwise we choose global spares - assuming always that
+ * Otherwise we choose global spares - assuming always that
  * there is enough room.
  * For each spare that we assign, we return an 'mdinfo' which
  * describes the position for the device in the array.
@@ -4905,7 +4981,11 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
                        int is_dedicated = 0;
                        struct extent *ex;
                        unsigned int j;
-                       be16 state = ddf->phys->entries[dl->pdnum].state;
+                       be16 state;
+
+                       if (dl->pdnum < 0)
+                               continue;
+                       state = ddf->phys->entries[dl->pdnum].state;
                        if (be16_and(state,
                                     cpu_to_be16(DDF_Failed|DDF_Missing)) ||
                            !be16_and(state,
@@ -4996,7 +5076,6 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
                        di->recovery_start = 0;
                        di->data_offset = pos;
                        di->component_size = a->info.component_size;
-                       di->container_member = dl->pdnum;
                        di->next = rv;
                        rv = di;
                        dprintf("%x:%x (%08x) to be %d at %llu\n",
@@ -5054,7 +5133,7 @@ static struct mdinfo *ddf_activate_spare(struct active_array *a,
                        if (dl->major == di->disk.major
                            && dl->minor == di->disk.minor)
                                break;
-               if (!dl) {
+               if (!dl || dl->pdnum < 0) {
                        pr_err("%s: BUG: can't find disk %d (%d/%d)\n",
                               __func__, di->disk.raid_disk,
                               di->disk.major, di->disk.minor);