]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - super-intel.c
Report uuid in --detail --brief for ddf and intel
[thirdparty/mdadm.git] / super-intel.c
index 709923a74755a0bc39d79e039eac5f951eef9b69..3249b2ccbd6c59f66646c389709737f98e3be686 100644 (file)
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#define HAVE_STDINT_H 1
 #include "mdadm.h"
 #include "mdmon.h"
+#include "sha1.h"
 #include <values.h>
 #include <scsi/sg.h>
 #include <ctype.h>
@@ -238,10 +240,12 @@ static struct supertype *match_metadata_desc_imsm(char *arg)
        return st;
 }
 
+#ifndef MDASSEMBLE
 static __u8 *get_imsm_version(struct imsm_super *mpb)
 {
        return &mpb->sig[MPB_SIG_LEN];
 }
+#endif 
 
 /* retrieve a disk directly from the anchor when the anchor is known to be
  * up-to-date, currently only at load time
@@ -253,6 +257,7 @@ static struct imsm_disk *__get_imsm_disk(struct imsm_super *mpb, __u8 index)
        return &mpb->disk[index];
 }
 
+#ifndef MDASSEMBLE
 /* retrieve a disk from the parsed metadata */
 static struct imsm_disk *get_imsm_disk(struct intel_super *super, __u8 index)
 {
@@ -264,6 +269,7 @@ static struct imsm_disk *get_imsm_disk(struct intel_super *super, __u8 index)
        
        return NULL;
 }
+#endif
 
 /* generate a checksum directly from the anchor when the anchor is known to be
  * up-to-date, currently only at load or write_super after coalescing
@@ -383,6 +389,7 @@ static int get_imsm_raid_level(struct imsm_map *map)
        return map->raid_level;
 }
 
+#ifndef MDASSEMBLE
 static int cmp_extent(const void *av, const void *bv)
 {
        const struct extent *a = av;
@@ -439,7 +446,6 @@ static struct extent *get_extents(struct intel_super *super, struct dl *dl)
        return rv;
 }
 
-#ifndef MDASSEMBLE
 static void print_imsm_dev(struct imsm_dev *dev, int index)
 {
        __u64 sz;
@@ -554,9 +560,18 @@ static void examine_super_imsm(struct supertype *st, char *homehost)
        }
 }
 
+static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info);
+
 static void brief_examine_super_imsm(struct supertype *st)
 {
-       printf("ARRAY /dev/imsm metadata=imsm\n");
+       /* We just write a generic DDF ARRAY entry
+        */
+       struct mdinfo info;
+       char nbuf[64];
+
+       getinfo_super_imsm(st, &info);
+       fname_from_uuid(st, &info, nbuf,'-');
+       printf("ARRAY /dev/imsm metadata=imsm UUID=%s\n", nbuf + 5);
 }
 
 static void detail_super_imsm(struct supertype *st, char *homehost)
@@ -566,7 +581,11 @@ static void detail_super_imsm(struct supertype *st, char *homehost)
 
 static void brief_detail_super_imsm(struct supertype *st)
 {
-       printf("%s\n", __FUNCTION__);
+       struct mdinfo info;
+       char nbuf[64];
+       getinfo_super_imsm(st, &info);
+       fname_from_uuid(st, &info, nbuf,'-');
+       printf(" UUID=%s", nbuf + 5);
 }
 #endif
 
@@ -574,18 +593,51 @@ static int match_home_imsm(struct supertype *st, char *homehost)
 {
        printf("%s\n", __FUNCTION__);
 
-       return 0;
+       return -1;
 }
 
 static void uuid_from_super_imsm(struct supertype *st, int uuid[4])
 {
-       /* imsm does not track uuid's so just make sure we never return
-        * the same value twice to break uuid matching in Manage_subdevs
-        * FIXME what about the use of uuid's with bitmap's?
+       /* The uuid returned here is used for:
+        *  uuid to put into bitmap file (Create, Grow)
+        *  uuid for backup header when saving critical section (Grow)
+        *  comparing uuids when re-adding a device into an array
+        *    In these cases the uuid required is that of the data-array,
+        *    not the device-set.
+        *  uuid to recognise same set when adding a missing device back
+        *    to an array.   This is a uuid for the device-set.
+        *  
+        * For each of these we can make do with a truncated
+        * or hashed uuid rather than the original, as long as
+        * everyone agrees.
+        * In each case the uuid required is that of the data-array,
+        * not the device-set.
+        */
+       /* imsm does not track uuid's so we synthesis one using sha1 on
+        * - The signature (Which is constant for all imsm array, but no matter)
+        * - the family_num of the container
+        * - the index number of the volume
+        * - the 'serial' number of the volume.
+        * Hopefully these are all constant.
         */
-       static int dummy_id = 0;
+       struct intel_super *super = st->sb;
 
-       uuid[0] = dummy_id++;
+       char buf[20];
+       struct sha1_ctx ctx;
+       struct imsm_dev *dev = NULL;
+
+       sha1_init_ctx(&ctx);
+       sha1_process_bytes(super->anchor->sig, MAX_SIGNATURE_LENGTH, &ctx);
+       sha1_process_bytes(&super->anchor->family_num, sizeof(__u32), &ctx);
+       if (super->current_vol >= 0)
+               dev = get_imsm_dev(super, super->current_vol);
+       if (dev) {
+               __u32 vol = super->current_vol;
+               sha1_process_bytes(&vol, sizeof(vol), &ctx);
+               sha1_process_bytes(dev->volume, MAX_RAID_SERIAL_LEN, &ctx);
+       }
+       sha1_finish_ctx(&ctx, buf);
+       memcpy(uuid, buf, 4*4);
 }
 
 #if 0
@@ -644,18 +696,32 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info)
        info->array.md_minor      = -1;
        info->array.ctime         = 0;
        info->array.utime         = 0;
-       info->array.chunk_size    = __le16_to_cpu(map->blocks_per_strip * 512);
+       info->array.chunk_size    = __le16_to_cpu(map->blocks_per_strip) << 9;
+       info->array.state         = !dev->vol.dirty;
+
+       info->disk.major = 0;
+       info->disk.minor = 0;
 
        info->data_offset         = __le32_to_cpu(map->pba_of_lba0);
        info->component_size      = __le32_to_cpu(map->blocks_per_member);
+       memset(info->uuid, 0, sizeof(info->uuid));
 
-       info->disk.major = 0;
-       info->disk.minor = 0;
+       if (map->map_state == IMSM_T_STATE_UNINITIALIZED ||
+           dev->vol.dirty || dev->vol.migr_state)
+               info->resync_start = 0;
+       else
+               info->resync_start = ~0ULL;
+
+       strncpy(info->name, (char *) dev->volume, MAX_RAID_SERIAL_LEN);
+       info->name[MAX_RAID_SERIAL_LEN] = 0;
 
+       info->array.major_version = -1;
+       info->array.minor_version = -2;
        sprintf(info->text_version, "/%s/%d",
                devnum2devname(st->container_dev),
                info->container_member);
        info->safe_mode_delay = 4000;  /* 4 secs like the Matrix driver */
+       uuid_from_super_imsm(st, info->uuid);
 }
 
 
@@ -685,10 +751,13 @@ static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info)
        info->disk.minor = 0;
        info->disk.raid_disk = -1;
        info->reshape_active = 0;
+       info->array.major_version = -1;
+       info->array.minor_version = -2;
        strcpy(info->text_version, "imsm");
        info->safe_mode_delay = 0;
        info->disk.number = -1;
        info->disk.state = 0;
+       info->name[0] = 0;
 
        if (super->disks) {
                disk = &super->disks->disk;
@@ -702,6 +771,7 @@ static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info)
                info->disk.state |= s & FAILED_DISK ? (1 << MD_DISK_FAULTY) : 0;
                info->disk.state |= s & USABLE_DISK ? (1 << MD_DISK_SYNC) : 0;
        }
+       uuid_from_super_imsm(st, info->uuid);
 }
 
 static int update_super_imsm(struct supertype *st, struct mdinfo *info,
@@ -982,6 +1052,7 @@ static void imsm_copy_dev(struct imsm_dev *dest, struct imsm_dev *src)
        memcpy(dest, src, sizeof_imsm_dev(src, 0));
 }
 
+#ifndef MDASSEMBLE
 /* When migrating map0 contains the 'destination' state while map1
  * contains the current state.  When not migrating map0 contains the
  * current state.  This routine assumes that map[0].map_state is set to
@@ -1008,6 +1079,7 @@ static void migrate(struct imsm_dev *dev, __u8 to_state, int rebuild_resync)
        memcpy(dest, src, sizeof_imsm_map(src));
        src->map_state = to_state;
 }
+#endif
 
 static int parse_raid_devices(struct intel_super *super)
 {
@@ -1339,6 +1411,7 @@ static int load_super_imsm_all(struct supertype *st, int fd, void **sbp,
                st->minor_version = 0;
                st->max_devs = IMSM_MAX_DEVICES;
        }
+       st->loaded_container = 1;
 
        return 0;
 }
@@ -1381,6 +1454,7 @@ static int load_super_imsm(struct supertype *st, int fd, char *devname)
                st->minor_version = 0;
                st->max_devs = IMSM_MAX_DEVICES;
        }
+       st->loaded_container = 0;
 
        return 0;
 }
@@ -1555,6 +1629,7 @@ static int init_super_imsm(struct supertype *st, mdu_array_info_t *info,
        return 1;
 }
 
+#ifndef MDASSEMBLE
 static void add_to_super_imsm_volume(struct supertype *st, mdu_disk_info_t *dk,
                                     int fd, char *devname)
 {
@@ -1754,6 +1829,7 @@ static int write_super_imsm(struct intel_super *super, int doclose)
        return 0;
 }
 
+
 static int create_array(struct supertype *st)
 {
        size_t len;
@@ -1777,7 +1853,7 @@ static int create_array(struct supertype *st)
        return 0;
 }
 
-static int add_disk(struct supertype *st)
+static int _add_disk(struct supertype *st)
 {
        struct intel_super *super = st->sb;
        size_t len;
@@ -1814,7 +1890,7 @@ static int write_init_super_imsm(struct supertype *st)
                        /* in the add disk case we are running in mdmon
                         * context, so don't close fd's
                         */
-                       return add_disk(st);
+                       return _add_disk(st);
                } else
                        rv = create_array(st);
 
@@ -1827,6 +1903,7 @@ static int write_init_super_imsm(struct supertype *st)
        } else
                return write_super_imsm(st->sb, 1);
 }
+#endif
 
 static int store_zero_imsm(struct supertype *st, int fd)
 {
@@ -1848,6 +1925,12 @@ static int store_zero_imsm(struct supertype *st, int fd)
        return 0;
 }
 
+static int imsm_bbm_log_size(struct imsm_super *mpb)
+{
+       return __le32_to_cpu(mpb->bbm_log_size);
+}
+
+#ifndef MDASSEMBLE
 static int validate_geometry_imsm_container(struct supertype *st, int level,
                                            int layout, int raiddisks, int chunk,
                                            unsigned long long size, char *dev,
@@ -1989,11 +2072,6 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
        return 1;
 }
 
-int imsm_bbm_log_size(struct imsm_super *mpb)
-{
-       return __le32_to_cpu(mpb->bbm_log_size);
-}
-
 static int validate_geometry_imsm(struct supertype *st, int level, int layout,
                                  int raiddisks, int chunk, unsigned long long size,
                                  char *dev, unsigned long long *freesize,
@@ -2081,6 +2159,7 @@ static int validate_geometry_imsm(struct supertype *st, int level, int layout,
 
        return 1;
 }
+#endif /* MDASSEMBLE */
 
 static struct mdinfo *container_content_imsm(struct supertype *st)
 {
@@ -2106,7 +2185,6 @@ static struct mdinfo *container_content_imsm(struct supertype *st)
 
        for (i = 0; i < mpb->num_raid_devs; i++) {
                struct imsm_dev *dev = get_imsm_dev(super, i);
-               struct imsm_vol *vol = &dev->vol;
                struct imsm_map *map = get_imsm_map(dev, 0);
                struct mdinfo *this;
                int slot;
@@ -2115,32 +2193,8 @@ static struct mdinfo *container_content_imsm(struct supertype *st)
                memset(this, 0, sizeof(*this));
                this->next = rest;
 
-               this->array.level = get_imsm_raid_level(map);
-               this->array.raid_disks = map->num_members;
-               this->array.layout = imsm_level_to_layout(this->array.level);
-               this->array.md_minor = -1;
-               this->array.ctime = 0;
-               this->array.utime = 0;
-               this->array.chunk_size = __le16_to_cpu(map->blocks_per_strip) << 9;
-               this->array.state = !vol->dirty;
-               this->container_member = i;
-               if (map->map_state == IMSM_T_STATE_UNINITIALIZED ||
-                   dev->vol.dirty || dev->vol.migr_state)
-                       this->resync_start = 0;
-               else
-                       this->resync_start = ~0ULL;
-
-               strncpy(this->name, (char *) dev->volume, MAX_RAID_SERIAL_LEN);
-               this->name[MAX_RAID_SERIAL_LEN] = 0;
-
-               sprintf(this->text_version, "/%s/%d",
-                       devnum2devname(st->container_dev),
-                       this->container_member);
-
-               memset(this->uuid, 0, sizeof(this->uuid));
-
-               this->component_size = __le32_to_cpu(map->blocks_per_member);
-
+               super->current_vol = i;
+               getinfo_super_imsm_volume(st, this);
                for (slot = 0 ; slot <  map->num_members; slot++) {
                        struct mdinfo *info_d;
                        struct dl *d;
@@ -2210,6 +2264,7 @@ static struct mdinfo *container_content_imsm(struct supertype *st)
 }
 
 
+#ifndef MDASSEMBLE
 static int imsm_open_new(struct supertype *c, struct active_array *a,
                         char *inst)
 {
@@ -2427,7 +2482,7 @@ static void imsm_set_disk(struct active_array *a, int n, int state)
        if ((state & DS_FAULTY) && !(status & FAILED_DISK)) {
                status |= FAILED_DISK;
                disk->status = __cpu_to_le32(status);
-               disk->scsi_id = __cpu_to_le32(~0UL);
+               disk->scsi_id = __cpu_to_le32(~(__u32)0);
                memmove(&disk->serial[0], &disk->serial[1], MAX_RAID_SERIAL_LEN - 1);
                super->updates_pending++;
        }
@@ -2524,9 +2579,10 @@ static struct dl *imsm_readd(struct intel_super *super, int idx, struct active_a
        return dl;
 }
 
-static struct dl *imsm_add_spare(struct intel_super *super, int idx, struct active_array *a)
+static struct dl *imsm_add_spare(struct intel_super *super, int slot, struct active_array *a)
 {
        struct imsm_dev *dev = get_imsm_dev(super, a->info.container_member);
+       int idx = get_imsm_disk_idx(dev, slot);
        struct imsm_map *map = get_imsm_map(dev, 0);
        unsigned long long esize;
        unsigned long long pos;
@@ -2541,7 +2597,8 @@ static struct dl *imsm_add_spare(struct intel_super *super, int idx, struct acti
        for (dl = super->disks; dl; dl = dl->next) {
                /* If in this array, skip */
                for (d = a->info.devs ; d ; d = d->next)
-                       if (d->disk.major == dl->major &&
+                       if (d->state_fd >= 0 &&
+                           d->disk.major == dl->major &&
                            d->disk.minor == dl->minor) {
                                dprintf("%x:%x already in array\n", dl->major, dl->minor);
                                break;
@@ -2549,13 +2606,13 @@ static struct dl *imsm_add_spare(struct intel_super *super, int idx, struct acti
                if (d)
                        continue;
 
-               /* skip marked in use or failed drives */
+               /* skip in use or failed drives */
                status = __le32_to_cpu(dl->disk.status);
-               if (status & FAILED_DISK || status & CONFIGURED_DISK) {
+               if (status & FAILED_DISK || idx == dl->index) {
                        dprintf("%x:%x status ( %s%s)\n",
                        dl->major, dl->minor,
                        status & FAILED_DISK ? "failed " : "",
-                       status & CONFIGURED_DISK ? "configured " : "");
+                       idx == dl->index ? "in use " : "");
                        continue;
                }
 
@@ -2960,23 +3017,16 @@ static void imsm_process_update(struct supertype *st,
                        for (a = st->arrays; a; a = a->next)
                                a->check_degraded = 1;
                }
-               /* check if we can add / replace some disks in the
-                * metadata */
+               /* add some spares to the metadata */
                while (super->add) {
-                       struct dl **dlp, *dl, *al;
+                       struct dl *al;
+
                        al = super->add;
                        super->add = al->next;
-                       for (dlp = &super->disks; *dlp ; ) {
-                               if (serialcmp(al->serial, (*dlp)->serial) == 0) {
-                                       dl = *dlp;
-                                       *dlp = (*dlp)->next;
-                                       __free_imsm_disk(dl);
-                                       break;
-                               } else
-                                       dlp = &(*dlp)->next;
-                       }
                        al->next = super->disks;
                        super->disks = al;
+                       dprintf("%s: added %x:%x\n",
+                               __func__, al->major, al->minor);
                }
 
                break;
@@ -3080,6 +3130,7 @@ static void imsm_delete(struct intel_super *super, struct dl **dlp, int index)
                __free_imsm_disk(dl);
        }
 }
+#endif /* MDASSEMBLE */
 
 struct superswitch super_imsm = {
 #ifndef        MDASSEMBLE
@@ -3088,6 +3139,8 @@ struct superswitch super_imsm = {
        .detail_super   = detail_super_imsm,
        .brief_detail_super = brief_detail_super_imsm,
        .write_init_super = write_init_super_imsm,
+       .validate_geometry = validate_geometry_imsm,
+       .add_to_super   = add_to_super_imsm,
 #endif
        .match_home     = match_home_imsm,
        .uuid_from_super= uuid_from_super_imsm,
@@ -3100,15 +3153,14 @@ struct superswitch super_imsm = {
 
        .load_super     = load_super_imsm,
        .init_super     = init_super_imsm,
-       .add_to_super   = add_to_super_imsm,
        .store_super    = store_zero_imsm,
        .free_super     = free_super_imsm,
        .match_metadata_desc = match_metadata_desc_imsm,
        .container_content = container_content_imsm,
 
-       .validate_geometry = validate_geometry_imsm,
        .external       = 1,
 
+#ifndef MDASSEMBLE
 /* for mdmon */
        .open_new       = imsm_open_new,
        .load_super     = load_super_imsm,
@@ -3118,4 +3170,5 @@ struct superswitch super_imsm = {
        .activate_spare = imsm_activate_spare,
        .process_update = imsm_process_update,
        .prepare_update = imsm_prepare_update,
+#endif /* MDASSEMBLE */
 };