} __attribute__ ((packed));
struct imsm_vol {
- __u32 reserved[2];
+ __u32 curr_migr_unit;
+ __u32 reserved;
__u8 migr_state; /* Normal or Migrating */
__u8 migr_type; /* Initializing, Rebuilding, ... */
__u8 dirty;
return map->raid_level;
}
-#ifndef MDASSEMBLE
static int cmp_extent(const void *av, const void *bv)
{
const struct extent *a = av;
struct extent *rv, *e;
int i, j;
int memberships = 0;
+ __u32 reservation = MPB_SECTOR_CNT + IMSM_RESERVED_SECTORS;
for (i = 0; i < super->anchor->num_raid_devs; i++) {
struct imsm_dev *dev = get_imsm_dev(super, i);
}
qsort(rv, memberships, sizeof(*rv), cmp_extent);
- e->start = __le32_to_cpu(dl->disk.total_blocks) -
- (MPB_SECTOR_CNT + IMSM_RESERVED_SECTORS);
+ /* determine the start of the metadata
+ * when no raid devices are defined use the default
+ * ...otherwise allow the metadata to truncate the value
+ * as is the case with older versions of imsm
+ */
+ if (memberships) {
+ struct extent *last = &rv[memberships - 1];
+ __u32 remainder;
+
+ remainder = __le32_to_cpu(dl->disk.total_blocks) -
+ (last->start + last->size);
+ if (reservation > remainder)
+ reservation = remainder;
+ }
+ e->start = __le32_to_cpu(dl->disk.total_blocks) - reservation;
e->size = 0;
return rv;
}
+/* try to determine how much space is reserved for metadata from
+ * the last get_extents() entry, otherwise fallback to the
+ * default
+ */
+static __u32 imsm_reserved_sectors(struct intel_super *super, struct dl *dl)
+{
+ struct extent *e;
+ int i;
+ __u32 rv;
+
+ /* for spares just return a minimal reservation which will grow
+ * once the spare is picked up by an array
+ */
+ if (dl->index == -1)
+ return MPB_SECTOR_CNT;
+
+ e = get_extents(super, dl);
+ if (!e)
+ return MPB_SECTOR_CNT + IMSM_RESERVED_SECTORS;
+
+ /* scroll to last entry */
+ for (i = 0; e[i].size; i++)
+ continue;
+
+ rv = __le32_to_cpu(dl->disk.total_blocks) - e[i].start;
+
+ free(e);
+
+ return rv;
+}
+
+#ifndef MDASSEMBLE
static void print_imsm_dev(struct imsm_dev *dev, int index)
{
__u64 sz;
printf(" Dirty State : %s\n", dev->vol.dirty ? "dirty" : "clean");
}
-static void print_imsm_disk(struct imsm_super *mpb, int index)
+static void print_imsm_disk(struct imsm_super *mpb, int index, __u32 reserved)
{
struct imsm_disk *disk = __get_imsm_disk(mpb, index);
char str[MAX_RAID_SERIAL_LEN + 1];
s&FAILED_DISK ? " failed" : "",
s&USABLE_DISK ? " usable" : "");
printf(" Id : %08x\n", __le32_to_cpu(disk->scsi_id));
- sz = __le32_to_cpu(disk->total_blocks) -
- (MPB_SECTOR_CNT + IMSM_RESERVED_SECTORS * mpb->num_raid_devs);
+ sz = __le32_to_cpu(disk->total_blocks) - reserved;
printf(" Usable Size : %llu%s\n", (unsigned long long)sz,
human_size(sz * 512));
}
char str[MAX_SIGNATURE_LENGTH];
int i;
__u32 sum;
+ __u32 reserved = imsm_reserved_sectors(super, super->disks);
snprintf(str, MPB_SIG_LEN, "%s", mpb->sig);
printf(" Magic : %s\n", str);
printf(" MPB Sectors : %d\n", mpb_sectors(mpb));
printf(" Disks : %d\n", mpb->num_disks);
printf(" RAID Devices : %d\n", mpb->num_raid_devs);
- print_imsm_disk(mpb, super->disks->index);
+ print_imsm_disk(mpb, super->disks->index, reserved);
if (super->bbm_log) {
struct bbm_log *log = super->bbm_log;
for (i = 0; i < mpb->num_disks; i++) {
if (i == super->disks->index)
continue;
- print_imsm_disk(mpb, i);
+ print_imsm_disk(mpb, i, reserved);
}
}
+static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info);
+
static void brief_examine_super_imsm(struct supertype *st)
{
- printf("ARRAY /dev/imsm metadata=imsm\n");
+ /* We just write a generic DDF ARRAY entry
+ */
+ struct mdinfo info;
+ char nbuf[64];
+
+ getinfo_super_imsm(st, &info);
+ fname_from_uuid(st, &info, nbuf,'-');
+ printf("ARRAY /dev/imsm metadata=imsm UUID=%s\n", nbuf + 5);
}
static void detail_super_imsm(struct supertype *st, char *homehost)
static void brief_detail_super_imsm(struct supertype *st)
{
- printf("%s\n", __FUNCTION__);
+ struct mdinfo info;
+ char nbuf[64];
+ getinfo_super_imsm(st, &info);
+ fname_from_uuid(st, &info, nbuf,'-');
+ printf(" UUID=%s", nbuf + 5);
}
#endif
case 6:
return ALGORITHM_LEFT_ASYMMETRIC;
case 10:
- return 0x102; //FIXME is this correct?
+ return 0x102;
}
return -1;
}
info->component_size = __le32_to_cpu(map->blocks_per_member);
memset(info->uuid, 0, sizeof(info->uuid));
- if (map->map_state == IMSM_T_STATE_UNINITIALIZED ||
- dev->vol.dirty || dev->vol.migr_state)
+ if (map->map_state == IMSM_T_STATE_UNINITIALIZED || dev->vol.dirty)
info->resync_start = 0;
+ else if (dev->vol.migr_state)
+ info->resync_start = __le32_to_cpu(dev->vol.curr_migr_unit);
else
info->resync_start = ~0ULL;
info->name[0] = 0;
if (super->disks) {
+ __u32 reserved = imsm_reserved_sectors(super, super->disks);
+
disk = &super->disks->disk;
info->disk.number = super->disks->index;
info->disk.raid_disk = super->disks->index;
- info->data_offset = __le32_to_cpu(disk->total_blocks) -
- (MPB_SECTOR_CNT + IMSM_RESERVED_SECTORS);
- info->component_size = MPB_SECTOR_CNT + IMSM_RESERVED_SECTORS;
+ info->data_offset = __le32_to_cpu(disk->total_blocks) - reserved;
+ info->component_size = reserved;
s = __le32_to_cpu(disk->status);
info->disk.state = s & CONFIGURED_DISK ? (1 << MD_DISK_ACTIVE) : 0;
info->disk.state |= s & FAILED_DISK ? (1 << MD_DISK_FAULTY) : 0;
return rv;
}
- /* trim whitespace */
+ /* trim leading whitespace */
rsp_len = scsi_serial[3];
rsp_buf = (char *) &scsi_serial[4];
c = rsp_buf;
while (isspace(*c))
c++;
+
+ /* truncate len to the end of rsp_buf if necessary */
if (c + MAX_RAID_SERIAL_LEN > rsp_buf + rsp_len)
len = rsp_len - (c - rsp_buf);
else
len = MAX_RAID_SERIAL_LEN;
+
+ /* initialize the buffer and copy rsp_buf characters */
+ memset(serial, 0, MAX_RAID_SERIAL_LEN);
memcpy(serial, c, len);
+
+ /* trim trailing whitespace starting with the last character copied */
c = (char *) &serial[len - 1];
while (isspace(*c) || *c == '\0')
*c-- = '\0';
dev->vol.migr_state = 1;
dev->vol.migr_type = rebuild_resync;
+ dev->vol.curr_migr_unit = 0;
dest = get_imsm_map(dev, 1);
memcpy(dest, src, sizeof_imsm_map(src));
src->map_state = to_state;
}
+
+static void end_migration(struct imsm_dev *dev, __u8 map_state)
+{
+ struct imsm_map *map = get_imsm_map(dev, 0);
+
+ dev->vol.migr_state = 0;
+ dev->vol.curr_migr_unit = 0;
+ map->map_state = map_state;
+}
#endif
static int parse_raid_devices(struct intel_super *super)
vol->migr_state = 0;
vol->migr_type = 0;
vol->dirty = 0;
+ vol->curr_migr_unit = 0;
for (i = 0; i < idx; i++) {
struct imsm_dev *prev = get_imsm_dev(super, i);
struct imsm_map *pmap = get_imsm_map(prev, 0);
generation++;
mpb->generation_num = __cpu_to_le32(generation);
+ mpb_size += sizeof(struct imsm_disk) * mpb->num_disks;
for (d = super->disks; d; d = d->next) {
if (d->index == -1)
spares++;
- else {
+ else
mpb->disk[d->index] = d->disk;
- mpb_size += sizeof(struct imsm_disk);
- }
}
for (i = 0; i < mpb->num_raid_devs; i++) {
case 10:
{
/**
- * check to see if any mirrors have failed,
- * otherwise we are degraded
+ * check to see if any mirrors have failed, otherwise we
+ * are degraded. Even numbered slots are mirrored on
+ * slot+1
*/
- int device_per_mirror = 2; /* FIXME is this always the case?
- * and are they always adjacent?
- */
- int r10fail = 0;
int i;
+ int insync;
for (i = 0; i < map->num_members; i++) {
- int idx = get_imsm_disk_idx(dev, i);
- struct imsm_disk *disk = get_imsm_disk(super, idx);
+ __u32 ord = get_imsm_ord_tbl_ent(dev, i);
+ int idx = ord_to_idx(ord);
+ struct imsm_disk *disk;
- if (!disk)
- r10fail++;
- else if (__le32_to_cpu(disk->status) & FAILED_DISK)
- r10fail++;
+ /* reset the potential in-sync count on even-numbered
+ * slots. num_copies is always 2 for imsm raid10
+ */
+ if ((i & 1) == 0)
+ insync = 2;
- if (r10fail >= device_per_mirror)
- return IMSM_T_STATE_FAILED;
+ disk = get_imsm_disk(super, idx);
+ if (!disk ||
+ __le32_to_cpu(disk->status) & FAILED_DISK ||
+ ord & IMSM_ORD_REBUILD)
+ insync--;
- /* reset 'r10fail' for next mirror set */
- if (!((i + 1) % device_per_mirror))
- r10fail = 0;
+ /* no in-sync disks left in this mirror the
+ * array has failed
+ */
+ if (insync == 0)
+ return IMSM_T_STATE_FAILED;
}
return IMSM_T_STATE_DEGRADED;
__u8 map_state = imsm_check_degraded(super, dev, failed);
if (consistent == 2 &&
- (a->resync_start != ~0ULL ||
+ (!is_resync_complete(a) ||
map_state != IMSM_T_STATE_NORMAL ||
dev->vol.migr_state))
consistent = 0;
- if (a->resync_start == ~0ULL) {
+ if (is_resync_complete(a)) {
/* complete intialization / resync,
* recovery is completed in ->set_disk
*/
if (is_resyncing(dev)) {
dprintf("imsm: mark resync done\n");
- dev->vol.migr_state = 0;
- map->map_state = map_state;
+ end_migration(dev, map_state);
super->updates_pending++;
}
} else if (!is_resyncing(dev) && !failed) {
super->updates_pending++;
}
+ /* check if we can update the migration checkpoint */
+ if (dev->vol.migr_state &&
+ __le32_to_cpu(dev->vol.curr_migr_unit) != a->resync_start) {
+ dprintf("imsm: checkpoint migration (%llu)\n", a->resync_start);
+ dev->vol.curr_migr_unit = __cpu_to_le32(a->resync_start);
+ super->updates_pending++;
+ }
+
/* mark dirty / clean */
if (dev->vol.dirty != !consistent) {
dprintf("imsm: mark '%s' (%llu)\n",
/* check if recovery complete, newly degraded, or failed */
if (map_state == IMSM_T_STATE_NORMAL && is_rebuilding(dev)) {
- map->map_state = map_state;
- dev->vol.migr_state = 0;
+ end_migration(dev, map_state);
super->updates_pending++;
} else if (map_state == IMSM_T_STATE_DEGRADED &&
map->map_state != map_state &&
} else if (map_state == IMSM_T_STATE_FAILED &&
map->map_state != map_state) {
dprintf("imsm: mark failed\n");
- dev->vol.migr_state = 0;
- map->map_state = map_state;
+ end_migration(dev, map_state);
super->updates_pending++;
}
}
projects / thirdparty / mdadm.git / blobdiff