]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - super-intel.c
imsm: Disable checkpoint updating by mdmon for general migration
[thirdparty/mdadm.git] / super-intel.c
index a4a44976ebf83988835888f6a98ddde943d4ad77..7654a11721f14d71f7b98707daefdf466a2dd4fd 100644 (file)
@@ -51,7 +51,7 @@
 #define MPB_ATTRIB_RAID5   __cpu_to_le32(0x00000010)
 #define MPB_ATTRIB_RAIDCNG __cpu_to_le32(0x00000020)
 
-#define MPB_SECTOR_CNT 418
+#define MPB_SECTOR_CNT 2210
 #define IMSM_RESERVED_SECTORS 4096
 #define SECT_PER_MB_SHIFT 11
 
@@ -194,6 +194,41 @@ struct bbm_log {
 static char *map_state_str[] = { "normal", "uninitialized", "degraded", "failed" };
 #endif
 
+#define RAID_DISK_RESERVED_BLOCKS_IMSM_HI 2209
+
+#define GEN_MIGR_AREA_SIZE 2048 /* General Migration Copy Area size in blocks */
+
+#define UNIT_SRC_NORMAL     0   /* Source data for curr_migr_unit must
+                                *  be recovered using srcMap */
+#define UNIT_SRC_IN_CP_AREA 1   /* Source data for curr_migr_unit has
+                                *  already been migrated and must
+                                *  be recovered from checkpoint area */
+struct migr_record {
+       __u32 rec_status;           /* Status used to determine how to restart
+                                    * migration in case it aborts
+                                    * in some fashion */
+       __u32 curr_migr_unit;       /* 0..numMigrUnits-1 */
+       __u32 family_num;           /* Family number of MPB
+                                    * containing the RaidDev
+                                    * that is migrating */
+       __u32 ascending_migr;       /* True if migrating in increasing
+                                    * order of lbas */
+       __u32 blocks_per_unit;      /* Num disk blocks per unit of operation */
+       __u32 dest_depth_per_unit;  /* Num member blocks each destMap
+                                    * member disk
+                                    * advances per unit-of-operation */
+       __u32 ckpt_area_pba;        /* Pba of first block of ckpt copy area */
+       __u32 dest_1st_member_lba;  /* First member lba on first
+                                    * stripe of destination */
+       __u32 num_migr_units;       /* Total num migration units-of-op */
+       __u32 post_migr_vol_cap;    /* Size of volume after
+                                    * migration completes */
+       __u32 post_migr_vol_cap_hi; /* Expansion space for LBA64 */
+       __u32 ckpt_read_disk_num;   /* Which member disk in destSubMap[0] the
+                                    * migration ckpt record was read from
+                                    * (for recovered migrations) */
+} __attribute__ ((__packed__));
+
 static __u8 migr_type(struct imsm_dev *dev)
 {
        if (dev->vol.migr_type == MIGR_VERIFY &&
@@ -233,6 +268,13 @@ struct intel_dev {
        unsigned index;
 };
 
+struct intel_hba {
+       enum sys_dev_type type;
+       char *path;
+       char *pci_id;
+       struct intel_hba *next;
+};
+
 enum action {
        DISK_REMOVE = 1,
        DISK_ADD
@@ -243,6 +285,10 @@ struct intel_super {
                void *buf; /* O_DIRECT buffer for reading/writing metadata */
                struct imsm_super *anchor; /* immovable parameters */
        };
+       union {
+               void *migr_rec_buf; /* buffer for I/O operations */
+               struct migr_record *migr_rec; /* migration record */
+       };
        size_t len; /* size of the 'buf' allocation */
        void *next_buf; /* for realloc'ing buf from the manager */
        size_t next_len;
@@ -268,7 +314,7 @@ struct intel_super {
                                      active */
        struct dl *missing; /* disks removed while we weren't looking */
        struct bbm_log *bbm_log;
-       const char *hba; /* device path of the raid controller for this metadata */
+       struct intel_hba *hba; /* device path of the raid controller for this metadata */
        const struct imsm_orom *orom; /* platform firmware support */
        struct intel_super *next; /* (temp) list for disambiguating family_num */
 };
@@ -284,6 +330,12 @@ struct extent {
        unsigned long long start, size;
 };
 
+/* definitions of reshape process types */
+enum imsm_reshape_type {
+       CH_TAKEOVER,
+       CH_MIGRATION,
+};
+
 /* definition of messages passed to imsm_process_update */
 enum imsm_update_type {
        update_activate_spare,
@@ -292,6 +344,8 @@ enum imsm_update_type {
        update_rename_array,
        update_add_remove_disk,
        update_reshape_container_disks,
+       update_reshape_migration,
+       update_takeover
 };
 
 struct imsm_update_activate_spare {
@@ -312,11 +366,35 @@ struct geo_params {
        int raid_disks;
 };
 
+enum takeover_direction {
+       R10_TO_R0,
+       R0_TO_R10
+};
+struct imsm_update_takeover {
+       enum imsm_update_type type;
+       int subarray;
+       enum takeover_direction direction;
+};
 
 struct imsm_update_reshape {
        enum imsm_update_type type;
        int old_raid_disks;
        int new_raid_disks;
+
+       int new_disks[1]; /* new_raid_disks - old_raid_disks makedev number */
+};
+
+struct imsm_update_reshape_migration {
+       enum imsm_update_type type;
+       int old_raid_disks;
+       int new_raid_disks;
+       /* fields for array migration changes
+        */
+       int subdev;
+       int new_level;
+       int new_layout;
+       int new_chunksize;
+
        int new_disks[1]; /* new_raid_disks - old_raid_disks makedev number */
 };
 
@@ -345,6 +423,114 @@ struct imsm_update_add_remove_disk {
        enum imsm_update_type type;
 };
 
+
+static const char *_sys_dev_type[] = {
+       [SYS_DEV_UNKNOWN] = "Unknown",
+       [SYS_DEV_SAS] = "SAS",
+       [SYS_DEV_SATA] = "SATA"
+};
+
+const char *get_sys_dev_type(enum sys_dev_type type)
+{
+       if (type >= SYS_DEV_MAX)
+               type = SYS_DEV_UNKNOWN;
+
+       return _sys_dev_type[type];
+}
+
+static struct intel_hba * alloc_intel_hba(struct sys_dev *device)
+{
+       struct intel_hba *result = malloc(sizeof(*result));
+       if (result) {
+               result->type = device->type;
+               result->path = strdup(device->path);
+               result->next = NULL;
+               if (result->path && (result->pci_id = strrchr(result->path, '/')) != NULL)
+                       result->pci_id++;
+       }
+       return result;
+}
+
+static struct intel_hba * find_intel_hba(struct intel_hba *hba, struct sys_dev *device)
+{
+       struct intel_hba *result=NULL;
+       for (result = hba; result; result = result->next) {
+               if (result->type == device->type && strcmp(result->path, device->path) == 0)
+                       break;
+       }
+       return result;
+}
+
+static int attach_hba_to_super(struct intel_super *super, struct sys_dev *device)
+{
+       struct intel_hba *hba;
+
+       /* check if disk attached to Intel HBA */
+       hba = find_intel_hba(super->hba, device);
+       if (hba != NULL)
+               return 1;
+       /* Check if HBA is already attached to super */
+       if (super->hba == NULL) {
+               super->hba = alloc_intel_hba(device);
+               return 1;
+       }
+
+       hba = super->hba;
+       /* Intel metadata allows for all disks attached to the same type HBA.
+        * Do not sypport odf HBA types mixing
+        */
+       if (device->type != hba->type)
+               return 2;
+
+       while (hba->next)
+               hba = hba->next;
+
+       hba->next = alloc_intel_hba(device);
+       return 1;
+}
+
+static struct sys_dev* find_disk_attached_hba(int fd, const char *devname)
+{
+       struct sys_dev *list, *elem, *prev;
+       char *disk_path;
+
+       if ((list = find_intel_devices()) == NULL)
+               return 0;
+
+       if (fd < 0)
+               disk_path  = (char *) devname;
+       else
+               disk_path = diskfd_to_devpath(fd);
+
+       if (!disk_path) {
+               free_sys_dev(&list);
+               return 0;
+       }
+
+       for (prev = NULL, elem = list; elem; prev = elem, elem = elem->next) {
+               if (path_attached_to_hba(disk_path, elem->path)) {
+                       if (prev == NULL)
+                               list = list->next;
+                       else
+                               prev->next = elem->next;
+                       elem->next = NULL;
+                       if (disk_path != devname)
+                               free(disk_path);
+                       free_sys_dev(&list);
+                       return elem;
+               }
+       }
+       if (disk_path != devname)
+               free(disk_path);
+       free_sys_dev(&list);
+
+       return NULL;
+}
+
+
+static int find_intel_hba_capability(int fd, struct intel_super *super,
+                                    char *devname);
+
 static struct supertype *match_metadata_desc_imsm(char *arg)
 {
        struct supertype *st;
@@ -432,17 +618,24 @@ static size_t sizeof_imsm_map(struct imsm_map *map)
 
 struct imsm_map *get_imsm_map(struct imsm_dev *dev, int second_map)
 {
+       /* A device can have 2 maps if it is in the middle of a migration.
+        * If second_map is:
+        *    0   - we return the first map
+        *    1   - we return the second map if it exists, else NULL
+        *   -1   - we return the second map if it exists, else the first
+        */
        struct imsm_map *map = &dev->vol.map[0];
 
-       if (second_map && !dev->vol.migr_state)
+       if (second_map == 1 && !dev->vol.migr_state)
                return NULL;
-       else if (second_map) {
+       else if (second_map == 1 ||
+                (second_map < 0 && dev->vol.migr_state)) {
                void *ptr = map;
 
                return ptr + sizeof_imsm_map(map);
        } else
                return map;
-               
+
 }
 
 /* return the size of the device.
@@ -521,14 +714,7 @@ static __u32 get_imsm_ord_tbl_ent(struct imsm_dev *dev,
 {
        struct imsm_map *map;
 
-       if (second_map == -1) {
-               if (dev->vol.migr_state)
-                       map = get_imsm_map(dev, 1);
-               else
-                       map = get_imsm_map(dev, 0);
-       } else {
-               map = get_imsm_map(dev, second_map);
-       }
+       map = get_imsm_map(dev, second_map);
 
        /* top byte identifies disk under rebuild */
        return __le32_to_cpu(map->disk_ord_tbl[slot]);
@@ -729,9 +915,13 @@ static unsigned long long min_acceptable_spare_size_imsm(struct supertype *st)
 }
 
 #ifndef MDASSEMBLE
-static __u64 blocks_per_migr_unit(struct imsm_dev *dev);
+static __u64 blocks_per_migr_unit(struct intel_super *super,
+                                 struct imsm_dev *dev);
 
-static void print_imsm_dev(struct imsm_dev *dev, char *uuid, int disk_idx)
+static void print_imsm_dev(struct intel_super *super,
+                          struct imsm_dev *dev,
+                          char *uuid,
+                          int disk_idx)
 {
        __u64 sz;
        int slot, i;
@@ -765,6 +955,12 @@ static void print_imsm_dev(struct imsm_dev *dev, char *uuid, int disk_idx)
                printf("]");
        }
        printf("\n");
+       printf("    Failed disk : ");
+       if (map->failed_disk_num == 0xff)
+               printf("none");
+       else
+               printf("%i", map->failed_disk_num);
+       printf("\n");
        slot = get_imsm_disk_slot(map, disk_idx);
        if (slot >= 0) {
                ord = get_imsm_ord_tbl_ent(dev, slot, -1);
@@ -816,7 +1012,7 @@ static void print_imsm_dev(struct imsm_dev *dev, char *uuid, int disk_idx)
                printf(" <-- %s", map_state_str[map->map_state]);
                printf("\n     Checkpoint : %u (%llu)",
                       __le32_to_cpu(dev->vol.curr_migr_unit),
-                      (unsigned long long)blocks_per_migr_unit(dev));
+                      (unsigned long long)blocks_per_migr_unit(super, dev));
        }
        printf("\n");
        printf("    Dirty State : %s\n", dev->vol.dirty ? "dirty" : "clean");
@@ -843,6 +1039,57 @@ static void print_imsm_disk(struct imsm_super *mpb, int index, __u32 reserved)
               human_size(sz * 512));
 }
 
+static int is_gen_migration(struct imsm_dev *dev);
+
+void examine_migr_rec_imsm(struct intel_super *super)
+{
+       struct migr_record *migr_rec = super->migr_rec;
+       struct imsm_super *mpb = super->anchor;
+       int i;
+
+       for (i = 0; i < mpb->num_raid_devs; i++) {
+               struct imsm_dev *dev = __get_imsm_dev(mpb, i);
+               if (is_gen_migration(dev) == 0)
+                               continue;
+
+               printf("\nMigration Record Information:");
+               if (super->disks->index > 1) {
+                       printf(" Empty\n                              ");
+                       printf("Examine one of first two disks in array\n");
+                       break;
+               }
+               printf("\n                     Status : ");
+               if (__le32_to_cpu(migr_rec->rec_status) == UNIT_SRC_NORMAL)
+                       printf("Normal\n");
+               else
+                       printf("Contains Data\n");
+               printf("               Current Unit : %u\n",
+                      __le32_to_cpu(migr_rec->curr_migr_unit));
+               printf("                     Family : %u\n",
+                      __le32_to_cpu(migr_rec->family_num));
+               printf("                  Ascending : %u\n",
+                      __le32_to_cpu(migr_rec->ascending_migr));
+               printf("            Blocks Per Unit : %u\n",
+                      __le32_to_cpu(migr_rec->blocks_per_unit));
+               printf("       Dest. Depth Per Unit : %u\n",
+                      __le32_to_cpu(migr_rec->dest_depth_per_unit));
+               printf("        Checkpoint Area pba : %u\n",
+                      __le32_to_cpu(migr_rec->ckpt_area_pba));
+               printf("           First member lba : %u\n",
+                      __le32_to_cpu(migr_rec->dest_1st_member_lba));
+               printf("      Total Number of Units : %u\n",
+                      __le32_to_cpu(migr_rec->num_migr_units));
+               printf("             Size of volume : %u\n",
+                      __le32_to_cpu(migr_rec->post_migr_vol_cap));
+               printf("  Expansion space for LBA64 : %u\n",
+                      __le32_to_cpu(migr_rec->post_migr_vol_cap_hi));
+               printf("       Record was read from : %u\n",
+                      __le32_to_cpu(migr_rec->ckpt_read_disk_num));
+
+               break;
+       }
+}
+
 static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info, char *map);
 
 static void examine_super_imsm(struct supertype *st, char *homehost)
@@ -893,7 +1140,7 @@ static void examine_super_imsm(struct supertype *st, char *homehost)
                super->current_vol = i;
                getinfo_super_imsm(st, &info, NULL);
                fname_from_uuid(st, &info, nbuf, ':');
-               print_imsm_dev(dev, nbuf + 5, super->disks->index);
+               print_imsm_dev(super, dev, nbuf + 5, super->disks->index);
        }
        for (i = 0; i < mpb->num_disks; i++) {
                if (i == super->disks->index)
@@ -920,6 +1167,8 @@ static void examine_super_imsm(struct supertype *st, char *homehost)
                printf("    Usable Size : %llu%s\n", (unsigned long long)sz,
                       human_size(sz * 512));
        }
+
+       examine_migr_rec_imsm(super);
 }
 
 static void brief_examine_super_imsm(struct supertype *st, int verbose)
@@ -1001,10 +1250,10 @@ static void brief_detail_super_imsm(struct supertype *st)
 static int imsm_read_serial(int fd, char *devname, __u8 *serial);
 static void fd2devname(int fd, char *name);
 
-static int imsm_enumerate_ports(const char *hba_path, int port_count, int host_base, int verbose)
+static int ahci_enumerate_ports(const char *hba_path, int port_count, int host_base, int verbose)
 {
-       /* dump an unsorted list of devices attached to ahci, as well as
-        * non-connected ports
+       /* dump an unsorted list of devices attached to AHCI Intel storage
+        * controller, as well as non-connected ports
         */
        int hba_len = strlen(hba_path) + 1;
        struct dirent *ent;
@@ -1164,56 +1413,53 @@ static int imsm_enumerate_ports(const char *hba_path, int port_count, int host_b
        return err;
 }
 
-static int detail_platform_imsm(int verbose, int enumerate_only)
+
+
+static void print_found_intel_controllers(struct sys_dev *elem)
+{
+       for (; elem; elem = elem->next) {
+               fprintf(stderr, Name ": found Intel(R) ");
+               if (elem->type == SYS_DEV_SATA)
+                       fprintf(stderr, "SATA ");
+               else if (elem->type == SYS_DEV_SAS)
+                       fprintf(stderr, "SAS ");
+               fprintf(stderr, "RAID controller");
+               if (elem->pci_id)
+                       fprintf(stderr, " at %s", elem->pci_id);
+               fprintf(stderr, ".\n");
+       }
+       fflush(stderr);
+}
+
+static int ahci_get_port_count(const char *hba_path, int *port_count)
 {
-       /* There are two components to imsm platform support, the ahci SATA
-        * controller and the option-rom.  To find the SATA controller we
-        * simply look in /sys/bus/pci/drivers/ahci to see if an ahci
-        * controller with the Intel vendor id is present.  This approach
-        * allows mdadm to leverage the kernel's ahci detection logic, with the
-        * caveat that if ahci.ko is not loaded mdadm will not be able to
-        * detect platform raid capabilities.  The option-rom resides in a
-        * platform "Adapter ROM".  We scan for its signature to retrieve the
-        * platform capabilities.  If raid support is disabled in the BIOS the
-        * option-rom capability structure will not be available.
-        */
-       const struct imsm_orom *orom;
-       struct sys_dev *list, *hba;
-       DIR *dir;
        struct dirent *ent;
-       const char *hba_path;
-       int host_base = 0;
-       int port_count = 0;
+       DIR *dir;
+       int host_base = -1;
 
-       if (enumerate_only) {
-               if (check_env("IMSM_NO_PLATFORM") || find_imsm_orom())
-                       return 0;
-               return 2;
-       }
+       *port_count = 0;
+       if ((dir = opendir(hba_path)) == NULL)
+               return -1;
 
-       list = find_driver_devices("pci", "ahci");
-       for (hba = list; hba; hba = hba->next)
-               if (devpath_to_vendor(hba->path) == 0x8086)
-                       break;
+       for (ent = readdir(dir); ent; ent = readdir(dir)) {
+               int host;
 
-       if (!hba) {
-               if (verbose)
-                       fprintf(stderr, Name ": unable to find active ahci controller\n");
-               free_sys_dev(&list);
-               return 2;
-       } else if (verbose)
-               fprintf(stderr, Name ": found Intel SATA AHCI Controller\n");
-       hba_path = hba->path;
-       hba->path = NULL;
-       free_sys_dev(&list);
+               if (sscanf(ent->d_name, "host%d", &host) != 1)
+                       continue;
+               if (*port_count == 0)
+                       host_base = host;
+               else if (host < host_base)
+                       host_base = host;
 
-       orom = find_imsm_orom();
-       if (!orom) {
-               if (verbose)
-                       fprintf(stderr, Name ": imsm option-rom not found\n");
-               return 2;
+               if (host + 1 > *port_count + host_base)
+                       *port_count = host + 1 - host_base;
        }
+       closedir(dir);
+       return host_base;
+}
 
+static void print_imsm_capability(const struct imsm_orom *orom)
+{
        printf("       Platform : Intel(R) Matrix Storage Manager\n");
        printf("        Version : %d.%d.%d.%d\n", orom->major_ver, orom->minor_ver,
               orom->hotfix_ver, orom->build);
@@ -1242,35 +1488,81 @@ static int detail_platform_imsm(int verbose, int enumerate_only)
               imsm_orom_has_chunk(orom, 1024*64) ? " 64M" : "");
        printf("      Max Disks : %d\n", orom->tds);
        printf("    Max Volumes : %d\n", orom->vpa);
-       printf(" I/O Controller : %s\n", hba_path);
-
-       /* find the smallest scsi host number to determine a port number base */
-       dir = opendir(hba_path);
-       for (ent = dir ? readdir(dir) : NULL; ent; ent = readdir(dir)) {
-               int host;
-
-               if (sscanf(ent->d_name, "host%d", &host) != 1)
-                       continue;
-               if (port_count == 0)
-                       host_base = host;
-               else if (host < host_base)
-                       host_base = host;
+       return;
+}
 
-               if (host + 1 > port_count + host_base)
-                       port_count = host + 1 - host_base;
+static int detail_platform_imsm(int verbose, int enumerate_only)
+{
+       /* There are two components to imsm platform support, the ahci SATA
+        * controller and the option-rom.  To find the SATA controller we
+        * simply look in /sys/bus/pci/drivers/ahci to see if an ahci
+        * controller with the Intel vendor id is present.  This approach
+        * allows mdadm to leverage the kernel's ahci detection logic, with the
+        * caveat that if ahci.ko is not loaded mdadm will not be able to
+        * detect platform raid capabilities.  The option-rom resides in a
+        * platform "Adapter ROM".  We scan for its signature to retrieve the
+        * platform capabilities.  If raid support is disabled in the BIOS the
+        * option-rom capability structure will not be available.
+        */
+       const struct imsm_orom *orom;
+       struct sys_dev *list, *hba;
+       int host_base = 0;
+       int port_count = 0;
+       int result=0;
 
+       if (enumerate_only) {
+               if (check_env("IMSM_NO_PLATFORM"))
+                       return 0;
+               list = find_intel_devices();
+               if (!list)
+                       return 2;
+               for (hba = list; hba; hba = hba->next) {
+                       orom = find_imsm_capability(hba->type);
+                       if (!orom) {
+                               result = 2;
+                               break;
+                       }
+               }
+               free_sys_dev(&list);
+               return result;
        }
-       if (dir)
-               closedir(dir);
 
-       if (!port_count || imsm_enumerate_ports(hba_path, port_count,
-                                               host_base, verbose) != 0) {
+       list = find_intel_devices();
+       if (!list) {
                if (verbose)
-                       fprintf(stderr, Name ": failed to enumerate ports\n");
+                       fprintf(stderr, Name ": no active Intel(R) RAID "
+                               "controller found.\n");
+               free_sys_dev(&list);
                return 2;
+       } else if (verbose)
+               print_found_intel_controllers(list);
+
+       for (hba = list; hba; hba = hba->next) {
+               orom = find_imsm_capability(hba->type);
+               if (!orom)
+                       fprintf(stderr, Name ": imsm capabilities not found for controller: %s (type %s)\n",
+                               hba->path, get_sys_dev_type(hba->type));
+               else
+                       print_imsm_capability(orom);
        }
 
-       return 0;
+       for (hba = list; hba; hba = hba->next) {
+               printf(" I/O Controller : %s (%s)\n",
+                       hba->path, get_sys_dev_type(hba->type));
+
+               if (hba->type == SYS_DEV_SATA) {
+                       host_base = ahci_get_port_count(hba->path, &port_count);
+                       if (ahci_enumerate_ports(hba->path, port_count, host_base, verbose)) {
+                               if (verbose)
+                                       fprintf(stderr, Name ": failed to enumerate "
+                                               "ports on SATA controller at %s.", hba->pci_id);
+                               result |= 2;
+                       }
+               }
+       }
+
+       free_sys_dev(&list);
+       return result;
 }
 #endif
 
@@ -1488,7 +1780,8 @@ static __u32 map_migr_block(struct imsm_dev *dev, __u32 block)
        }
 }
 
-static __u64 blocks_per_migr_unit(struct imsm_dev *dev)
+static __u64 blocks_per_migr_unit(struct intel_super *super,
+                                 struct imsm_dev *dev)
 {
        /* calculate the conversion factor between per member 'blocks'
         * (md/{resync,rebuild}_start) and imsm migration units, return
@@ -1498,7 +1791,10 @@ static __u64 blocks_per_migr_unit(struct imsm_dev *dev)
                return 0;
 
        switch (migr_type(dev)) {
-       case MIGR_GEN_MIGR:
+       case MIGR_GEN_MIGR: {
+               struct migr_record *migr_rec = super->migr_rec;
+               return __le32_to_cpu(migr_rec->blocks_per_unit);
+       }
        case MIGR_VERIFY:
        case MIGR_REPAIR:
        case MIGR_INIT: {
@@ -1556,17 +1852,157 @@ static int imsm_level_to_layout(int level)
        return UnSet;
 }
 
+/*******************************************************************************
+ * Function:   read_imsm_migr_rec
+ * Description: Function reads imsm migration record from last sector of disk
+ * Parameters:
+ *     fd      : disk descriptor
+ *     super   : metadata info
+ * Returns:
+ *      0 : success,
+ *     -1 : fail
+ ******************************************************************************/
+static int read_imsm_migr_rec(int fd, struct intel_super *super)
+{
+       int ret_val = -1;
+       unsigned long long dsize;
+
+       get_dev_size(fd, NULL, &dsize);
+       if (lseek64(fd, dsize - 512, SEEK_SET) < 0) {
+               fprintf(stderr,
+                       Name ": Cannot seek to anchor block: %s\n",
+                       strerror(errno));
+               goto out;
+       }
+       if (read(fd, super->migr_rec_buf, 512) != 512) {
+               fprintf(stderr,
+                       Name ": Cannot read migr record block: %s\n",
+                       strerror(errno));
+               goto out;
+       }
+       ret_val = 0;
+
+out:
+       return ret_val;
+}
+
+/*******************************************************************************
+ * Function:   load_imsm_migr_rec
+ * Description:        Function reads imsm migration record (it is stored at the last
+ *             sector of disk)
+ * Parameters:
+ *     super   : imsm internal array info
+ *     info    : general array info
+ * Returns:
+ *      0 : success
+ *     -1 : fail
+ ******************************************************************************/
+static int load_imsm_migr_rec(struct intel_super *super, struct mdinfo *info)
+{
+       struct mdinfo *sd;
+       struct dl *dl = NULL;
+       char nm[30];
+       int retval = -1;
+       int fd = -1;
+
+       if (info) {
+               for (sd = info->devs ; sd ; sd = sd->next) {
+                       /* read only from one of the first two slots */
+                       if ((sd->disk.raid_disk > 1) ||
+                           (sd->disk.raid_disk < 0))
+                               continue;
+                       sprintf(nm, "%d:%d", sd->disk.major, sd->disk.minor);
+                       fd = dev_open(nm, O_RDONLY);
+                       if (fd >= 0)
+                               break;
+               }
+       }
+       if (fd < 0) {
+               for (dl = super->disks; dl; dl = dl->next) {
+                       /* read only from one of the first two slots */
+                       if (dl->index > 1)
+                               continue;
+                       sprintf(nm, "%d:%d", dl->major, dl->minor);
+                       fd = dev_open(nm, O_RDONLY);
+                       if (fd >= 0)
+                               break;
+               }
+       }
+       if (fd < 0)
+               goto out;
+       retval = read_imsm_migr_rec(fd, super);
+
+out:
+       if (fd >= 0)
+               close(fd);
+       return retval;
+}
+
+/*******************************************************************************
+ * Function:   write_imsm_migr_rec
+ * Description:        Function writes imsm migration record
+ *             (at the last sector of disk)
+ * Parameters:
+ *     super   : imsm internal array info
+ * Returns:
+ *      0 : success
+ *     -1 : if fail
+ ******************************************************************************/
+static int write_imsm_migr_rec(struct supertype *st)
+{
+       struct intel_super *super = st->sb;
+       unsigned long long dsize;
+       char nm[30];
+       int fd = -1;
+       int retval = -1;
+       struct dl *sd;
+
+       for (sd = super->disks ; sd ; sd = sd->next) {
+               /* write to 2 first slots only */
+               if ((sd->index < 0) || (sd->index > 1))
+                       continue;
+               sprintf(nm, "%d:%d", sd->major, sd->minor);
+               fd = dev_open(nm, O_RDWR);
+               if (fd < 0)
+                       continue;
+               get_dev_size(fd, NULL, &dsize);
+               if (lseek64(fd, dsize - 512, SEEK_SET) < 0) {
+                       fprintf(stderr,
+                               Name ": Cannot seek to anchor block: %s\n",
+                               strerror(errno));
+                       goto out;
+               }
+               if (write(fd, super->migr_rec_buf, 512) != 512) {
+                       fprintf(stderr,
+                               Name ": Cannot write migr record block: %s\n",
+                               strerror(errno));
+                       goto out;
+               }
+               close(fd);
+               fd = -1;
+       }
+
+       retval = 0;
+ out:
+       if (fd >= 0)
+               close(fd);
+       return retval;
+}
+
 static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info, char *dmap)
 {
        struct intel_super *super = st->sb;
+       struct migr_record *migr_rec = super->migr_rec;
        struct imsm_dev *dev = get_imsm_dev(super, super->current_vol);
        struct imsm_map *map = get_imsm_map(dev, 0);
        struct imsm_map *prev_map = get_imsm_map(dev, 1);
        struct imsm_map *map_to_analyse = map;
        struct dl *dl;
        char *devname;
+       unsigned int component_size_alligment;
        int map_disks = info->array.raid_disks;
 
+       memset(info, 0, sizeof(*info));
        if (prev_map)
                map_to_analyse = prev_map;
 
@@ -1574,7 +2010,7 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info,
                if (dl->raiddisk == info->disk.raid_disk)
                        break;
        info->container_member    = super->current_vol;
-       info->array.raid_disks    = map_to_analyse->num_members;
+       info->array.raid_disks    = map->num_members;
        info->array.level         = get_imsm_raid_level(map_to_analyse);
        info->array.layout        = imsm_level_to_layout(info->array.level);
        info->array.md_minor      = -1;
@@ -1586,14 +2022,53 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info,
        info->custom_array_size   = __le32_to_cpu(dev->size_high);
        info->custom_array_size   <<= 32;
        info->custom_array_size   |= __le32_to_cpu(dev->size_low);
-       if (prev_map) {
+       if (prev_map && map->map_state == prev_map->map_state) {
+               info->reshape_active = 1;
                info->new_level = get_imsm_raid_level(map);
                info->new_layout = imsm_level_to_layout(info->new_level);
                info->new_chunk = __le16_to_cpu(map->blocks_per_strip) << 9;
+               info->delta_disks = map->num_members - prev_map->num_members;
+               if (info->delta_disks) {
+                       /* this needs to be applied to every array
+                        * in the container.
+                        */
+                       info->reshape_active = 2;
+               }
+               /* We shape information that we give to md might have to be
+                * modify to cope with md's requirement for reshaping arrays.
+                * For example, when reshaping a RAID0, md requires it to be
+                * presented as a degraded RAID4.
+                * Also if a RAID0 is migrating to a RAID5 we need to specify
+                * the array as already being RAID5, but the 'before' layout
+                * is a RAID4-like layout.
+                */
+               switch (info->array.level) {
+               case 0:
+                       switch(info->new_level) {
+                       case 0:
+                               /* conversion is happening as RAID4 */
+                               info->array.level = 4;
+                               info->array.raid_disks += 1;
+                               break;
+                       case 5:
+                               /* conversion is happening as RAID5 */
+                               info->array.level = 5;
+                               info->array.layout = ALGORITHM_PARITY_N;
+                               info->array.raid_disks += 1;
+                               info->delta_disks -= 1;
+                               break;
+                       default:
+                               /* FIXME error message */
+                               info->array.level = UnSet;
+                               break;
+                       }
+                       break;
+               }
        } else {
                info->new_level = UnSet;
                info->new_layout = UnSet;
                info->new_chunk = info->array.chunk_size;
+               info->delta_disks = 0;
        }
        info->disk.major = 0;
        info->disk.minor = 0;
@@ -1605,27 +2080,65 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info,
        info->data_offset         = __le32_to_cpu(map_to_analyse->pba_of_lba0);
        info->component_size      =
                __le32_to_cpu(map_to_analyse->blocks_per_member);
-       memset(info->uuid, 0, sizeof(info->uuid));
-       info->recovery_start = MaxSector;
-       info->reshape_active = (prev_map != NULL);
-       if (info->reshape_active)
-               info->delta_disks = map->num_members - prev_map->num_members;
-       else
-               info->delta_disks = 0;
 
+       /* check component size aligment
+        */
+       component_size_alligment =
+               info->component_size % (info->array.chunk_size/512);
+
+       if (component_size_alligment &&
+           (info->array.level != 1) && (info->array.level != UnSet)) {
+               dprintf("imsm: reported component size alligned from %llu ",
+                       info->component_size);
+               info->component_size -= component_size_alligment;
+               dprintf("to %llu (%i).\n",
+                       info->component_size, component_size_alligment);
+       }
+
+       memset(info->uuid, 0, sizeof(info->uuid));
+       info->recovery_start = MaxSector;
+
+       info->reshape_progress = 0;
+       info->resync_start = MaxSector;
        if (map_to_analyse->map_state == IMSM_T_STATE_UNINITIALIZED ||
            dev->vol.dirty) {
                info->resync_start = 0;
-       } else if (dev->vol.migr_state) {
+       }
+       if (dev->vol.migr_state) {
                switch (migr_type(dev)) {
                case MIGR_REPAIR:
                case MIGR_INIT: {
-                       __u64 blocks_per_unit = blocks_per_migr_unit(dev);
+                       __u64 blocks_per_unit = blocks_per_migr_unit(super,
+                                                                    dev);
                        __u64 units = __le32_to_cpu(dev->vol.curr_migr_unit);
 
                        info->resync_start = blocks_per_unit * units;
                        break;
                }
+               case MIGR_GEN_MIGR: {
+                       __u64 blocks_per_unit = blocks_per_migr_unit(super,
+                                                                    dev);
+                       __u64 units = __le32_to_cpu(migr_rec->curr_migr_unit);
+                       unsigned long long array_blocks;
+                       int used_disks;
+
+                       info->reshape_progress = blocks_per_unit * units;
+
+                       dprintf("IMSM: General Migration checkpoint : %llu "
+                              "(%llu) -> read reshape progress : %llu\n",
+                               units, blocks_per_unit, info->reshape_progress);
+
+                       used_disks = imsm_num_data_members(dev, 1);
+                       if (used_disks > 0) {
+                               array_blocks = map->blocks_per_member *
+                                       used_disks;
+                               /* round array size down to closest MB
+                                */
+                               info->custom_array_size = (array_blocks
+                                               >> SECT_PER_MB_SHIFT)
+                                               << SECT_PER_MB_SHIFT;
+                       }
+               }
                case MIGR_VERIFY:
                        /* we could emulate the checkpointing of
                         * 'sync_action=check' migrations, but for now
@@ -1633,15 +2146,13 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info,
                         */
                case MIGR_REBUILD:
                        /* this is handled by container_content_imsm() */
-               case MIGR_GEN_MIGR:
                case MIGR_STATE_CHANGE:
                        /* FIXME handle other migrations */
                default:
                        /* we are not dirty, so... */
                        info->resync_start = MaxSector;
                }
-       } else
-               info->resync_start = MaxSector;
+       }
 
        strncpy(info->name, (char *) dev->volume, MAX_RAID_SERIAL_LEN);
        info->name[MAX_RAID_SERIAL_LEN] = 0;
@@ -1697,6 +2208,7 @@ static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info, char *
                getinfo_super_imsm_volume(st, info, map);
                return;
        }
+       memset(info, 0, sizeof(*info));
 
        /* Set raid_disks to zero so that Assemble will always pull in valid
         * spares
@@ -1968,6 +2480,19 @@ static int compare_super_imsm(struct supertype *st, struct supertype *tst)
                 tst->sb = NULL;
                 return 0;
         }
+       /* in platform dependent environment test if the disks
+        * use the same Intel hba
+        */
+       if (!check_env("IMSM_NO_PLATFORM")) {
+               if (!first->hba || !sec->hba ||
+                   (first->hba->type != sec->hba->type))  {
+                       fprintf(stderr,
+                               "HBAs of devices does not match %s != %s\n",
+                               first->hba ? get_sys_dev_type(first->hba->type) : NULL,
+                               sec->hba ? get_sys_dev_type(sec->hba->type) : NULL);
+                       return 3;
+               }
+       }
 
        /* if an anchor does not have num_raid_devs set then it is a free
         * floating spare
@@ -2246,8 +2771,11 @@ load_imsm_disk(int fd, struct intel_super *super, char *devname, int keep_fd)
  *    map1state=normal)
  * 4/ Rebuild (migr_state=1 migr_type=MIGR_REBUILD map0state=normal
  *    map1state=degraded)
+ * 5/ Migration (mig_state=1 migr_type=MIGR_GEN_MIGR map0state=normal
+ *    map1state=normal)
  */
-static void migrate(struct imsm_dev *dev, __u8 to_state, int migr_type)
+static void migrate(struct imsm_dev *dev, struct intel_super *super,
+                   __u8 to_state, int migr_type)
 {
        struct imsm_map *dest;
        struct imsm_map *src = get_imsm_map(dev, 0);
@@ -2270,6 +2798,10 @@ static void migrate(struct imsm_dev *dev, __u8 to_state, int migr_type)
                }
        }
 
+       if (migr_type == MIGR_GEN_MIGR)
+               /* Clear migration record */
+               memset(super->migr_rec, 0, sizeof(struct migr_record));
+
        src->map_state = to_state;
 }
 
@@ -2307,6 +2839,7 @@ static int parse_raid_devices(struct intel_super *super)
        int i;
        struct imsm_dev *dev_new;
        size_t len, len_migr;
+       size_t max_len = 0;
        size_t space_needed = 0;
        struct imsm_super *mpb = super->anchor;
 
@@ -2322,7 +2855,11 @@ static int parse_raid_devices(struct intel_super *super)
                dv = malloc(sizeof(*dv));
                if (!dv)
                        return 1;
-               dev_new = malloc(len_migr);
+               if (max_len < len_migr)
+                       max_len = len_migr;
+               if (max_len > len_migr)
+                       space_needed += max_len - len_migr;
+               dev_new = malloc(max_len);
                if (!dev_new) {
                        free(dv);
                        return 1;
@@ -2367,10 +2904,48 @@ struct bbm_log *__get_imsm_bbm_log(struct imsm_super *mpb)
        return ptr;
 }
 
+/*******************************************************************************
+ * Function:   check_mpb_migr_compatibility
+ * Description:        Function checks for unsupported migration features:
+ *             - migration optimization area (pba_of_lba0)
+ *             - descending reshape (ascending_migr)
+ * Parameters:
+ *     super   : imsm metadata information
+ * Returns:
+ *      0 : migration is compatible
+ *     -1 : migration is not compatible
+ ******************************************************************************/
+int check_mpb_migr_compatibility(struct intel_super *super)
+{
+       struct imsm_map *map0, *map1;
+       struct migr_record *migr_rec = super->migr_rec;
+       int i;
+
+       for (i = 0; i < super->anchor->num_raid_devs; i++) {
+               struct imsm_dev *dev_iter = __get_imsm_dev(super->anchor, i);
+
+               if (dev_iter &&
+                   dev_iter->vol.migr_state == 1 &&
+                   dev_iter->vol.migr_type == MIGR_GEN_MIGR) {
+                       /* This device is migrating */
+                       map0 = get_imsm_map(dev_iter, 0);
+                       map1 = get_imsm_map(dev_iter, 1);
+                       if (map0->pba_of_lba0 != map1->pba_of_lba0)
+                               /* migration optimization area was used */
+                               return -1;
+                       if (migr_rec->ascending_migr == 0
+                               && migr_rec->dest_depth_per_unit > 0)
+                               /* descending reshape not supported yet */
+                               return -1;
+               }
+       }
+       return 0;
+}
+
 static void __free_imsm(struct intel_super *super, int free_disks);
 
 /* load_imsm_mpb - read matrix metadata
- * allocates super->mpb to be freed by free_super
+ * allocates super->mpb to be freed by free_imsm
  */
 static int load_imsm_mpb(int fd, struct intel_super *super, char *devname)
 {
@@ -2422,6 +2997,10 @@ static int load_imsm_mpb(int fd, struct intel_super *super, char *devname)
        }
 
        __free_imsm(super, 0);
+       /*  reload capability and hba */
+
+       /* capability and hba must be updated with new super allocation */
+       find_intel_hba_capability(fd, super, devname);
        super->len = ROUND_UP(anchor->mpb_size, 512);
        if (posix_memalign(&super->buf, 512, super->len) != 0) {
                if (devname)
@@ -2435,6 +3014,14 @@ static int load_imsm_mpb(int fd, struct intel_super *super, char *devname)
 
        sectors = mpb_sectors(anchor) - 1;
        free(anchor);
+
+       if (posix_memalign(&super->migr_rec_buf, 512, 512) != 0) {
+               fprintf(stderr, Name
+                       ": %s could not allocate migr_rec buffer\n", __func__);
+               free(super->buf);
+               return 2;
+       }
+
        if (!sectors) {
                check_sum = __gen_imsm_checksum(super->anchor);
                if (check_sum != __le32_to_cpu(super->anchor->check_sum)) {
@@ -2486,6 +3073,8 @@ static int load_imsm_mpb(int fd, struct intel_super *super, char *devname)
        return 0;
 }
 
+static int read_imsm_migr_rec(int fd, struct intel_super *super);
+
 static int
 load_and_parse_mpb(int fd, struct intel_super *super, char *devname, int keep_fd)
 {
@@ -2523,6 +3112,11 @@ static void free_imsm_disks(struct intel_super *super)
                super->disks = d->next;
                __free_imsm_disk(d);
        }
+       while (super->disk_mgmt_list) {
+               d = super->disk_mgmt_list;
+               super->disk_mgmt_list = d->next;
+               __free_imsm_disk(d);
+       }
        while (super->missing) {
                d = super->missing;
                super->missing = d->next;
@@ -2534,17 +3128,30 @@ static void free_imsm_disks(struct intel_super *super)
 /* free all the pieces hanging off of a super pointer */
 static void __free_imsm(struct intel_super *super, int free_disks)
 {
+       struct intel_hba *elem, *next;
+
        if (super->buf) {
                free(super->buf);
                super->buf = NULL;
        }
+       /* unlink capability description */
+       super->orom = NULL;
+       if (super->migr_rec_buf) {
+               free(super->migr_rec_buf);
+               super->migr_rec_buf = NULL;
+       }
        if (free_disks)
                free_imsm_disks(super);
        free_devlist(super);
-       if (super->hba) {
-               free((void *) super->hba);
-               super->hba = NULL;
+       elem = super->hba;
+       while (elem) {
+               if (elem->path)
+                       free((void *)elem->path);
+               next = elem->next;
+               free(elem);
+               elem = next;
        }
+       super->hba = NULL;
 }
 
 static void free_imsm(struct intel_super *super)
@@ -2572,25 +3179,64 @@ static struct intel_super *alloc_super(void)
                memset(super, 0, sizeof(*super));
                super->current_vol = -1;
                super->create_offset = ~((__u32 ) 0);
-               if (!check_env("IMSM_NO_PLATFORM"))
-                       super->orom = find_imsm_orom();
-               if (super->orom && !check_env("IMSM_TEST_OROM")) {
-                       struct sys_dev *list, *ent;
-
-                       /* find the first intel ahci controller */
-                       list = find_driver_devices("pci", "ahci");
-                       for (ent = list; ent; ent = ent->next)
-                               if (devpath_to_vendor(ent->path) == 0x8086)
-                                       break;
-                       if (ent) {
-                               super->hba = ent->path;
-                               ent->path = NULL;
+       }
+       return super;
+}
+
+/*
+ * find and allocate hba and OROM/EFI based on valid fd of RAID component device
+ */
+static int find_intel_hba_capability(int fd, struct intel_super *super, char *devname)
+{
+       struct sys_dev *hba_name;
+       int rv = 0;
+
+       if ((fd < 0) || check_env("IMSM_NO_PLATFORM")) {
+               super->orom = NULL;
+               super->hba = NULL;
+               return 0;
+       }
+       hba_name = find_disk_attached_hba(fd, NULL);
+       if (!hba_name) {
+               if (devname)
+                       fprintf(stderr,
+                               Name ": %s is not attached to Intel(R) RAID controller.\n",
+                               devname);
+               return 1;
+       }
+       rv = attach_hba_to_super(super, hba_name);
+       if (rv == 2) {
+               if (devname) {
+                       struct intel_hba *hba = super->hba;
+
+                       fprintf(stderr, Name ": %s is attached to Intel(R) %s RAID "
+                               "controller (%s),\n"
+                               "    but the container is assigned to Intel(R) "
+                               "%s RAID controller (",
+                               devname,
+                               hba_name->path,
+                               hba_name->pci_id ? : "Err!",
+                               get_sys_dev_type(hba_name->type));
+
+                       while (hba) {
+                               fprintf(stderr, "%s", hba->pci_id ? : "Err!");
+                               if (hba->next)
+                                       fprintf(stderr, ", ");
+                               hba = hba->next;
                        }
-                       free_sys_dev(&list);
+
+                       fprintf(stderr, ").\n"
+                               "    Mixing devices attached to different controllers "
+                               "is not allowed.\n");
                }
+               free_sys_dev(&hba_name);
+               return 2;
        }
-
-       return super;
+       super->orom = find_imsm_capability(hba_name->type);
+       free_sys_dev(&hba_name);
+       if (!super->orom)
+               return 3;
+       return 0;
 }
 
 #ifndef MDASSEMBLE
@@ -2973,6 +3619,7 @@ static int load_super_imsm_all(struct supertype *st, int fd, void **sbp,
                struct intel_super *s = alloc_super();
                char nm[32];
                int dfd;
+               int rv;
 
                err = 1;
                if (!s)
@@ -2986,6 +3633,11 @@ static int load_super_imsm_all(struct supertype *st, int fd, void **sbp,
                if (dfd < 0)
                        goto error;
 
+               rv = find_intel_hba_capability(dfd, s, devname);
+               /* no orom/efi or non-intel hba of the disk */
+               if (rv != 0)
+                       goto error;
+
                err = load_and_parse_mpb(dfd, s, NULL, 1);
 
                /* retry the load if we might have raced against mdmon */
@@ -3012,6 +3664,26 @@ static int load_super_imsm_all(struct supertype *st, int fd, void **sbp,
                err = 2;
                goto error;
        }
+
+       /* load migration record */
+       err = load_imsm_migr_rec(super, NULL);
+       if (err) {
+               err = 4;
+               goto error;
+       }
+
+       /* Check migration compatibility */
+       if (check_mpb_migr_compatibility(super) != 0) {
+               fprintf(stderr, Name ": Unsupported migration detected");
+               if (devname)
+                       fprintf(stderr, " on %s\n", devname);
+               else
+                       fprintf(stderr, " (IMSM).\n");
+
+               err = 5;
+               goto error;
+       }
+
        err = 0;
 
  error:
@@ -3060,7 +3732,19 @@ static int load_super_imsm(struct supertype *st, int fd, char *devname)
                        sizeof(*super));
                return 1;
        }
-
+       /* Load hba and capabilities if they exist.
+        * But do not preclude loading metadata in case capabilities or hba are
+        * non-compliant and ignore_hw_compat is set.
+        */
+       rv = find_intel_hba_capability(fd, super, devname);
+       /* no orom/efi or non-intel hba of the disk */
+       if ((rv != 0) && (st->ignore_hw_compat == 0)) {
+               if (devname)
+                       fprintf(stderr,
+                               Name ": No OROM/EFI properties for %s\n", devname);
+               free_imsm(super);
+               return 2;
+       }
        rv = load_and_parse_mpb(fd, super, devname, 0);
 
        if (rv) {
@@ -3078,6 +3762,20 @@ static int load_super_imsm(struct supertype *st, int fd, char *devname)
                st->minor_version = 0;
                st->max_devs = IMSM_MAX_DEVICES;
        }
+
+       /* load migration record */
+       load_imsm_migr_rec(super, NULL);
+
+       /* Check for unsupported migration features */
+       if (check_mpb_migr_compatibility(super) != 0) {
+               fprintf(stderr, Name ": Unsupported migration detected");
+               if (devname)
+                       fprintf(stderr, " on %s\n", devname);
+               else
+                       fprintf(stderr, " (IMSM).\n");
+               return 3;
+       }
+
        return 0;
 }
 
@@ -3213,6 +3911,14 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info,
                        fprintf(stderr, Name": could not allocate new mpb\n");
                        return 0;
                }
+               if (posix_memalign(&super->migr_rec_buf, 512, 512) != 0) {
+                       fprintf(stderr, Name
+                               ": %s could not allocate migr_rec buffer\n",
+                               __func__);
+                       free(super->buf);
+                       free(super);
+                       return 0;
+               }
                memcpy(mpb_new, mpb, size_old);
                free(mpb);
                mpb = mpb_new;
@@ -3235,12 +3941,13 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info,
                fprintf(stderr, Name ": failed to allocate device list entry\n");
                return 0;
        }
-       dev = malloc(sizeof(*dev) + sizeof(__u32) * (info->raid_disks - 1));
+       dev = calloc(1, sizeof(*dev) + sizeof(__u32) * (info->raid_disks - 1));
        if (!dev) {
                free(dv);
                fprintf(stderr, Name": could not allocate raid device\n");
                return 0;
        }
+
        strncpy((char *) dev->volume, name, MAX_RAID_SERIAL_LEN);
        if (info->level == 1)
                array_blocks = info_to_blocks_per_member(info);
@@ -3253,8 +3960,7 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info,
 
        dev->size_low = __cpu_to_le32((__u32) array_blocks);
        dev->size_high = __cpu_to_le32((__u32) (array_blocks >> 32));
-       dev->status = __cpu_to_le32(0);
-       dev->reserved_blocks = __cpu_to_le32(0);
+       dev->status = (DEV_READ_COALESCING | DEV_WRITE_COALESCING);
        vol = &dev->vol;
        vol->migr_state = 0;
        set_migr_type(dev, MIGR_INIT);
@@ -3341,6 +4047,13 @@ static int init_super_imsm(struct supertype *st, mdu_array_info_t *info,
                        ": %s could not allocate superblock\n", __func__);
                return 0;
        }
+       if (posix_memalign(&super->migr_rec_buf, 512, 512) != 0) {
+               fprintf(stderr, Name
+                       ": %s could not allocate migr_rec buffer\n", __func__);
+               free(super->buf);
+               free(super);
+               return 0;
+       }
        memset(super->buf, 0, mpb_size);
        mpb = super->buf;
        mpb->mpb_size = __cpu_to_le32(mpb_size);
@@ -3437,8 +4150,9 @@ static int add_to_super_imsm_volume(struct supertype *st, mdu_disk_info_t *dk,
        return 0;
 }
 
+
 static int add_to_super_imsm(struct supertype *st, mdu_disk_info_t *dk,
-                             int fd, char *devname)
+                            int fd, char *devname)
 {
        struct intel_super *super = st->sb;
        struct dl *dd;
@@ -3447,13 +4161,16 @@ static int add_to_super_imsm(struct supertype *st, mdu_disk_info_t *dk,
        int rv;
        struct stat stb;
 
-       /* if we are on an RAID enabled platform check that the disk is
-        * attached to the raid controller
+       /* If we are on an RAID enabled platform check that the disk is
+        * attached to the raid controller.
+        * We do not need to test disks attachment for container based additions,
+        * they shall be already tested when container was created/assembled.
         */
-       if (super->hba && !disk_attached_to_hba(fd, super->hba)) {
-               fprintf(stderr,
-                       Name ": %s is not attached to the raid controller: %s\n",
-                       devname ? : "disk", super->hba);
+       rv = find_intel_hba_capability(fd, super, devname);
+       /* no orom/efi or non-intel hba of the disk */
+       if (rv != 0) {
+               dprintf("capability: %p fd: %d ret: %d\n",
+                       super->orom, fd, rv);
                return 1;
        }
 
@@ -3499,6 +4216,7 @@ static int add_to_super_imsm(struct supertype *st, mdu_disk_info_t *dk,
        } else {
                dd->next = super->disks;
                super->disks = dd;
+               super->updates_pending++;
        }
 
        return 0;
@@ -3594,6 +4312,8 @@ static int write_super_imsm_spares(struct intel_super *super, int doclose)
        return 0;
 }
 
+static int is_gen_migration(struct imsm_dev *dev);
+
 static int write_super_imsm(struct supertype *st, int doclose)
 {
        struct intel_super *super = st->sb;
@@ -3605,6 +4325,7 @@ static int write_super_imsm(struct supertype *st, int doclose)
        int i;
        __u32 mpb_size = sizeof(struct imsm_super) - sizeof(struct imsm_disk);
        int num_disks = 0;
+       int clear_migration_record = 1;
 
        /* 'generation' is incremented everytime the metadata is written */
        generation = __le32_to_cpu(mpb->generation_num);
@@ -3639,6 +4360,8 @@ static int write_super_imsm(struct supertype *st, int doclose)
                        imsm_copy_dev(dev, dev2);
                        mpb_size += sizeof_imsm_dev(dev, 0);
                }
+               if (is_gen_migration(dev2))
+                       clear_migration_record = 0;
        }
        mpb_size += __le32_to_cpu(mpb->bbm_log_size);
        mpb->mpb_size = __cpu_to_le32(mpb_size);
@@ -3647,6 +4370,9 @@ static int write_super_imsm(struct supertype *st, int doclose)
        sum = __gen_imsm_checksum(mpb);
        mpb->check_sum = __cpu_to_le32(sum);
 
+       if (clear_migration_record)
+               memset(super->migr_rec_buf, 0, 512);
+
        /* write the mpb for disks that compose raid devices */
        for (d = super->disks; d ; d = d->next) {
                if (d->index < 0)
@@ -3654,6 +4380,14 @@ static int write_super_imsm(struct supertype *st, int doclose)
                if (store_imsm_mpb(d->fd, mpb))
                        fprintf(stderr, "%s: failed for device %d:%d %s\n",
                                __func__, d->major, d->minor, strerror(errno));
+               if (clear_migration_record) {
+                       unsigned long long dsize;
+
+                       get_dev_size(d->fd, NULL, &dsize);
+                       if (lseek64(d->fd, dsize - 512, SEEK_SET) >= 0) {
+                               write(d->fd, super->migr_rec_buf, 512);
+                       }
+               }
                if (doclose) {
                        close(d->fd);
                        d->fd = -1;
@@ -3736,7 +4470,6 @@ static int write_init_super_imsm(struct supertype *st)
        if (st->update_tail) {
                /* queue the recently created array / added disk
                 * as a metadata update */
-               struct dl *d;
                int rv;
 
                /* determine if we are creating a volume or adding a disk */
@@ -3748,11 +4481,6 @@ static int write_init_super_imsm(struct supertype *st)
                } else
                        rv = create_array(st, current_vol);
 
-               for (d = super->disks; d ; d = d->next) {
-                       close(d->fd);
-                       d->fd = -1;
-               }
-
                return rv;
        } else {
                struct dl *d;
@@ -3792,25 +4520,14 @@ static int validate_geometry_imsm_container(struct supertype *st, int level,
 {
        int fd;
        unsigned long long ldsize;
-       const struct imsm_orom *orom;
+       struct intel_super *super=NULL;
+       int rv = 0;
 
        if (level != LEVEL_CONTAINER)
                return 0;
        if (!dev)
                return 1;
 
-       if (check_env("IMSM_NO_PLATFORM"))
-               orom = NULL;
-       else
-               orom = find_imsm_orom();
-       if (orom && raiddisks > orom->tds) {
-               if (verbose)
-                       fprintf(stderr, Name ": %d exceeds maximum number of"
-                               " platform supported disks: %d\n",
-                               raiddisks, orom->tds);
-               return 0;
-       }
-
        fd = open(dev, O_RDONLY|O_EXCL, 0);
        if (fd < 0) {
                if (verbose)
@@ -3822,9 +4539,45 @@ static int validate_geometry_imsm_container(struct supertype *st, int level,
                close(fd);
                return 0;
        }
+
+       /* capabilities retrieve could be possible
+        * note that there is no fd for the disks in array.
+        */
+       super = alloc_super();
+       if (!super) {
+               fprintf(stderr,
+                       Name ": malloc of %zu failed.\n",
+                       sizeof(*super));
+               close(fd);
+               return 0;
+       }
+
+       rv = find_intel_hba_capability(fd, super, verbose ? dev : NULL);
+       if (rv != 0) {
+#if DEBUG
+               char str[256];
+               fd2devname(fd, str);
+               dprintf("validate_geometry_imsm_container: fd: %d %s orom: %p rv: %d raiddisk: %d\n",
+                       fd, str, super->orom, rv, raiddisks);
+#endif
+               /* no orom/efi or non-intel hba of the disk */
+               close(fd);
+               free_imsm(super);
+               return 0;
+       }
        close(fd);
+       if (super->orom && raiddisks > super->orom->tds) {
+               if (verbose)
+                       fprintf(stderr, Name ": %d exceeds maximum number of"
+                               " platform supported disks: %d\n",
+                               raiddisks, super->orom->tds);
+
+               free_imsm(super);
+               return 0;
+       }
 
        *freesize = avail_size_imsm(st, ldsize >> 9);
+       free_imsm(super);
 
        return 1;
 }
@@ -3959,20 +4712,42 @@ static int is_raid_level_supported(const struct imsm_orom *orom, int level, int
        return 0;
 }
 
+
 #define pr_vrb(fmt, arg...) (void) (verbose && fprintf(stderr, Name fmt, ##arg))
+/*
+ * validate volume parameters with OROM/EFI capabilities
+ */
 static int
 validate_geometry_imsm_orom(struct intel_super *super, int level, int layout,
-                           int raiddisks, int chunk, int verbose)
+                           int raiddisks, int *chunk, int verbose)
 {
-       if (!is_raid_level_supported(super->orom, level, raiddisks)) {
+#if DEBUG
+       verbose = 1;
+#endif
+       /* validate container capabilities */
+       if (super->orom && raiddisks > super->orom->tds) {
+               if (verbose)
+                       fprintf(stderr, Name ": %d exceeds maximum number of"
+                               " platform supported disks: %d\n",
+                               raiddisks, super->orom->tds);
+               return 0;
+       }
+
+        /* capabilities of OROM tested - copied from validate_geometry_imsm_volume */
+       if (super->orom && (!is_raid_level_supported(super->orom, level,
+                                                    raiddisks))) {
                pr_vrb(": platform does not support raid%d with %d disk%s\n",
                        level, raiddisks, raiddisks > 1 ? "s" : "");
                return 0;
        }
-       if (super->orom && level != 1 &&
-           !imsm_orom_has_chunk(super->orom, chunk)) {
-               pr_vrb(": platform does not support a chunk size of: %d\n", chunk);
-               return 0;
+       if (super->orom && level != 1) {
+               if (chunk && (*chunk == 0 || *chunk == UnSet))
+                       *chunk = imsm_orom_default_chunk(super->orom);
+               else if (chunk && !imsm_orom_has_chunk(super->orom, *chunk)) {
+                       pr_vrb(": platform does not support a chunk size of: "
+                              "%d\n", *chunk);
+                       return 0;
+               }
        }
        if (layout != imsm_level_to_layout(level)) {
                if (level == 5)
@@ -3984,7 +4759,6 @@ validate_geometry_imsm_orom(struct intel_super *super, int level, int layout,
                                layout, level);
                return 0;
        }
-
        return 1;
 }
 
@@ -3992,7 +4766,7 @@ validate_geometry_imsm_orom(struct intel_super *super, int level, int layout,
  * FIX ME add ahci details
  */
 static int validate_geometry_imsm_volume(struct supertype *st, int level,
-                                        int layout, int raiddisks, int chunk,
+                                        int layout, int raiddisks, int *chunk,
                                         unsigned long long size, char *dev,
                                         unsigned long long *freesize,
                                         int verbose)
@@ -4010,9 +4784,11 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
        if (!super)
                return 0;
 
-       if (!validate_geometry_imsm_orom(super, level, layout, raiddisks, chunk, verbose))
+       if (!validate_geometry_imsm_orom(super, level, layout, raiddisks, chunk, verbose)) {
+               fprintf(stderr, Name ": RAID gemetry validation failed. "
+                       "Cannot proceed with the action(s).\n");
                return 0;
-
+       }
        if (!dev) {
                /* General test:  make sure there is space for
                 * 'raiddisks' device extents of size 'size' at a given
@@ -4181,7 +4957,8 @@ static int reserve_space(struct supertype *st, int raiddisks,
        maxsize = merge_extents(super, extent_cnt);
        minsize = size;
        if (size == 0)
-               minsize = chunk;
+               /* chunk is in K */
+               minsize = chunk * 2;
 
        if (cnt < raiddisks ||
            (super->orom && used && used != raiddisks) ||
@@ -4194,8 +4971,8 @@ static int reserve_space(struct supertype *st, int raiddisks,
        if (size == 0) {
                size = maxsize;
                if (chunk) {
-                       size /= chunk;
-                       size *= chunk;
+                       size /= 2 * chunk;
+                       size *= 2 * chunk;
                }
        }
 
@@ -4210,7 +4987,7 @@ static int reserve_space(struct supertype *st, int raiddisks,
 }
 
 static int validate_geometry_imsm(struct supertype *st, int level, int layout,
-                                 int raiddisks, int chunk, unsigned long long size,
+                                 int raiddisks, int *chunk, unsigned long long size,
                                  char *dev, unsigned long long *freesize,
                                  int verbose)
 {
@@ -4218,13 +4995,15 @@ static int validate_geometry_imsm(struct supertype *st, int level, int layout,
        struct mdinfo *sra;
        int is_member = 0;
 
-       /* if given unused devices create a container 
+       /* load capability
+        * if given unused devices create a container
         * if given given devices in a container create a member volume
         */
        if (level == LEVEL_CONTAINER) {
                /* Must be a fresh device to add to a container */
                return validate_geometry_imsm_container(st, level, layout,
-                                                       raiddisks, chunk, size,
+                                                       raiddisks,
+                                                       chunk?*chunk:0, size,
                                                        dev, freesize,
                                                        verbose);
        }
@@ -4243,7 +5022,8 @@ static int validate_geometry_imsm(struct supertype *st, int level, int layout,
                                                         raiddisks, chunk,
                                                         verbose))
                                return 0;
-                       return reserve_space(st, raiddisks, size, chunk, freesize);
+                       return reserve_space(st, raiddisks, size,
+                                            chunk?*chunk:0, freesize);
                }
                return 1;
        }
@@ -4450,7 +5230,6 @@ static int update_subarray_imsm(struct supertype *st, char *subarray,
 
        return 0;
 }
-#endif /* MDASSEMBLE */
 
 static int is_gen_migration(struct imsm_dev *dev)
 {
@@ -4462,6 +5241,7 @@ static int is_gen_migration(struct imsm_dev *dev)
 
        return 0;
 }
+#endif /* MDASSEMBLE */
 
 static int is_rebuilding(struct imsm_dev *dev)
 {
@@ -4481,7 +5261,9 @@ static int is_rebuilding(struct imsm_dev *dev)
                return 0;
 }
 
-static void update_recovery_start(struct imsm_dev *dev, struct mdinfo *array)
+static void update_recovery_start(struct intel_super *super,
+                                       struct imsm_dev *dev,
+                                       struct mdinfo *array)
 {
        struct mdinfo *rebuild = NULL;
        struct mdinfo *d;
@@ -4508,9 +5290,10 @@ static void update_recovery_start(struct imsm_dev *dev, struct mdinfo *array)
        }
 
        units = __le32_to_cpu(dev->vol.curr_migr_unit);
-       rebuild->recovery_start = units * blocks_per_migr_unit(dev);
+       rebuild->recovery_start = units * blocks_per_migr_unit(super, dev);
 }
 
+static int recover_backup_imsm(struct supertype *st, struct mdinfo *info);
 
 static struct mdinfo *container_content_imsm(struct supertype *st, char *subarray)
 {
@@ -4528,17 +5311,25 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
        struct mdinfo *rest = NULL;
        unsigned int i;
        int bbm_errors = 0;
+       struct dl *d;
+       int spare_disks = 0;
 
        /* check for bad blocks */
        if (imsm_bbm_log_size(super->anchor))
                bbm_errors = 1;
 
+       /* count spare devices, not used in maps
+        */
+       for (d = super->disks; d; d = d->next)
+               if (d->index == -1)
+                       spare_disks++;
+
        for (i = 0; i < mpb->num_raid_devs; i++) {
                struct imsm_dev *dev;
                struct imsm_map *map;
                struct imsm_map *map2;
                struct mdinfo *this;
-               int slot;
+               int slot, chunk;
                char *ep;
 
                if (subarray &&
@@ -4559,7 +5350,23 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
                                dev->volume);
                        continue;
                }
+               /* do not publish arrays that are not support by controller's
+                * OROM/EFI
+                */
 
+               chunk = __le16_to_cpu(map->blocks_per_strip) >> 1;
+#ifndef MDASSEMBLE
+               if (!validate_geometry_imsm_orom(super,
+                                                get_imsm_raid_level(map), /* RAID level */
+                                                imsm_level_to_layout(get_imsm_raid_level(map)),
+                                                map->num_members, /* raid disks */
+                                                &chunk,
+                                                1 /* verbose */)) {
+                       fprintf(stderr, Name ": RAID gemetry validation failed. "
+                               "Cannot proceed with the action(s).\n");
+                       continue;
+               }
+#endif /* MDASSEMBLE */
                this = malloc(sizeof(*this));
                if (!this) {
                        fprintf(stderr, Name ": failed to allocate %zu bytes\n",
@@ -4581,7 +5388,7 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
 
                        skip = 0;
                        idx = get_imsm_disk_idx(dev, slot, 0);
-                       ord = get_imsm_ord_tbl_ent(dev, slot, 0);
+                       ord = get_imsm_ord_tbl_ent(dev, slot, -1);
                        for (d = super->disks; d ; d = d->next)
                                if (d->index == idx)
                                        break;
@@ -4632,9 +5439,13 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
                        if (map2) {
                                if (slot < map2->num_members)
                                        info_d->disk.state = (1 << MD_DISK_ACTIVE);
+                               else
+                                       this->array.spare_disks++;
                        } else {
                                if (slot < map->num_members)
                                        info_d->disk.state = (1 << MD_DISK_ACTIVE);
+                               else
+                                       this->array.spare_disks++;
                        }
                        if (info_d->recovery_start == MaxSector)
                                this->array.working_disks++;
@@ -4644,7 +5455,13 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
                        info_d->component_size = __le32_to_cpu(map->blocks_per_member);
                }
                /* now that the disk list is up-to-date fixup recovery_start */
-               update_recovery_start(dev, this);
+               update_recovery_start(super, dev, this);
+               this->array.spare_disks += spare_disks;
+
+               /* check for reshape */
+               if (this->reshape_active == 1)
+                       recover_backup_imsm(st, this);
+
                rest = this;
        }
 
@@ -4814,7 +5631,6 @@ static int mark_failure(struct imsm_dev *dev, struct imsm_disk *disk, int idx)
                return 0;
 
        disk->status |= FAILED_DISK;
-       disk->status &= ~CONFIGURED_DISK;
        set_imsm_ord_tbl_ent(map, slot, idx | IMSM_ORD_REBUILD);
        if (map->failed_disk_num == 0xff)
                map->failed_disk_num = slot;
@@ -4850,6 +5666,37 @@ static void handle_missing(struct intel_super *super, struct imsm_dev *dev)
        super->updates_pending++;
 }
 
+static unsigned long long imsm_set_array_size(struct imsm_dev *dev)
+{
+       int used_disks = imsm_num_data_members(dev, 0);
+       unsigned long long array_blocks;
+       struct imsm_map *map;
+
+       if (used_disks == 0) {
+               /* when problems occures
+                * return current array_blocks value
+                */
+               array_blocks = __le32_to_cpu(dev->size_high);
+               array_blocks = array_blocks << 32;
+               array_blocks += __le32_to_cpu(dev->size_low);
+
+               return array_blocks;
+       }
+
+       /* set array size in metadata
+        */
+       map = get_imsm_map(dev, 0);
+       array_blocks = map->blocks_per_member * used_disks;
+
+       /* round array size down to closest MB
+        */
+       array_blocks = (array_blocks >> SECT_PER_MB_SHIFT) << SECT_PER_MB_SHIFT;
+       dev->size_low = __cpu_to_le32((__u32)array_blocks);
+       dev->size_high = __cpu_to_le32((__u32)(array_blocks >> 32));
+
+       return array_blocks;
+}
+
 static void imsm_set_disk(struct active_array *a, int n, int state);
 
 static void imsm_progress_container_reshape(struct intel_super *super)
@@ -4862,13 +5709,13 @@ static void imsm_progress_container_reshape(struct intel_super *super)
        struct imsm_super *mpb = super->anchor;
        int prev_disks = -1;
        int i;
+       int copy_map_size;
 
        for (i = 0; i < mpb->num_raid_devs; i++) {
                struct imsm_dev *dev = get_imsm_dev(super, i);
                struct imsm_map *map = get_imsm_map(dev, 0);
                struct imsm_map *map2;
                int prev_num_members;
-               int used_disks;
 
                if (dev->vol.migr_state)
                        return;
@@ -4882,6 +5729,7 @@ static void imsm_progress_container_reshape(struct intel_super *super)
                 * i.e it needs a migr_state
                 */
 
+               copy_map_size = sizeof_imsm_map(map);
                prev_num_members = map->num_members;
                map->num_members = prev_disks;
                dev->vol.migr_state = 1;
@@ -4892,29 +5740,10 @@ static void imsm_progress_container_reshape(struct intel_super *super)
                        set_imsm_ord_tbl_ent(map, i, i);
                map2 = get_imsm_map(dev, 1);
                /* Copy the current map */
-               memcpy(map2, map, sizeof_imsm_map(map));
+               memcpy(map2, map, copy_map_size);
                map2->num_members = prev_num_members;
 
-               /* calculate new size
-                */
-               used_disks = imsm_num_data_members(dev, 0);
-               if (used_disks) {
-                       unsigned long long array_blocks;
-
-                       array_blocks =
-                               map->blocks_per_member
-                               * used_disks;
-                       /* round array size down to closest MB
-                        */
-                       array_blocks = (array_blocks
-                                       >> SECT_PER_MB_SHIFT)
-                               << SECT_PER_MB_SHIFT;
-                       dev->size_low =
-                               __cpu_to_le32((__u32)array_blocks);
-                       dev->size_high =
-                               __cpu_to_le32(
-                                       (__u32)(array_blocks >> 32));
-               }
+               imsm_set_array_size(dev);
                super->updates_pending++;
        }
 }
@@ -4944,18 +5773,7 @@ static int imsm_set_array_state(struct active_array *a, int consistent)
                 */
                if (a->curr_action == reshape) {
                        /* still reshaping, maybe update curr_migr_unit */
-                       long long blocks_per_unit = blocks_per_migr_unit(dev);
-                       long long unit = a->last_checkpoint;
-                       if (blocks_per_unit) {
-                               unit /= blocks_per_unit;
-                               if (unit >
-                                   __le32_to_cpu(dev->vol.curr_migr_unit)) {
-                                       dev->vol.curr_migr_unit =
-                                               __cpu_to_le32(unit);
-                                       super->updates_pending++;
-                               }
-                       }
-                       return 0;
+                       goto mark_checkpoint;
                } else {
                        if (a->last_checkpoint == 0 && a->prev_action == reshape) {
                                /* for some reason we aborted the reshape.
@@ -4971,25 +5789,33 @@ static int imsm_set_array_state(struct active_array *a, int consistent)
                        if (a->last_checkpoint >= a->info.component_size) {
                                unsigned long long array_blocks;
                                int used_disks;
-                               /* it seems the reshape is all done */
-                               dev->vol.migr_state = 0;
-                               dev->vol.migr_type = 0;
-                               dev->vol.curr_migr_unit = 0;
+                               struct mdinfo *mdi;
+
+                               used_disks = imsm_num_data_members(dev, 0);
+                               if (used_disks > 0) {
+                                       array_blocks =
+                                               map->blocks_per_member *
+                                               used_disks;
+                                       /* round array size down to closest MB
+                                        */
+                                       array_blocks = (array_blocks
+                                                       >> SECT_PER_MB_SHIFT)
+                                               << SECT_PER_MB_SHIFT;
+                                       a->info.custom_array_size = array_blocks;
+                                       /* encourage manager to update array
+                                        * size
+                                        */
+
+                                       a->check_reshape = 1;
+                               }
+                               /* finalize online capacity expansion/reshape */
+                               for (mdi = a->info.devs; mdi; mdi = mdi->next)
+                                       imsm_set_disk(a,
+                                                     mdi->disk.raid_disk,
+                                                     mdi->curr_state);
 
-                               used_disks = imsm_num_data_members(dev, -1);
-                               array_blocks = map->blocks_per_member * used_disks;
-                               /* round array size down to closest MB */
-                               array_blocks = (array_blocks >> SECT_PER_MB_SHIFT)
-                                       << SECT_PER_MB_SHIFT;
-                               dev->size_low = __cpu_to_le32((__u32) array_blocks);
-                               dev->size_high = __cpu_to_le32((__u32) (array_blocks >> 32));
-                               a->info.custom_array_size = array_blocks;
-                               a->check_reshape = 1; /* encourage manager to update
-                                                      * array size
-                                                      */
-                               super->updates_pending++;
                                imsm_progress_container_reshape(super);
-                       }                               
+                       }
                }
        }
 
@@ -5018,14 +5844,21 @@ static int imsm_set_array_state(struct active_array *a, int consistent)
                /* mark the start of the init process if nothing is failed */
                dprintf("imsm: mark resync start\n");
                if (map->map_state == IMSM_T_STATE_UNINITIALIZED)
-                       migrate(dev, IMSM_T_STATE_NORMAL, MIGR_INIT);
+                       migrate(dev, super, IMSM_T_STATE_NORMAL, MIGR_INIT);
                else
-                       migrate(dev, IMSM_T_STATE_NORMAL, MIGR_REPAIR);
+                       migrate(dev, super, IMSM_T_STATE_NORMAL, MIGR_REPAIR);
                super->updates_pending++;
        }
 
+mark_checkpoint:
+       /* skip checkpointing for general migration,
+        * it is controlled in mdadm
+        */
+       if (is_gen_migration(dev))
+               goto skip_mark_checkpoint;
+
        /* check if we can update curr_migr_unit from resync_start, recovery_start */
-       blocks_per_unit = blocks_per_migr_unit(dev);
+       blocks_per_unit = blocks_per_migr_unit(super, dev);
        if (blocks_per_unit) {
                __u32 units32;
                __u64 units;
@@ -5037,6 +5870,7 @@ static int imsm_set_array_state(struct active_array *a, int consistent)
                 * curr_migr_unit needs updating
                 */
                if (units32 == units &&
+                   units32 != 0 &&
                    __le32_to_cpu(dev->vol.curr_migr_unit) != units32) {
                        dprintf("imsm: mark checkpoint (%u)\n", units32);
                        dev->vol.curr_migr_unit = __cpu_to_le32(units32);
@@ -5044,6 +5878,7 @@ static int imsm_set_array_state(struct active_array *a, int consistent)
                }
        }
 
+skip_mark_checkpoint:
        /* mark dirty / clean */
        if (dev->vol.dirty != !consistent) {
                dprintf("imsm: mark '%s'\n", consistent ? "clean" : "dirty");
@@ -5054,15 +5889,6 @@ static int imsm_set_array_state(struct active_array *a, int consistent)
                super->updates_pending++;
        }
 
-       /* finalize online capacity expansion/reshape */
-       if ((a->curr_action != reshape) &&
-           (a->prev_action == reshape)) {
-               struct mdinfo *mdi;
-
-               for (mdi = a->info.devs; mdi; mdi = mdi->next)
-                       imsm_set_disk(a, mdi->disk.raid_disk, mdi->curr_state);
-       }
-
        return consistent;
 }
 
@@ -5640,53 +6466,184 @@ static int add_remove_disk_update(struct intel_super *super)
        return check_degraded;
 }
 
-static int apply_reshape_container_disks_update(struct imsm_update_reshape *u,
+
+static int apply_reshape_migration_update(struct imsm_update_reshape_migration *u,
                                                struct intel_super *super,
                                                void ***space_list)
 {
-       struct dl *new_disk;
        struct intel_dev *id;
-       int i;
-       int delta_disks = u->new_raid_disks - u->old_raid_disks;
-       int disk_count = u->old_raid_disks;
        void **tofree = NULL;
-       int devices_to_reshape = 1;
-       struct imsm_super *mpb = super->anchor;
        int ret_val = 0;
 
-       dprintf("imsm: imsm_process_update() for update_reshape\n");
+       dprintf("apply_reshape_migration_update()\n");
+       if ((u->subdev < 0) ||
+           (u->subdev > 1)) {
+               dprintf("imsm: Error: Wrong subdev: %i\n", u->subdev);
+               return ret_val;
+       }
+       if ((space_list == NULL) || (*space_list == NULL)) {
+               dprintf("imsm: Error: Memory is not allocated\n");
+               return ret_val;
+       }
 
-       /* enable spares to use in array */
-       for (i = 0; i < delta_disks; i++) {
-               new_disk = get_disk_super(super,
-                                         major(u->new_disks[i]),
-                                         minor(u->new_disks[i]));
-               dprintf("imsm: imsm_process_update(): new disk "
-                       "for reshape is: %i:%i (%p, index = %i)\n",
-                       major(u->new_disks[i]), minor(u->new_disks[i]),
-                       new_disk, new_disk->index);
-               if ((new_disk == NULL) ||
-                   ((new_disk->index >= 0) &&
-                    (new_disk->index < u->old_raid_disks)))
-                       goto update_reshape_exit;
-               new_disk->index = disk_count++;
-               /* slot to fill in autolayout
-                */
-               new_disk->raiddisk = new_disk->index;
+       for (id = super->devlist ; id; id = id->next) {
+               if (id->index == (unsigned)u->subdev) {
+                       struct imsm_dev *dev = get_imsm_dev(super, u->subdev);
+                       struct imsm_map *map;
+                       struct imsm_dev *new_dev =
+                               (struct imsm_dev *)*space_list;
+                       struct imsm_map *migr_map = get_imsm_map(dev, 1);
+                       int to_state;
+                       struct dl *new_disk;
+
+                       if (new_dev == NULL)
+                               return ret_val;
+                       *space_list = **space_list;
+                       memcpy(new_dev, dev, sizeof_imsm_dev(dev, 0));
+                       map = get_imsm_map(new_dev, 0);
+                       if (migr_map) {
+                               dprintf("imsm: Error: migration in progress");
+                               return ret_val;
+                       }
+
+                       to_state = map->map_state;
+                       if ((u->new_level == 5) && (map->raid_level == 0)) {
+                               map->num_members++;
+                               /* this should not happen */
+                               if (u->new_disks[0] < 0) {
+                                       map->failed_disk_num =
+                                               map->num_members - 1;
+                                       to_state = IMSM_T_STATE_DEGRADED;
+                               } else
+                                       to_state = IMSM_T_STATE_NORMAL;
+                       }
+                       migrate(new_dev, super, to_state, MIGR_GEN_MIGR);
+                       if (u->new_level > -1)
+                               map->raid_level = u->new_level;
+                       migr_map = get_imsm_map(new_dev, 1);
+                       if ((u->new_level == 5) &&
+                           (migr_map->raid_level == 0)) {
+                               int ord = map->num_members - 1;
+                               migr_map->num_members--;
+                               if (u->new_disks[0] < 0)
+                                       ord |= IMSM_ORD_REBUILD;
+                               set_imsm_ord_tbl_ent(map,
+                                                    map->num_members - 1,
+                                                    ord);
+                       }
+                       id->dev = new_dev;
+                       tofree = (void **)dev;
+
+                       /* update chunk size
+                        */
+                       if (u->new_chunksize > 0)
+                               map->blocks_per_strip =
+                                       __cpu_to_le16(u->new_chunksize * 2);
+
+                       /* add disk
+                        */
+                       if ((u->new_level != 5) ||
+                           (migr_map->raid_level != 0) ||
+                           (migr_map->raid_level == map->raid_level))
+                               goto skip_disk_add;
+
+                       if (u->new_disks[0] >= 0) {
+                               /* use passes spare
+                                */
+                               new_disk = get_disk_super(super,
+                                                       major(u->new_disks[0]),
+                                                       minor(u->new_disks[0]));
+                               dprintf("imsm: new disk for reshape is: %i:%i "
+                                       "(%p, index = %i)\n",
+                                       major(u->new_disks[0]),
+                                       minor(u->new_disks[0]),
+                                       new_disk, new_disk->index);
+                               if (new_disk == NULL)
+                                       goto error_disk_add;
+
+                               new_disk->index = map->num_members - 1;
+                               /* slot to fill in autolayout
+                                */
+                               new_disk->raiddisk = new_disk->index;
+                               new_disk->disk.status |= CONFIGURED_DISK;
+                               new_disk->disk.status &= ~SPARE_DISK;
+                       } else
+                               goto error_disk_add;
+
+skip_disk_add:
+                       *tofree = *space_list;
+                       /* calculate new size
+                        */
+                       imsm_set_array_size(new_dev);
+
+                       ret_val = 1;
+               }
+       }
+
+       if (tofree)
+               *space_list = tofree;
+       return ret_val;
+
+error_disk_add:
+       dprintf("Error: imsm: Cannot find disk.\n");
+       return ret_val;
+}
+
+
+static int apply_reshape_container_disks_update(struct imsm_update_reshape *u,
+                                               struct intel_super *super,
+                                               void ***space_list)
+{
+       struct dl *new_disk;
+       struct intel_dev *id;
+       int i;
+       int delta_disks = u->new_raid_disks - u->old_raid_disks;
+       int disk_count = u->old_raid_disks;
+       void **tofree = NULL;
+       int devices_to_reshape = 1;
+       struct imsm_super *mpb = super->anchor;
+       int ret_val = 0;
+       unsigned int dev_id;
+
+       dprintf("imsm: apply_reshape_container_disks_update()\n");
+
+       /* enable spares to use in array */
+       for (i = 0; i < delta_disks; i++) {
+               new_disk = get_disk_super(super,
+                                         major(u->new_disks[i]),
+                                         minor(u->new_disks[i]));
+               dprintf("imsm: new disk for reshape is: %i:%i "
+                       "(%p, index = %i)\n",
+                       major(u->new_disks[i]), minor(u->new_disks[i]),
+                       new_disk, new_disk->index);
+               if ((new_disk == NULL) ||
+                   ((new_disk->index >= 0) &&
+                    (new_disk->index < u->old_raid_disks)))
+                       goto update_reshape_exit;
+               new_disk->index = disk_count++;
+               /* slot to fill in autolayout
+                */
+               new_disk->raiddisk = new_disk->index;
                new_disk->disk.status |=
                        CONFIGURED_DISK;
                new_disk->disk.status &= ~SPARE_DISK;
        }
 
-       dprintf("imsm: process_update(): update_reshape: volume set"
-               " mpb->num_raid_devs = %i\n", mpb->num_raid_devs);
+       dprintf("imsm: volume set mpb->num_raid_devs = %i\n",
+               mpb->num_raid_devs);
        /* manage changes in volume
         */
-       for (id = super->devlist ; id; id = id->next) {
+       for (dev_id = 0; dev_id < mpb->num_raid_devs; dev_id++) {
                void **sp = *space_list;
                struct imsm_dev *newdev;
                struct imsm_map *newmap, *oldmap;
 
+               for (id = super->devlist ; id; id = id->next) {
+                       if (id->index == dev_id)
+                               break;
+               }
+               if (id == NULL)
+                       break;
                if (!sp)
                        continue;
                *space_list = *sp;
@@ -5700,10 +6657,8 @@ static int apply_reshape_container_disks_update(struct imsm_update_reshape *u,
                /* update one device only
                 */
                if (devices_to_reshape) {
-                       int used_disks;
-
-                       dprintf("process_update(): modifying "
-                               "subdev: %i\n", id->index);
+                       dprintf("imsm: modifying subdev: %i\n",
+                               id->index);
                        devices_to_reshape--;
                        newdev->vol.migr_state = 1;
                        newdev->vol.curr_migr_unit = 0;
@@ -5719,31 +6674,19 @@ static int apply_reshape_container_disks_update(struct imsm_update_reshape *u,
                        newmap = get_imsm_map(newdev, 1);
                        memcpy(newmap, oldmap, sizeof_imsm_map(oldmap));
 
-                       /* calculate new size
-                        */
-                       used_disks = imsm_num_data_members(newdev, 0);
-                       if (used_disks) {
-                               unsigned long long array_blocks;
-
-                               array_blocks =
-                                       newmap->blocks_per_member * used_disks;
-                               /* round array size down to closest MB
-                                */
-                               array_blocks = (array_blocks
-                                               >> SECT_PER_MB_SHIFT)
-                                       << SECT_PER_MB_SHIFT;
-                               newdev->size_low =
-                                       __cpu_to_le32((__u32)array_blocks);
-                               newdev->size_high =
-                                       __cpu_to_le32((__u32)(array_blocks >> 32));
-                       }
+                       imsm_set_array_size(newdev);
                }
 
                sp = (void **)id->dev;
                id->dev = newdev;
                *sp = tofree;
                tofree = sp;
+
+               /* Clear migration record */
+               memset(super->migr_rec, 0, sizeof(struct migr_record));
        }
+       if (tofree)
+               *space_list = tofree;
        ret_val = 1;
 
 update_reshape_exit:
@@ -5751,6 +6694,111 @@ update_reshape_exit:
        return ret_val;
 }
 
+static int apply_takeover_update(struct imsm_update_takeover *u,
+                                struct intel_super *super,
+                                void ***space_list)
+{
+       struct imsm_dev *dev = NULL;
+       struct intel_dev *dv;
+       struct imsm_dev *dev_new;
+       struct imsm_map *map;
+       struct dl *dm, *du;
+       int i;
+
+       for (dv = super->devlist; dv; dv = dv->next)
+               if (dv->index == (unsigned int)u->subarray) {
+                       dev = dv->dev;
+                       break;
+               }
+
+       if (dev == NULL)
+               return 0;
+
+       map = get_imsm_map(dev, 0);
+
+       if (u->direction == R10_TO_R0) {
+               /* Number of failed disks must be half of initial disk number */
+               if (imsm_count_failed(super, dev) != (map->num_members / 2))
+                       return 0;
+
+               /* iterate through devices to mark removed disks as spare */
+               for (dm = super->disks; dm; dm = dm->next) {
+                       if (dm->disk.status & FAILED_DISK) {
+                               int idx = dm->index;
+                               /* update indexes on the disk list */
+/* FIXME this loop-with-the-loop looks wrong,  I'm not convinced
+   the index values will end up being correct.... NB */
+                               for (du = super->disks; du; du = du->next)
+                                       if (du->index > idx)
+                                               du->index--;
+                               /* mark as spare disk */
+                               dm->disk.status = SPARE_DISK;
+                               dm->index = -1;
+                       }
+               }
+               /* update map */
+               map->num_members = map->num_members / 2;
+               map->map_state = IMSM_T_STATE_NORMAL;
+               map->num_domains = 1;
+               map->raid_level = 0;
+               map->failed_disk_num = -1;
+       }
+
+       if (u->direction == R0_TO_R10) {
+               void **space;
+               /* update slots in current disk list */
+               for (dm = super->disks; dm; dm = dm->next) {
+                       if (dm->index >= 0)
+                               dm->index *= 2;
+               }
+               /* create new *missing* disks */
+               for (i = 0; i < map->num_members; i++) {
+                       space = *space_list;
+                       if (!space)
+                               continue;
+                       *space_list = *space;
+                       du = (void *)space;
+                       memcpy(du, super->disks, sizeof(*du));
+                       du->fd = -1;
+                       du->minor = 0;
+                       du->major = 0;
+                       du->index = (i * 2) + 1;
+                       sprintf((char *)du->disk.serial,
+                               " MISSING_%d", du->index);
+                       sprintf((char *)du->serial,
+                               "MISSING_%d", du->index);
+                       du->next = super->missing;
+                       super->missing = du;
+               }
+               /* create new dev and map */
+               space = *space_list;
+               if (!space)
+                       return 0;
+               *space_list = *space;
+               dev_new = (void *)space;
+               memcpy(dev_new, dev, sizeof(*dev));
+               /* update new map */
+               map = get_imsm_map(dev_new, 0);
+               map->num_members = map->num_members * 2;
+               map->map_state = IMSM_T_STATE_DEGRADED;
+               map->num_domains = 2;
+               map->raid_level = 1;
+               /* replace dev<->dev_new */
+               dv->dev = dev_new;
+       }
+       /* update disk order table */
+       for (du = super->disks; du; du = du->next)
+               if (du->index >= 0)
+                       set_imsm_ord_tbl_ent(map, du->index, du->index);
+       for (du = super->missing; du; du = du->next)
+               if (du->index >= 0) {
+                       set_imsm_ord_tbl_ent(map, du->index, du->index);
+                       mark_missing(dev_new, &du->disk, du->index);
+               }
+
+       return 1;
+}
+
 static void imsm_process_update(struct supertype *st,
                                struct metadata_update *update)
 {
@@ -5793,6 +6841,15 @@ static void imsm_process_update(struct supertype *st,
        mpb = super->anchor;
 
        switch (type) {
+       case update_takeover: {
+               struct imsm_update_takeover *u = (void *)update->buf;
+               if (apply_takeover_update(u, super, &update->space_list)) {
+                       imsm_update_version_info(super);
+                       super->updates_pending++;
+               }
+               break;
+       }
+
        case update_reshape_container_disks: {
                struct imsm_update_reshape *u = (void *)update->buf;
                if (apply_reshape_container_disks_update(
@@ -5800,6 +6857,13 @@ static void imsm_process_update(struct supertype *st,
                        super->updates_pending++;
                break;
        }
+       case update_reshape_migration: {
+               struct imsm_update_reshape_migration *u = (void *)update->buf;
+               if (apply_reshape_migration_update(
+                           u, super, &update->space_list))
+                       super->updates_pending++;
+               break;
+       }
        case update_activate_spare: {
                struct imsm_update_activate_spare *u = (void *) update->buf; 
                struct imsm_dev *dev = get_imsm_dev(super, u->array);
@@ -5826,7 +6890,6 @@ static void imsm_process_update(struct supertype *st,
                }
 
                super->updates_pending++;
-
                /* count failures (excluding rebuilds and the victim)
                 * to determine map[0] state
                 */
@@ -5852,7 +6915,7 @@ static void imsm_process_update(struct supertype *st,
                /* mark rebuild */
                to_state = imsm_check_degraded(super, dev, failed);
                map->map_state = IMSM_T_STATE_DEGRADED;
-               migrate(dev, to_state, MIGR_REBUILD);
+               migrate(dev, super, to_state, MIGR_REBUILD);
                migr_map = get_imsm_map(dev, 1);
                set_imsm_ord_tbl_ent(map, u->slot, dl->index);
                set_imsm_ord_tbl_ent(migr_map, u->slot, dl->index | IMSM_ORD_REBUILD);
@@ -6096,6 +7159,8 @@ static void imsm_process_update(struct supertype *st,
        }
 }
 
+static struct mdinfo *get_spares_for_grow(struct supertype *st);
+
 static void imsm_prepare_update(struct supertype *st,
                                struct metadata_update *update)
 {
@@ -6113,6 +7178,53 @@ static void imsm_prepare_update(struct supertype *st,
        size_t len = 0;
 
        switch (type) {
+       case update_takeover: {
+               struct imsm_update_takeover *u = (void *)update->buf;
+               if (u->direction == R0_TO_R10) {
+                       void **tail = (void **)&update->space_list;
+                       struct imsm_dev *dev = get_imsm_dev(super, u->subarray);
+                       struct imsm_map *map = get_imsm_map(dev, 0);
+                       int num_members = map->num_members;
+                       void *space;
+                       int size, i;
+                       int err = 0;
+                       /* allocate memory for added disks */
+                       for (i = 0; i < num_members; i++) {
+                               size = sizeof(struct dl);
+                               space = malloc(size);
+                               if (!space) {
+                                       err++;
+                                       break;
+                               }
+                               *tail = space;
+                               tail = space;
+                               *tail = NULL;
+                       }
+                       /* allocate memory for new device */
+                       size = sizeof_imsm_dev(super->devlist->dev, 0) +
+                               (num_members * sizeof(__u32));
+                       space = malloc(size);
+                       if (!space)
+                               err++;
+                       else {
+                               *tail = space;
+                               tail = space;
+                               *tail = NULL;
+                       }
+                       if (!err) {
+                               len = disks_to_mpb_size(num_members * 2);
+                       } else {
+                               /* if allocation didn't success, free buffer */
+                               while (update->space_list) {
+                                       void **sp = update->space_list;
+                                       update->space_list = *sp;
+                                       free(sp);
+                               }
+                       }
+               }
+
+               break;
+       }
        case update_reshape_container_disks: {
                /* Every raid device in the container is about to
                 * gain some more devices, and we will enter a
@@ -6146,6 +7258,93 @@ static void imsm_prepare_update(struct supertype *st,
                dprintf("New anchor length is %llu\n", (unsigned long long)len);
                break;
        }
+       case update_reshape_migration: {
+               /* for migration level 0->5 we need to add disks
+                * so the same as for container operation we will copy
+                * device to the bigger location.
+                * in memory prepared device and new disk area are prepared
+                * for usage in process update
+                */
+               struct imsm_update_reshape_migration *u = (void *)update->buf;
+               struct intel_dev *id;
+               void **space_tail = (void **)&update->space_list;
+               int size;
+               void *s;
+               int current_level = -1;
+
+               dprintf("imsm: imsm_prepare_update() for update_reshape\n");
+
+               /* add space for bigger array in update
+                */
+               for (id = super->devlist; id; id = id->next) {
+                       if (id->index == (unsigned)u->subdev) {
+                               size = sizeof_imsm_dev(id->dev, 1);
+                               if (u->new_raid_disks > u->old_raid_disks)
+                                       size += sizeof(__u32)*2*
+                                       (u->new_raid_disks - u->old_raid_disks);
+                               s = malloc(size);
+                               if (!s)
+                                       break;
+                               *space_tail = s;
+                               space_tail = s;
+                               *space_tail = NULL;
+                               break;
+                       }
+               }
+               if (update->space_list == NULL)
+                       break;
+
+               /* add space for disk in update
+                */
+               size = sizeof(struct dl);
+               s = malloc(size);
+               if (!s) {
+                       free(update->space_list);
+                       update->space_list = NULL;
+                       break;
+               }
+               *space_tail = s;
+               space_tail = s;
+               *space_tail = NULL;
+
+               /* add spare device to update
+                */
+               for (id = super->devlist ; id; id = id->next)
+                       if (id->index == (unsigned)u->subdev) {
+                               struct imsm_dev *dev;
+                               struct imsm_map *map;
+
+                               dev = get_imsm_dev(super, u->subdev);
+                               map = get_imsm_map(dev, 0);
+                               current_level = map->raid_level;
+                               break;
+                       }
+               if ((u->new_level == 5) && (u->new_level != current_level)) {
+                       struct mdinfo *spares;
+
+                       spares = get_spares_for_grow(st);
+                       if (spares) {
+                               struct dl *dl;
+                               struct mdinfo *dev;
+
+                               dev = spares->devs;
+                               if (dev) {
+                                       u->new_disks[0] =
+                                               makedev(dev->disk.major,
+                                                       dev->disk.minor);
+                                       dl = get_disk_super(super,
+                                                           dev->disk.major,
+                                                           dev->disk.minor);
+                                       dl->index = u->old_raid_disks;
+                                       dev = dev->next;
+                               }
+                               sysfs_free(spares);
+                       }
+               }
+               len = disks_to_mpb_size(u->new_raid_disks);
+               dprintf("New anchor length is %llu\n", (unsigned long long)len);
+               break;
+       }
        case update_create_array: {
                struct imsm_update_create_array *u = (void *) update->buf;
                struct intel_dev *dv;
@@ -6263,40 +7462,386 @@ static void imsm_delete(struct intel_super *super, struct dl **dlp, unsigned ind
                __free_imsm_disk(dl);
        }
 }
-#endif /* MDASSEMBLE */
 
-static char disk_by_path[] = "/dev/disk/by-path/";
+/*******************************************************************************
+ * Function:   open_backup_targets
+ * Description:        Function opens file descriptors for all devices given in
+ *             info->devs
+ * Parameters:
+ *     info            : general array info
+ *     raid_disks      : number of disks
+ *     raid_fds        : table of device's file descriptors
+ * Returns:
+ *      0 : success
+ *     -1 : fail
+ ******************************************************************************/
+int open_backup_targets(struct mdinfo *info, int raid_disks, int *raid_fds)
+{
+       struct mdinfo *sd;
 
-static const char *imsm_get_disk_controller_domain(const char *path)
+       for (sd = info->devs ; sd ; sd = sd->next) {
+               char *dn;
+
+               if (sd->disk.state & (1<<MD_DISK_FAULTY)) {
+                       dprintf("disk is faulty!!\n");
+                       continue;
+               }
+
+               if ((sd->disk.raid_disk >= raid_disks) ||
+                   (sd->disk.raid_disk < 0))
+                       continue;
+
+               dn = map_dev(sd->disk.major,
+                            sd->disk.minor, 1);
+               raid_fds[sd->disk.raid_disk] = dev_open(dn, O_RDWR);
+               if (raid_fds[sd->disk.raid_disk] < 0) {
+                       fprintf(stderr, "cannot open component\n");
+                       return -1;
+               }
+       }
+       return 0;
+}
+
+/*******************************************************************************
+ * Function:   init_migr_record_imsm
+ * Description:        Function inits imsm migration record
+ * Parameters:
+ *     super   : imsm internal array info
+ *     dev     : device under migration
+ *     info    : general array info to find the smallest device
+ * Returns:
+ *     none
+ ******************************************************************************/
+void init_migr_record_imsm(struct supertype *st, struct imsm_dev *dev,
+                          struct mdinfo *info)
 {
-       struct sys_dev *list, *hba = NULL;
-       char disk_path[PATH_MAX];
-       int ahci = 0;
-       char *dpath = NULL;
+       struct intel_super *super = st->sb;
+       struct migr_record *migr_rec = super->migr_rec;
+       int new_data_disks;
+       unsigned long long dsize, dev_sectors;
+       long long unsigned min_dev_sectors = -1LLU;
+       struct mdinfo *sd;
+       char nm[30];
+       int fd;
+       struct imsm_map *map_dest = get_imsm_map(dev, 0);
+       struct imsm_map *map_src = get_imsm_map(dev, 1);
+       unsigned long long num_migr_units;
+
+       unsigned long long array_blocks =
+               (((unsigned long long)__le32_to_cpu(dev->size_high)) << 32) +
+               __le32_to_cpu(dev->size_low);
+
+       memset(migr_rec, 0, sizeof(struct migr_record));
+       migr_rec->family_num = __cpu_to_le32(super->anchor->family_num);
+
+       /* only ascending reshape supported now */
+       migr_rec->ascending_migr = __cpu_to_le32(1);
+
+       migr_rec->dest_depth_per_unit = GEN_MIGR_AREA_SIZE /
+               max(map_dest->blocks_per_strip, map_src->blocks_per_strip);
+       migr_rec->dest_depth_per_unit *= map_dest->blocks_per_strip;
+       new_data_disks = imsm_num_data_members(dev, 0);
+       migr_rec->blocks_per_unit =
+               __cpu_to_le32(migr_rec->dest_depth_per_unit * new_data_disks);
+       migr_rec->dest_depth_per_unit =
+               __cpu_to_le32(migr_rec->dest_depth_per_unit);
+
+       num_migr_units =
+               array_blocks / __le32_to_cpu(migr_rec->blocks_per_unit);
+
+       if (array_blocks % __le32_to_cpu(migr_rec->blocks_per_unit))
+               num_migr_units++;
+       migr_rec->num_migr_units = __cpu_to_le32(num_migr_units);
 
-       list = find_driver_devices("pci", "ahci");
-       for (hba = list; hba; hba = hba->next)
-               if (devpath_to_vendor(hba->path) == 0x8086)
+       migr_rec->post_migr_vol_cap =  dev->size_low;
+       migr_rec->post_migr_vol_cap_hi = dev->size_high;
+
+
+       /* Find the smallest dev */
+       for (sd = info->devs ; sd ; sd = sd->next) {
+               sprintf(nm, "%d:%d", sd->disk.major, sd->disk.minor);
+               fd = dev_open(nm, O_RDONLY);
+               if (fd < 0)
+                       continue;
+               get_dev_size(fd, NULL, &dsize);
+               dev_sectors = dsize / 512;
+               if (dev_sectors < min_dev_sectors)
+                       min_dev_sectors = dev_sectors;
+               close(fd);
+       }
+       migr_rec->ckpt_area_pba = __cpu_to_le32(min_dev_sectors -
+                                       RAID_DISK_RESERVED_BLOCKS_IMSM_HI);
+
+       write_imsm_migr_rec(st);
+
+       return;
+}
+
+/*******************************************************************************
+ * Function:   save_backup_imsm
+ * Description:        Function saves critical data stripes to Migration Copy Area
+ *             and updates the current migration unit status.
+ *             Use restore_stripes() to form a destination stripe,
+ *             and to write it to the Copy Area.
+ * Parameters:
+ *     st              : supertype information
+ *     info            : general array info
+ *     buf             : input buffer
+ *     write_offset    : address of data to backup
+ *     length          : length of data to backup (blocks_per_unit)
+ * Returns:
+ *      0 : success
+ *,    -1 : fail
+ ******************************************************************************/
+int save_backup_imsm(struct supertype *st,
+                    struct imsm_dev *dev,
+                    struct mdinfo *info,
+                    void *buf,
+                    int new_data,
+                    int length)
+{
+       int rv = -1;
+       struct intel_super *super = st->sb;
+       unsigned long long *target_offsets = NULL;
+       int *targets = NULL;
+       int i;
+       struct imsm_map *map_dest = get_imsm_map(dev, 0);
+       int new_disks = map_dest->num_members;
+
+       targets = malloc(new_disks * sizeof(int));
+       if (!targets)
+               goto abort;
+
+       target_offsets = malloc(new_disks * sizeof(unsigned long long));
+       if (!target_offsets)
+               goto abort;
+
+       for (i = 0; i < new_disks; i++) {
+               targets[i] = -1;
+               target_offsets[i] = (unsigned long long)
+                 __le32_to_cpu(super->migr_rec->ckpt_area_pba) * 512;
+       }
+
+       if (open_backup_targets(info, new_disks, targets))
+               goto abort;
+
+       if (restore_stripes(targets, /* list of dest devices */
+                           target_offsets, /* migration record offsets */
+                           new_disks,
+                           info->new_chunk,
+                           info->new_level,
+                           info->new_layout,
+                           -1,         /* source backup file descriptor */
+                           0,          /* input buf offset
+                                        * always 0 buf is already offset */
+                           0,
+                           length,
+                           buf) != 0) {
+               fprintf(stderr, Name ": Error restoring stripes\n");
+               goto abort;
+       }
+
+       rv = 0;
+
+abort:
+       if (targets) {
+               for (i = 0; i < new_disks; i++)
+                       if (targets[i] >= 0)
+                               close(targets[i]);
+               free(targets);
+       }
+       free(target_offsets);
+
+       return rv;
+}
+
+/*******************************************************************************
+ * Function:   save_checkpoint_imsm
+ * Description:        Function called for current unit status update
+ *             in the migration record. It writes it to disk.
+ * Parameters:
+ *     super   : imsm internal array info
+ *     info    : general array info
+ * Returns:
+ *     0: success
+ *     1: failure
+ ******************************************************************************/
+int save_checkpoint_imsm(struct supertype *st, struct mdinfo *info, int state)
+{
+       struct intel_super *super = st->sb;
+       load_imsm_migr_rec(super, info);
+       if (__le32_to_cpu(super->migr_rec->blocks_per_unit) == 0) {
+               dprintf("ERROR: blocks_per_unit = 0!!!\n");
+               return 1;
+       }
+
+       super->migr_rec->curr_migr_unit =
+         __cpu_to_le32(info->reshape_progress /
+                       __le32_to_cpu(super->migr_rec->blocks_per_unit));
+       super->migr_rec->rec_status = __cpu_to_le32(state);
+       super->migr_rec->dest_1st_member_lba =
+         __cpu_to_le32((__le32_to_cpu(super->migr_rec->curr_migr_unit))
+                       * __le32_to_cpu(super->migr_rec->dest_depth_per_unit));
+       if (write_imsm_migr_rec(st) < 0) {
+               dprintf("imsm: Cannot write migration record "
+                       "outside backup area\n");
+               return 1;
+       }
+
+       return 0;
+}
+
+static __u64 blocks_per_migr_unit(struct intel_super *super,
+                                 struct imsm_dev *dev);
+
+/*******************************************************************************
+ * Function:   recover_backup_imsm
+ * Description:        Function recovers critical data from the Migration Copy Area
+ *             while assembling an array.
+ * Parameters:
+ *     super   : imsm internal array info
+ *     info    : general array info
+ * Returns:
+ *     0 : success (or there is no data to recover)
+ *     1 : fail
+ ******************************************************************************/
+int recover_backup_imsm(struct supertype *st, struct mdinfo *info)
+{
+       struct intel_super *super = st->sb;
+       struct migr_record *migr_rec = super->migr_rec;
+       struct imsm_map *map_dest = NULL;
+       struct intel_dev *id = NULL;
+       unsigned long long read_offset;
+       unsigned long long write_offset;
+       unsigned unit_len;
+       int *targets = NULL;
+       int new_disks, i, err;
+       char *buf = NULL;
+       int retval = 1;
+       unsigned long curr_migr_unit = __le32_to_cpu(migr_rec->curr_migr_unit);
+       unsigned long num_migr_units = __le32_to_cpu(migr_rec->num_migr_units);
+       int ascending = __le32_to_cpu(migr_rec->ascending_migr);
+       char buffer[20];
+
+       err = sysfs_get_str(info, NULL, "array_state", (char *)buffer, 20);
+       if (err < 1)
+               return 1;
+
+       /* recover data only during assemblation */
+       if (strncmp(buffer, "inactive", 8) != 0)
+               return 0;
+       /* no data to recover */
+       if (__le32_to_cpu(migr_rec->rec_status) == UNIT_SRC_NORMAL)
+               return 0;
+       if (curr_migr_unit >= num_migr_units)
+               return 1;
+
+       /* find device during reshape */
+       for (id = super->devlist; id; id = id->next)
+               if (is_gen_migration(id->dev))
                        break;
+       if (id == NULL)
+               return 1;
+
+       map_dest = get_imsm_map(id->dev, 0);
+       new_disks = map_dest->num_members;
 
-       if (hba) {
-               struct stat st;
+       read_offset = (unsigned long long)
+                       __le32_to_cpu(migr_rec->ckpt_area_pba) * 512;
 
-               strncpy(disk_path, disk_by_path, PATH_MAX - 1);
-               strncat(disk_path, path, PATH_MAX - strlen(disk_path) - 1);
-               if (stat(disk_path, &st) == 0) {
-                       dpath = devt_to_devpath(st.st_rdev);
-                       if (dpath)
-                               ahci = path_attached_to_hba(dpath, hba->path);
+       write_offset = ((unsigned long long)
+                       __le32_to_cpu(migr_rec->dest_1st_member_lba) +
+                       info->data_offset) * 512;
+
+       unit_len = __le32_to_cpu(migr_rec->dest_depth_per_unit) * 512;
+       if (posix_memalign((void **)&buf, 512, unit_len) != 0)
+               goto abort;
+       targets = malloc(new_disks * sizeof(int));
+       if (!targets)
+               goto abort;
+
+       open_backup_targets(info, new_disks, targets);
+
+       for (i = 0; i < new_disks; i++) {
+               if (lseek64(targets[i], read_offset, SEEK_SET) < 0) {
+                       fprintf(stderr,
+                               Name ": Cannot seek to block: %s\n",
+                               strerror(errno));
+                       goto abort;
+               }
+               if (read(targets[i], buf, unit_len) != unit_len) {
+                       fprintf(stderr,
+                               Name ": Cannot read copy area block: %s\n",
+                               strerror(errno));
+                       goto abort;
+               }
+               if (lseek64(targets[i], write_offset, SEEK_SET) < 0) {
+                       fprintf(stderr,
+                               Name ": Cannot seek to block: %s\n",
+                               strerror(errno));
+                       goto abort;
+               }
+               if (write(targets[i], buf, unit_len) != unit_len) {
+                       fprintf(stderr,
+                               Name ": Cannot restore block: %s\n",
+                               strerror(errno));
+                       goto abort;
                }
        }
-       dprintf("path: %s(%s) hba: %s attached: %d\n",
-               path, dpath, (hba) ? hba->path : "NULL", ahci);
-       free_sys_dev(&list);
-       if (ahci)
-               return "ahci";
-       else
-               return NULL;
+
+       if (ascending && curr_migr_unit < (num_migr_units-1))
+               curr_migr_unit++;
+
+       migr_rec->curr_migr_unit = __le32_to_cpu(curr_migr_unit);
+       super->migr_rec->rec_status = __cpu_to_le32(UNIT_SRC_NORMAL);
+       if (write_imsm_migr_rec(st) == 0) {
+               __u64 blocks_per_unit = blocks_per_migr_unit(super, id->dev);
+               info->reshape_progress = curr_migr_unit * blocks_per_unit;
+               retval = 0;
+       }
+
+abort:
+       if (targets) {
+               for (i = 0; i < new_disks; i++)
+                       if (targets[i])
+                               close(targets[i]);
+               free(targets);
+       }
+       free(buf);
+       return retval;
+}
+
+static char disk_by_path[] = "/dev/disk/by-path/";
+
+static const char *imsm_get_disk_controller_domain(const char *path)
+{
+       char disk_path[PATH_MAX];
+       char *drv=NULL;
+       struct stat st;
+
+       strncpy(disk_path, disk_by_path, PATH_MAX - 1);
+       strncat(disk_path, path, PATH_MAX - strlen(disk_path) - 1);
+       if (stat(disk_path, &st) == 0) {
+               struct sys_dev* hba;
+               char *path=NULL;
+
+               path = devt_to_devpath(st.st_rdev);
+               if (path == NULL)
+                       return "unknown";
+               hba = find_disk_attached_hba(-1, path);
+               if (hba && hba->type == SYS_DEV_SAS)
+                       drv = "isci";
+               else if (hba && hba->type == SYS_DEV_SATA)
+                       drv = "ahci";
+               else 
+                       drv = "unknown";
+               dprintf("path: %s hba: %s attached: %s\n",
+                       path, (hba) ? hba->path : "NULL", drv);
+               free(path);
+               if (hba)
+                       free_sys_dev(&hba);
+       }
+       return drv;
 }
 
 static int imsm_find_array_minor_by_subdev(int subdev, int container, int *minor)
@@ -6318,6 +7863,10 @@ static int imsm_reshape_is_allowed_on_container(struct supertype *st,
                                                struct geo_params *geo,
                                                int *old_raid_disks)
 {
+       /* currently we only support increasing the number of devices
+        * for a container.  This increases the number of device for each
+        * member array.  They must all be RAID0 or RAID5.
+        */
        int ret_val = 0;
        struct mdinfo *info, *member;
        int devices_that_can_grow = 0;
@@ -6344,7 +7893,7 @@ static int imsm_reshape_is_allowed_on_container(struct supertype *st,
                dprintf("imsm: checking device_num: %i\n",
                        member->container_member);
 
-               if (geo->raid_disks < member->array.raid_disks) {
+               if (geo->raid_disks <= member->array.raid_disks) {
                        /* we work on container for Online Capacity Expansion
                         * only so raid_disks has to grow
                         */
@@ -6376,6 +7925,14 @@ static int imsm_reshape_is_allowed_on_container(struct supertype *st,
                                         geo->raid_disks > 1 ? "s" : "");
                                break;
                        }
+                       /* check if component size is aligned to chunk size
+                        */
+                       if (info->component_size %
+                           (info->array.chunk_size/512)) {
+                               dprintf("Component size is not aligned to "
+                                       "chunk size\n");
+                               break;
+                       }
                }
 
                if (*old_raid_disks &&
@@ -6469,7 +8026,8 @@ static int imsm_create_metadata_update_for_reshape(
 
        if (spares == NULL
            || delta_disks > spares->array.spare_disks) {
-               dprintf("imsm: ERROR: Cannot get spare devices.\n");
+               fprintf(stderr, Name ": imsm: ERROR: Cannot get spare devices "
+                       "for %s.\n", geo->dev_name);
                goto abort;
        }
 
@@ -6492,19 +8050,6 @@ static int imsm_create_metadata_update_for_reshape(
                mpb->num_disks++;
                dev = dev->next;
        }
-       /* Now update the metadata so that container_content will find
-        * the new devices
-        */
-       for (i = 0; i < mpb->num_raid_devs; i++) {
-               int d;
-               struct imsm_dev *dev = get_imsm_dev(super, i);
-               struct imsm_map *map = get_imsm_map(dev, 0);
-               map->num_members = geo->raid_disks;
-               for (d = 0; d < delta_disks; d++) {
-                       set_imsm_ord_tbl_ent(map, old_raid_disks + d,
-                                            mpb->num_disks - delta_disks + d);
-               }
-       }
 
 abort:
        /* free spares
@@ -6523,29 +8068,292 @@ abort:
        return 0;
 }
 
+/******************************************************************************
+ * function: imsm_create_metadata_update_for_migration()
+ *           Creates update for IMSM array.
+ *
+ ******************************************************************************/
+static int imsm_create_metadata_update_for_migration(
+                                       struct supertype *st,
+                                       struct geo_params *geo,
+                                       struct imsm_update_reshape_migration **updatep)
+{
+       struct intel_super *super = st->sb;
+       int update_memory_size = 0;
+       struct imsm_update_reshape_migration *u = NULL;
+       struct imsm_dev *dev;
+       int previous_level = -1;
+
+       dprintf("imsm_create_metadata_update_for_migration(enter)"
+               " New Level = %i\n", geo->level);
+
+       /* size of all update data without anchor */
+       update_memory_size = sizeof(struct imsm_update_reshape_migration);
+
+       u = calloc(1, update_memory_size);
+       if (u == NULL) {
+               dprintf("error: cannot get memory for "
+                       "imsm_create_metadata_update_for_migration\n");
+               return 0;
+       }
+       u->type = update_reshape_migration;
+       u->subdev = super->current_vol;
+       u->new_level = geo->level;
+       u->new_layout = geo->layout;
+       u->new_raid_disks = u->old_raid_disks = geo->raid_disks;
+       u->new_disks[0] = -1;
+       u->new_chunksize = -1;
+
+       dev = get_imsm_dev(super, u->subdev);
+       if (dev) {
+               struct imsm_map *map;
+
+               map = get_imsm_map(dev, 0);
+               if (map) {
+                       int current_chunk_size =
+                               __le16_to_cpu(map->blocks_per_strip) / 2;
+
+                       if (geo->chunksize != current_chunk_size) {
+                               u->new_chunksize = geo->chunksize / 1024;
+                               dprintf("imsm: "
+                                       "chunk size change from %i to %i\n",
+                                       current_chunk_size, u->new_chunksize);
+                       }
+                       previous_level = map->raid_level;
+               }
+       }
+       if ((geo->level == 5) && (previous_level == 0)) {
+               struct mdinfo *spares = NULL;
+
+               u->new_raid_disks++;
+               spares = get_spares_for_grow(st);
+               if ((spares == NULL) || (spares->array.spare_disks < 1)) {
+                       free(u);
+                       sysfs_free(spares);
+                       update_memory_size = 0;
+                       dprintf("error: cannot get spare device "
+                               "for requested migration");
+                       return 0;
+               }
+               sysfs_free(spares);
+       }
+       dprintf("imsm: reshape update preparation : OK\n");
+       *updatep = u;
+
+       return update_memory_size;
+}
+
+static void imsm_update_metadata_locally(struct supertype *st,
+                                        void *buf, int len)
+{
+       struct metadata_update mu;
+
+       mu.buf = buf;
+       mu.len = len;
+       mu.space = NULL;
+       mu.space_list = NULL;
+       mu.next = NULL;
+       imsm_prepare_update(st, &mu);
+       imsm_process_update(st, &mu);
+
+       while (mu.space_list) {
+               void **space = mu.space_list;
+               mu.space_list = *space;
+               free(space);
+       }
+}
+
+/***************************************************************************
+* Function:    imsm_analyze_change
+* Description: Function analyze change for single volume
+*              and validate if transition is supported
+* Parameters:  Geometry parameters, supertype structure
+* Returns:     Operation type code on success, -1 if fail
+****************************************************************************/
+enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
+                                          struct geo_params *geo)
+{
+       struct mdinfo info;
+       int change = -1;
+       int check_devs = 0;
+       int chunk;
+
+       getinfo_super_imsm_volume(st, &info, NULL);
+
+       if ((geo->level != info.array.level) &&
+           (geo->level >= 0) &&
+           (geo->level != UnSet)) {
+               switch (info.array.level) {
+               case 0:
+                       if (geo->level == 5) {
+                               change = CH_MIGRATION;
+                               check_devs = 1;
+                       }
+                       if (geo->level == 10) {
+                               change = CH_TAKEOVER;
+                               check_devs = 1;
+                       }
+                       break;
+               case 1:
+                       if (geo->level == 0) {
+                               change = CH_TAKEOVER;
+                               check_devs = 1;
+                       }
+                       break;
+               case 10:
+                       if (geo->level == 0) {
+                               change = CH_TAKEOVER;
+                               check_devs = 1;
+                       }
+                       break;
+               }
+               if (change == -1) {
+                       fprintf(stderr,
+                               Name " Error. Level Migration from %d to %d "
+                               "not supported!\n",
+                               info.array.level, geo->level);
+                       goto analyse_change_exit;
+               }
+       } else
+               geo->level = info.array.level;
+
+       if ((geo->layout != info.array.layout)
+           && ((geo->layout != UnSet) && (geo->layout != -1))) {
+               change = CH_MIGRATION;
+               if ((info.array.layout == 0)
+                   && (info.array.level == 5)
+                   && (geo->layout == 5)) {
+                       /* reshape 5 -> 4 */
+               } else if ((info.array.layout == 5)
+                          && (info.array.level == 5)
+                          && (geo->layout == 0)) {
+                       /* reshape 4 -> 5 */
+                       geo->layout = 0;
+                       geo->level = 5;
+               } else {
+                       fprintf(stderr,
+                               Name " Error. Layout Migration from %d to %d "
+                               "not supported!\n",
+                               info.array.layout, geo->layout);
+                       change = -1;
+                       goto analyse_change_exit;
+               }
+       } else
+               geo->layout = info.array.layout;
+
+       if ((geo->chunksize > 0) && (geo->chunksize != UnSet)
+           && (geo->chunksize != info.array.chunk_size))
+               change = CH_MIGRATION;
+       else
+               geo->chunksize = info.array.chunk_size;
+
+       chunk = geo->chunksize / 1024;
+       if (!validate_geometry_imsm(st,
+                                   geo->level,
+                                   geo->layout,
+                                   geo->raid_disks,
+                                   &chunk,
+                                   geo->size,
+                                   0, 0, 1))
+               change = -1;
+
+       if (check_devs) {
+               struct intel_super *super = st->sb;
+               struct imsm_super *mpb = super->anchor;
+
+               if (mpb->num_raid_devs > 1) {
+                       fprintf(stderr,
+                               Name " Error. Cannot perform operation on %s"
+                               "- for this operation it MUST be single "
+                               "array in container\n",
+                               geo->dev_name);
+                       change = -1;
+               }
+       }
+
+analyse_change_exit:
+
+       return change;
+}
+
+int imsm_takeover(struct supertype *st, struct geo_params *geo)
+{
+       struct intel_super *super = st->sb;
+       struct imsm_update_takeover *u;
+
+       u = malloc(sizeof(struct imsm_update_takeover));
+       if (u == NULL)
+               return 1;
+
+       u->type = update_takeover;
+       u->subarray = super->current_vol;
+
+       /* 10->0 transition */
+       if (geo->level == 0)
+               u->direction = R10_TO_R0;
+
+       /* 0->10 transition */
+       if (geo->level == 10)
+               u->direction = R0_TO_R10;
+
+       /* update metadata locally */
+       imsm_update_metadata_locally(st, u,
+                                       sizeof(struct imsm_update_takeover));
+       /* and possibly remotely */
+       if (st->update_tail)
+               append_metadata_update(st, u,
+                                       sizeof(struct imsm_update_takeover));
+       else
+               free(u);
+
+       return 0;
+}
+
+static int warn_user_about_risk(void)
+{
+       int rv = 0;
+
+       fprintf(stderr,
+               "\nThis is an experimental feature. Data on the RAID volume(s) "
+               "can be lost!!!\n\n"
+               "To continue command execution please make sure that\n"
+               "the grow process will not be interrupted. Use safe power\n"
+               "supply to avoid unexpected system reboot. Make sure that\n"
+               "reshaped container is not assembled automatically during\n"
+               "system boot.\n"
+               "If reshape is interrupted, assemble array manually\n"
+               "using e.g. '-Ac' option and up to date mdadm.conf file.\n"
+               "Assembly in scan mode is not possible in such case.\n"
+               "Growing container with boot array is not possible.\n"
+               "If boot array reshape is interrupted, whole file system\n"
+               "can be lost.\n\n");
+       rv = ask("Do you want to continue? ");
+       fprintf(stderr, "\n");
+
+       return rv;
+}
 
 static int imsm_reshape_super(struct supertype *st, long long size, int level,
                              int layout, int chunksize, int raid_disks,
-                             char *backup, char *dev, int verbose)
+                             int delta_disks, char *backup, char *dev,
+                             int verbose)
 {
-       /* currently we only support increasing the number of devices
-        * for a container.  This increases the number of device for each
-        * member array.  They must all be RAID0 or RAID5.
-        */
-
        int ret_val = 1;
        struct geo_params geo;
 
        dprintf("imsm: reshape_super called.\n");
 
-       memset(&geo, sizeof(struct geo_params), 0);
+       memset(&geo, 0, sizeof(struct geo_params));
 
        geo.dev_name = dev;
+       geo.dev_id = st->devnum;
        geo.size = size;
        geo.level = level;
        geo.layout = layout;
        geo.chunksize = chunksize;
        geo.raid_disks = raid_disks;
+       if (delta_disks != UnSet)
+               geo.raid_disks += delta_disks;
 
        dprintf("\tfor level      : %i\n", geo.level);
        dprintf("\tfor raid_disks : %i\n", geo.raid_disks);
@@ -6553,23 +8361,22 @@ static int imsm_reshape_super(struct supertype *st, long long size, int level,
        if (experimental() == 0)
                return ret_val;
 
-       /* verify reshape conditions
-        * on container level we can only increase number of devices.
-        */
        if (st->container_dev == st->devnum) {
-               /* check for delta_disks > 0
-                * and supported raid levels 0 and 5 only in container
-                */
+               /* On container level we can only increase number of devices. */
+               dprintf("imsm: info: Container operation\n");
                int old_raid_disks = 0;
+
+               /* this warning will be removed when imsm checkpointing
+                * will be implemented, and restoring from check-point
+                * operation will be transparent for reboot process
+                */
+               if (warn_user_about_risk() == 0)
+                       return ret_val;
+
                if (imsm_reshape_is_allowed_on_container(
                            st, &geo, &old_raid_disks)) {
                        struct imsm_update_reshape *u = NULL;
                        int len;
-                       struct intel_super *super = st->sb;
-                       void **space_list;
-                       struct intel_dev *dl;
-                       void **space_tail = (void **)&space_list;
-
 
                        len = imsm_create_metadata_update_for_reshape(
                                st, &geo, old_raid_disks, &u);
@@ -6579,80 +8386,408 @@ static int imsm_reshape_super(struct supertype *st, long long size, int level,
                                goto exit_imsm_reshape_super;
                        }
 
-                       /* As well as creating update, we apply update.
-                        */
+                       ret_val = 0;
+                       /* update metadata locally */
+                       imsm_update_metadata_locally(st, u, len);
+                       /* and possibly remotely */
+                       if (st->update_tail)
+                               append_metadata_update(st, u, len);
+                       else
+                               free(u);
 
-                       dprintf("imsm:prepare space list for update_reshape\n");
-                       for (dl = super->devlist; dl;
-                            dl = dl->next) {
-                               int size = sizeof_imsm_dev(dl->dev, 1);
-                               void *s;
-                               if (u->new_raid_disks > u->old_raid_disks)
-                                       size += sizeof(__u32)*2*
-                                       (u->new_raid_disks - u->old_raid_disks);
-                               s = malloc(size);
-                               if (!s)
-                                       break;
-                               *space_tail = s;
-                               space_tail = s;
-                               *space_tail = NULL;
+               } else {
+                       fprintf(stderr, Name ": (imsm) Operation "
+                               "is not allowed on this container\n");
+               }
+       } else {
+               /* On volume level we support following operations
+                * - takeover: raid10 -> raid0; raid0 -> raid10
+                * - chunk size migration
+                * - migration: raid5 -> raid0; raid0 -> raid5
+                */
+               struct intel_super *super = st->sb;
+               struct intel_dev *dev = super->devlist;
+               int change, devnum;
+               dprintf("imsm: info: Volume operation\n");
+               /* find requested device */
+               while (dev) {
+                       imsm_find_array_minor_by_subdev(dev->index, st->container_dev, &devnum);
+                       if (devnum == geo.dev_id)
+                               break;
+                       dev = dev->next;
+               }
+               if (dev == NULL) {
+                       fprintf(stderr, Name " Cannot find %s (%i) subarray\n",
+                               geo.dev_name, geo.dev_id);
+                       goto exit_imsm_reshape_super;
+               }
+               super->current_vol = dev->index;
+               change = imsm_analyze_change(st, &geo);
+               switch (change) {
+               case CH_TAKEOVER:
+                       ret_val = imsm_takeover(st, &geo);
+                       break;
+               case CH_MIGRATION: {
+                       struct imsm_update_reshape_migration *u = NULL;
+                       int len =
+                               imsm_create_metadata_update_for_migration(
+                                       st, &geo, &u);
+                       if (len < 1) {
+                               dprintf("imsm: "
+                                       "Cannot prepare update\n");
+                               break;
                        }
-                       ret_val = apply_reshape_container_disks_update(
-                               u, super, &space_list);
-                       if (ret_val) {
-                               /* reallocate anchor
-                                */
-                               size_t buf_len = super->len;
-                               size_t len =
-                                       disks_to_mpb_size(u->new_raid_disks);
-                               struct imsm_super *mpb = super->anchor;
-                               void *new_anchor;
-
-                               if (__le32_to_cpu(mpb->mpb_size) + len >
-                                   buf_len) {
-                                       buf_len = ROUND_UP(__le32_to_cpu(
-                                               mpb->mpb_size) + len, 512);
-                                       if (posix_memalign(&new_anchor,
-                                                          512, buf_len) == 0) {
-                                               memcpy(new_anchor, super->buf,
-                                                      super->len);
-                                               free(super->buf);
-                                               super->buf = new_anchor;
-                                               super->len = buf_len;
-                                       }
-                                       super->updates_pending++;
-                                       ret_val = 0;
-                               }
-                       } else {
-                               while (space_list) {
-                                       void *space = space_list;
-                                       space_list = *space_list;
-                                       free(space);
-                               }
+                       ret_val = 0;
+                       /* update metadata locally */
+                       imsm_update_metadata_locally(st, u, len);
+                       /* and possibly remotely */
+                       if (st->update_tail)
+                               append_metadata_update(st, u, len);
+                       else
                                free(u);
-                       }
-               } else
-                       fprintf(stderr, Name "imsm: Operation is not allowed "
-                               "on this container\n");
-       } else
-               fprintf(stderr, Name "imsm: not a container operation\n");
+               }
+               break;
+               default:
+                       ret_val = 1;
+               }
+       }
 
 exit_imsm_reshape_super:
        dprintf("imsm: reshape_super Exit code = %i\n", ret_val);
        return ret_val;
 }
 
+/*******************************************************************************
+ * Function:   wait_for_reshape_imsm
+ * Description:        Function writes new sync_max value and waits until
+ *             reshape process reach new position
+ * Parameters:
+ *     sra             : general array info
+ *     to_complete     : new sync_max position
+ *     ndata           : number of disks in new array's layout
+ * Returns:
+ *      0 : success,
+ *      1 : there is no reshape in progress,
+ *     -1 : fail
+ ******************************************************************************/
+int wait_for_reshape_imsm(struct mdinfo *sra, unsigned long long to_complete,
+                         int ndata)
+{
+       int fd = sysfs_get_fd(sra, NULL, "reshape_position");
+       unsigned long long completed;
+
+       struct timeval timeout;
+
+       if (fd < 0)
+               return 1;
+
+       sysfs_fd_get_ll(fd, &completed);
+
+       if (to_complete == 0) {/* reshape till the end of array */
+               sysfs_set_str(sra, NULL, "sync_max", "max");
+               to_complete = MaxSector;
+       } else {
+               if (completed > to_complete)
+                       return -1;
+               if (sysfs_set_num(sra, NULL, "sync_max",
+                                 to_complete / ndata) != 0) {
+                       close(fd);
+                       return -1;
+               }
+       }
+
+       /* FIXME should not need a timeout at all */
+       timeout.tv_sec = 30;
+       timeout.tv_usec = 0;
+       do {
+               char action[20];
+               fd_set rfds;
+               FD_ZERO(&rfds);
+               FD_SET(fd, &rfds);
+               select(fd+1, NULL, NULL, &rfds, &timeout);
+               if (sysfs_fd_get_ll(fd, &completed) < 0) {
+                       close(fd);
+                       return 1;
+               }
+               if (sysfs_get_str(sra, NULL, "sync_action",
+                                 action, 20) > 0 &&
+                   strncmp(action, "reshape", 7) != 0)
+                       break;
+       } while (completed < to_complete);
+       close(fd);
+       return 0;
+
+}
+
+/*******************************************************************************
+ * Function:   check_degradation_change
+ * Description:        Check that array hasn't become failed.
+ * Parameters:
+ *     info    : for sysfs access
+ *     sources : source disks descriptors
+ *     degraded: previous degradation level
+ * Returns:
+ *     degradation level
+ ******************************************************************************/
+int check_degradation_change(struct mdinfo *info,
+                            int *sources,
+                            int degraded)
+{
+       unsigned long long new_degraded;
+       sysfs_get_ll(info, NULL, "degraded", &new_degraded);
+       if (new_degraded != (unsigned long long)degraded) {
+               /* check each device to ensure it is still working */
+               struct mdinfo *sd;
+               new_degraded = 0;
+               for (sd = info->devs ; sd ; sd = sd->next) {
+                       if (sd->disk.state & (1<<MD_DISK_FAULTY))
+                               continue;
+                       if (sd->disk.state & (1<<MD_DISK_SYNC)) {
+                               char sbuf[20];
+                               if (sysfs_get_str(info,
+                                       sd, "state", sbuf, 20) < 0 ||
+                                       strstr(sbuf, "faulty") ||
+                                       strstr(sbuf, "in_sync") == NULL) {
+                                       /* this device is dead */
+                                       sd->disk.state = (1<<MD_DISK_FAULTY);
+                                       if (sd->disk.raid_disk >= 0 &&
+                                           sources[sd->disk.raid_disk] >= 0) {
+                                               close(sources[
+                                                       sd->disk.raid_disk]);
+                                               sources[sd->disk.raid_disk] =
+                                                       -1;
+                                       }
+                                       new_degraded++;
+                               }
+                       }
+               }
+       }
+
+       return new_degraded;
+}
+
+/*******************************************************************************
+ * Function:   imsm_manage_reshape
+ * Description:        Function finds array under reshape and it manages reshape
+ *             process. It creates stripes backups (if required) and sets
+ *             checheckpoits.
+ * Parameters:
+ *     afd             : Backup handle (nattive) - not used
+ *     sra             : general array info
+ *     reshape         : reshape parameters - not used
+ *     st              : supertype structure
+ *     blocks          : size of critical section [blocks]
+ *     fds             : table of source device descriptor
+ *     offsets         : start of array (offest per devices)
+ *     dests           : not used
+ *     destfd          : table of destination device descriptor
+ *     destoffsets     : table of destination offsets (per device)
+ * Returns:
+ *     1 : success, reshape is done
+ *     0 : fail
+ ******************************************************************************/
 static int imsm_manage_reshape(
        int afd, struct mdinfo *sra, struct reshape *reshape,
-       struct supertype *st, unsigned long stripes,
+       struct supertype *st, unsigned long backup_blocks,
        int *fds, unsigned long long *offsets,
        int dests, int *destfd, unsigned long long *destoffsets)
 {
-       /* Just use child_monitor for now */
-       return child_monitor(
-               afd, sra, reshape, st, stripes,
-               fds, offsets, dests, destfd, destoffsets);
+       int ret_val = 0;
+       struct intel_super *super = st->sb;
+       struct intel_dev *dv = NULL;
+       struct imsm_dev *dev = NULL;
+       struct imsm_map *map_src, *map_dest;
+       int migr_vol_qan = 0;
+       int ndata, odata; /* [bytes] */
+       int chunk; /* [bytes] */
+       struct migr_record *migr_rec;
+       char *buf = NULL;
+       unsigned int buf_size; /* [bytes] */
+       unsigned long long max_position; /* array size [bytes] */
+       unsigned long long next_step; /* [blocks]/[bytes] */
+       unsigned long long old_data_stripe_length;
+       unsigned long long new_data_stripe_length;
+       unsigned long long start_src; /* [bytes] */
+       unsigned long long start; /* [bytes] */
+       unsigned long long start_buf_shift; /* [bytes] */
+       int degraded = 0;
+
+       if (!fds || !offsets || !destfd || !destoffsets || !sra)
+               goto abort;
+
+       /* Find volume during the reshape */
+       for (dv = super->devlist; dv; dv = dv->next) {
+               if (dv->dev->vol.migr_type == MIGR_GEN_MIGR
+                   && dv->dev->vol.migr_state == 1) {
+                       dev = dv->dev;
+                       migr_vol_qan++;
+               }
+       }
+       /* Only one volume can migrate at the same time */
+       if (migr_vol_qan != 1) {
+               fprintf(stderr, Name " : %s", migr_vol_qan ?
+                       "Number of migrating volumes greater than 1\n" :
+                       "There is no volume during migrationg\n");
+               goto abort;
+       }
+
+       map_src = get_imsm_map(dev, 1);
+       if (map_src == NULL)
+               goto abort;
+       map_dest = get_imsm_map(dev, 0);
+
+       ndata = imsm_num_data_members(dev, 0);
+       odata = imsm_num_data_members(dev, 1);
+
+       chunk = map_src->blocks_per_strip * 512;
+       old_data_stripe_length = odata * chunk;
+
+       migr_rec = super->migr_rec;
+
+       /* [bytes] */
+       sra->new_chunk = __le16_to_cpu(map_dest->blocks_per_strip) * 512;
+       sra->new_level = map_dest->raid_level;
+       new_data_stripe_length = sra->new_chunk * ndata;
+
+       /* initialize migration record for start condition */
+       if (sra->reshape_progress == 0)
+               init_migr_record_imsm(st, dev, sra);
+
+       /* size for data */
+       buf_size = __le32_to_cpu(migr_rec->blocks_per_unit) * 512;
+       /* extend  buffer size for parity disk */
+       buf_size += __le32_to_cpu(migr_rec->dest_depth_per_unit) * 512;
+       /* add space for stripe aligment */
+       buf_size += old_data_stripe_length;
+       if (posix_memalign((void **)&buf, 4096, buf_size)) {
+               dprintf("imsm: Cannot allocate checpoint buffer\n");
+               goto abort;
+       }
+
+       max_position =
+               __le32_to_cpu(migr_rec->post_migr_vol_cap) +
+               ((unsigned long long)__le32_to_cpu(
+                        migr_rec->post_migr_vol_cap_hi) << 32);
+
+       while (__le32_to_cpu(migr_rec->curr_migr_unit) <
+              __le32_to_cpu(migr_rec->num_migr_units)) {
+               /* current reshape position [blocks] */
+               unsigned long long current_position =
+                       __le32_to_cpu(migr_rec->blocks_per_unit)
+                       * __le32_to_cpu(migr_rec->curr_migr_unit);
+               unsigned long long border;
+
+               /* Check that array hasn't become failed.
+                */
+               degraded = check_degradation_change(sra, fds, degraded);
+               if (degraded > 1) {
+                       dprintf("imsm: Abort reshape due to degradation"
+                               " level (%i)\n", degraded);
+                       goto abort;
+               }
+
+               next_step = __le32_to_cpu(migr_rec->blocks_per_unit);
+
+               if ((current_position + next_step) > max_position)
+                       next_step = max_position - current_position;
+
+               start = (map_src->pba_of_lba0 + dev->reserved_blocks +
+                        current_position) * 512;
+
+               /* allign reading start to old geometry */
+               start_buf_shift = start % old_data_stripe_length;
+               start_src = start - start_buf_shift;
+
+               border = (start_src / odata) - (start / ndata);
+               border /= 512;
+               if (border <= __le32_to_cpu(migr_rec->dest_depth_per_unit)) {
+                       /* save critical stripes to buf
+                        * start     - start address of current unit
+                        *             to backup [bytes]
+                        * start_src - start address of current unit
+                        *             to backup alligned to source array
+                        *             [bytes]
+                        */
+                       unsigned long long next_step_filler = 0;
+                       unsigned long long copy_length = next_step * 512;
+
+                       /* allign copy area length to stripe in old geometry */
+                       next_step_filler = ((copy_length + start_buf_shift)
+                                           % old_data_stripe_length);
+                       if (next_step_filler)
+                               next_step_filler = (old_data_stripe_length
+                                                   - next_step_filler);
+                       dprintf("save_stripes() parameters: start = %llu,"
+                               "\tstart_src = %llu,\tnext_step*512 = %llu,"
+                               "\tstart_in_buf_shift = %llu,"
+                               "\tnext_step_filler = %llu\n",
+                               start, start_src, copy_length,
+                               start_buf_shift, next_step_filler);
+
+                       if (save_stripes(fds, offsets, map_src->num_members,
+                                        chunk, sra->array.level,
+                                        sra->array.layout, 0, NULL, start_src,
+                                        copy_length +
+                                        next_step_filler + start_buf_shift,
+                                        buf)) {
+                               dprintf("imsm: Cannot save stripes"
+                                       " to buffer\n");
+                               goto abort;
+                       }
+                       /* Convert data to destination format and store it
+                        * in backup general migration area
+                        */
+                       if (save_backup_imsm(st, dev, sra,
+                                            buf + start_buf_shift,
+                                            ndata, copy_length)) {
+                               dprintf("imsm: Cannot save stripes to "
+                                       "target devices\n");
+                               goto abort;
+                       }
+                       if (save_checkpoint_imsm(st, sra,
+                                                UNIT_SRC_IN_CP_AREA)) {
+                               dprintf("imsm: Cannot write checkpoint to "
+                                       "migration record (UNIT_SRC_IN_CP_AREA)\n");
+                               goto abort;
+                       }
+                       /* decrease backup_blocks */
+                       if (backup_blocks > (unsigned long)next_step)
+                               backup_blocks -= next_step;
+                       else
+                               backup_blocks = 0;
+               }
+               /* When data backed up, checkpoint stored,
+                * kick the kernel to reshape unit of data
+                */
+               next_step = next_step + sra->reshape_progress;
+               sysfs_set_num(sra, NULL, "suspend_lo", sra->reshape_progress);
+               sysfs_set_num(sra, NULL, "suspend_hi", next_step);
+
+               /* wait until reshape finish */
+               if (wait_for_reshape_imsm(sra, next_step, ndata) < 0) {
+                       dprintf("wait_for_reshape_imsm returned error!\n");
+                       goto abort;
+               }
+
+               sra->reshape_progress = next_step;
+
+               if (save_checkpoint_imsm(st, sra, UNIT_SRC_NORMAL)) {
+                       dprintf("imsm: Cannot write checkpoint to "
+                               "migration record (UNIT_SRC_NORMAL)\n");
+                       goto abort;
+               }
+
+       }
+
+       /* return '1' if done */
+       ret_val = 1;
+abort:
+       free(buf);
+       abort_reshape(sra);
+
+       return ret_val;
 }
+#endif /* MDASSEMBLE */
 
 struct superswitch super_imsm = {
 #ifndef        MDASSEMBLE
@@ -6670,6 +8805,10 @@ struct superswitch super_imsm = {
        .kill_subarray = kill_subarray_imsm,
        .update_subarray = update_subarray_imsm,
        .load_container = load_container_imsm,
+       .default_geometry = default_geometry_imsm,
+       .get_disk_controller_domain = imsm_get_disk_controller_domain,
+       .reshape_super  = imsm_reshape_super,
+       .manage_reshape = imsm_manage_reshape,
 #endif
        .match_home     = match_home_imsm,
        .uuid_from_super= uuid_from_super_imsm,
@@ -6688,10 +8827,8 @@ struct superswitch super_imsm = {
        .free_super     = free_super_imsm,
        .match_metadata_desc = match_metadata_desc_imsm,
        .container_content = container_content_imsm,
-       .default_geometry = default_geometry_imsm,
-       .get_disk_controller_domain = imsm_get_disk_controller_domain,
-       .reshape_super  = imsm_reshape_super,
-       .manage_reshape = imsm_manage_reshape,
+
+       .recover_backup = recover_backup_imsm,
 
        .external       = 1,
        .name = "imsm",