__u32 delta_disks; /* change in number of raid_disks */
__u32 new_layout; /* new layout */
__u32 new_chunk; /* new chunk size (bytes) */
- __u8 pad1[128-124]; /* set to 0 when written */
+ __u32 new_offset; /* signed number to add to data_offset in new
+ * layout. 0 == no-change. This can be
+ * different on each device in the array.
+ */
/* constant this-device information - 64 bytes */
__u64 data_offset; /* sector start of data, often 0 */
__u32 dev_number; /* permanent identifier of this device - not role in raid */
__u32 cnt_corrected_read; /* number of read errors that were corrected by re-writing */
__u8 device_uuid[16]; /* user-space setable, ignored by kernel */
- __u8 devflags; /* per-device flags. Only one defined...*/
+ __u8 devflags; /* per-device flags. Only one defined...*/
#define WriteMostly1 1 /* mask for writemostly flag in above */
/* bad block log. If there are any bad blocks the feature flag is set.
* if offset and size are non-zero, that space is reserved and available.
*/
#define MD_FEATURE_RESHAPE_ACTIVE 4
#define MD_FEATURE_BAD_BLOCKS 8 /* badblock list is not empty */
-
-#define MD_FEATURE_ALL (1|2|4|8)
+#define MD_FEATURE_REPLACEMENT 16 /* This device is replacing an
+ * active device with same 'role'.
+ * 'recovery_offset' is also set.
+ */
+#define MD_FEATURE_RESHAPE_BACKWARDS 32 /* Reshape doesn't change number
+ * of devices, but is going
+ * backwards anyway.
+ */
+#define MD_FEATURE_NEW_OFFSET 64 /* new_offset must be honoured */
+#define MD_FEATURE_ALL (MD_FEATURE_BITMAP_OFFSET \
+ |MD_FEATURE_RECOVERY_OFFSET \
+ |MD_FEATURE_RESHAPE_ACTIVE \
+ |MD_FEATURE_BAD_BLOCKS \
+ |MD_FEATURE_REPLACEMENT \
+ |MD_FEATURE_RESHAPE_BACKWARDS \
+ |MD_FEATURE_NEW_OFFSET \
+ )
#ifndef offsetof
#define offsetof(t,f) ((size_t)&(((t*)0)->f))
if (sb->data_offset)
printf(" Data Offset : %llu sectors\n",
(unsigned long long)__le64_to_cpu(sb->data_offset));
+ if (sb->new_offset) {
+ unsigned long long offset = __le64_to_cpu(sb->data_offset);
+ offset += (signed)(int32_t)__le32_to_cpu(sb->new_offset);
+ printf(" New Offset : %llu sectors\n", offset);
+ }
printf(" Super Offset : %llu sectors\n",
(unsigned long long)__le64_to_cpu(sb->super_offset));
if (__le32_to_cpu(sb->feature_map) & MD_FEATURE_RECOVERY_OFFSET)
static void getinfo_super1(struct supertype *st, struct mdinfo *info, char *map)
{
struct mdp_superblock_1 *sb = st->sb;
+ struct bitmap_super_s *bsb = (void*)(((char*)sb)+MAX_SB_SIZE);
+ struct misc_dev_info *misc = (void*)(((char*)sb)+MAX_SB_SIZE+BM_SUPER_SIZE);
int working = 0;
unsigned int i;
unsigned int role;
unsigned int map_disks = info->array.raid_disks;
+ unsigned long long super_offset;
+ unsigned long long data_size;
memset(info, 0, sizeof(*info));
info->array.major_version = 1;
else
role = __le16_to_cpu(sb->dev_roles[__le32_to_cpu(sb->dev_number)]);
+ super_offset = __le64_to_cpu(sb->super_offset);
+ data_size = __le64_to_cpu(sb->size);
+ if (info->data_offset < super_offset) {
+ unsigned long long end;
+ info->space_before = info->data_offset;
+ end = super_offset;
+ if (info->bitmap_offset < 0)
+ end += info->bitmap_offset;
+ if (info->data_offset + data_size < end)
+ info->space_after = end - data_size - info->data_offset;
+ else
+ info->space_after = 0;
+ } else {
+ info->space_before = (info->data_offset -
+ super_offset);
+ if (info->bitmap_offset > 0) {
+ unsigned long long bmend = info->bitmap_offset;
+ unsigned long long size = __le64_to_cpu(bsb->sync_size);
+ size /= __le32_to_cpu(bsb->chunksize) >> 9;
+ size = (size + 7) >> 3;
+ size += sizeof(bitmap_super_t);
+ size = ROUND_UP(size, 4096);
+ size /= 512;
+ size += bmend;
+ if (size < info->space_before)
+ info->space_before -= size;
+ else
+ info->space_before = 0;
+ } else
+ info->space_before -= 8; /* superblock */
+ info->space_after = misc->device_size - data_size - info->data_offset;
+ }
+
info->disk.raid_disk = -1;
switch(role) {
case 0xFFFF:
if (sb->feature_map & __le32_to_cpu(MD_FEATURE_RESHAPE_ACTIVE)) {
info->reshape_active = 1;
+ if (info->array.level == 10)
+ info->reshape_active |= RESHAPE_NO_BACKUP;
info->reshape_progress = __le64_to_cpu(sb->reshape_position);
info->new_level = __le32_to_cpu(sb->new_level);
info->delta_disks = __le32_to_cpu(sb->delta_disks);
}
static int init_super1(struct supertype *st, mdu_array_info_t *info,
- unsigned long long size, char *name, char *homehost, int *uuid)
+ unsigned long long size, char *name, char *homehost,
+ int *uuid, unsigned long long data_offset)
{
struct mdp_superblock_1 *sb;
int spares;
sb->chunksize = __cpu_to_le32(info->chunk_size>>9);
sb->raid_disks = __cpu_to_le32(info->raid_disks);
- sb->data_offset = __cpu_to_le64(0);
+ sb->data_offset = __cpu_to_le64(data_offset);
sb->data_size = __cpu_to_le64(0);
sb->super_offset = __cpu_to_le64(0);
sb->recovery_offset = __cpu_to_le64(0);
struct devinfo {
int fd;
char *devname;
+ long long data_offset;
mdu_disk_info_t disk;
struct devinfo *next;
};
#ifndef MDASSEMBLE
/* Add a device to the superblock being created */
static int add_to_super1(struct supertype *st, mdu_disk_info_t *dk,
- int fd, char *devname)
+ int fd, char *devname, unsigned long long data_offset)
{
struct mdp_superblock_1 *sb = st->sb;
__u16 *rp = sb->dev_roles + dk->number;
di->fd = fd;
di->devname = devname;
di->disk = *dk;
+ di->data_offset = data_offset;
di->next = NULL;
*dip = di;
struct devinfo *di;
unsigned long long dsize, array_size;
unsigned long long sb_offset, headroom;
+ unsigned long long data_offset;
for (di = st->info; di; di = di->next) {
if (di->disk.state == 1)
/* We try to leave 0.1% at the start for reshape
* operations, but limit this to 128Meg (0.1% of 10Gig)
* which is plenty for efficient reshapes
+ * However we make it at least 2 chunks as one chunk
+ * is minimum needed for reshape.
*/
headroom = 128 * 1024 * 2;
- while (headroom << 10 > array_size)
+ while (headroom << 10 > array_size &&
+ headroom/2 >= __le32_to_cpu(sb->chunksize) * 2)
headroom >>= 1;
+ data_offset = di->data_offset;
switch(st->minor_version) {
case 0:
sb_offset = dsize;
sb_offset -= 8*2;
sb_offset &= ~(4*2-1);
sb->super_offset = __cpu_to_le64(sb_offset);
- sb->data_offset = __cpu_to_le64(0);
+ if (data_offset == INVALID_SECTORS)
+ sb->data_offset = 0;
if (sb_offset < array_size + bm_space)
bm_space = sb_offset - array_size;
sb->data_size = __cpu_to_le64(sb_offset - bm_space);
break;
case 1:
sb->super_offset = __cpu_to_le64(0);
- reserved = bm_space + 4*2;
- if (reserved < headroom)
- reserved = headroom;
- if (reserved + array_size > dsize)
- reserved = dsize - array_size;
- /* Try for multiple of 1Meg so it is nicely aligned */
- #define ONE_MEG (2*1024)
- if (reserved > ONE_MEG)
- reserved = (reserved/ONE_MEG) * ONE_MEG;
-
- /* force 4K alignment */
- reserved &= ~7ULL;
+ if (data_offset == INVALID_SECTORS) {
+ reserved = bm_space + 4*2;
+ if (reserved < headroom)
+ reserved = headroom;
+ if (reserved + array_size > dsize)
+ reserved = dsize - array_size;
+ /* Try for multiple of 1Meg so it is nicely aligned */
+ #define ONE_MEG (2*1024)
+ if (reserved > ONE_MEG)
+ reserved = (reserved/ONE_MEG) * ONE_MEG;
+
+ /* force 4K alignment */
+ reserved &= ~7ULL;
+
+ } else
+ reserved = data_offset;
sb->data_offset = __cpu_to_le64(reserved);
sb->data_size = __cpu_to_le64(dsize - reserved);
case 2:
sb_offset = 4*2;
sb->super_offset = __cpu_to_le64(4*2);
- if (4*2 + 4*2 + bm_space + array_size
- > dsize)
- bm_space = dsize - array_size
- - 4*2 - 4*2;
-
- reserved = bm_space + 4*2 + 4*2;
- if (reserved < headroom)
- reserved = headroom;
- if (reserved + array_size > dsize)
- reserved = dsize - array_size;
- /* Try for multiple of 1Meg so it is nicely aligned */
- #define ONE_MEG (2*1024)
- if (reserved > ONE_MEG)
- reserved = (reserved/ONE_MEG) * ONE_MEG;
-
- /* force 4K alignment */
- reserved &= ~7ULL;
+ if (data_offset == INVALID_SECTORS) {
+ if (4*2 + 4*2 + bm_space + array_size
+ > dsize)
+ bm_space = dsize - array_size
+ - 4*2 - 4*2;
+
+ reserved = bm_space + 4*2 + 4*2;
+ if (reserved < headroom)
+ reserved = headroom;
+ if (reserved + array_size > dsize)
+ reserved = dsize - array_size;
+ /* Try for multiple of 1Meg so it is nicely aligned */
+ #define ONE_MEG (2*1024)
+ if (reserved > ONE_MEG)
+ reserved = (reserved/ONE_MEG) * ONE_MEG;
+
+ /* force 4K alignment */
+ reserved &= ~7ULL;
+
+ } else
+ reserved = data_offset;
sb->data_offset = __cpu_to_le64(reserved);
sb->data_size = __cpu_to_le64(dsize - reserved);
* superblock type st, and reserving 'reserve' sectors for
* a possible bitmap
*/
-static __u64 avail_size1(struct supertype *st, __u64 devsize)
+static __u64 _avail_size1(struct supertype *st, __u64 devsize,
+ unsigned long long data_offset, int chunksize)
{
struct mdp_superblock_1 *super = st->sb;
+ int bmspace = 0;
if (devsize < 24)
return 0;
if (super == NULL)
/* creating: allow suitable space for bitmap */
- devsize -= choose_bm_space(devsize);
+ bmspace = choose_bm_space(devsize);
#ifndef MDASSEMBLE
else if (__le32_to_cpu(super->feature_map)&MD_FEATURE_BITMAP_OFFSET) {
/* hot-add. allow for actual size of bitmap */
struct bitmap_super_s *bsb;
bsb = (struct bitmap_super_s *)(((char*)super)+MAX_SB_SIZE);
- devsize -= bitmap_sectors(bsb);
+ bmspace = bitmap_sectors(bsb);
}
#endif
/* Allow space for bad block log */
else
devsize -= 8;
+
if (st->minor_version < 0)
/* not specified, so time to set default */
st->minor_version = 2;
+
+ if (data_offset != INVALID_SECTORS)
+ switch(st->minor_version) {
+ case 0:
+ return devsize - data_offset - 8*2;
+ case 1:
+ case 2:
+ return devsize - data_offset;
+ default:
+ return 0;
+ }
+
+ devsize -= bmspace;
+
if (super == NULL && st->minor_version > 0) {
/* haven't committed to a size yet, so allow some
* slack for space for reshape.
* Limit slack to 128M, but aim for about 0.1%
*/
unsigned long long headroom = 128*1024*2;
- while ((headroom << 10) > devsize)
+ while ((headroom << 10) > devsize &&
+ (chunksize == 0 ||
+ headroom / 2 >= ((unsigned)chunksize*2)*2))
headroom >>= 1;
devsize -= headroom;
}
}
return 0;
}
+static __u64 avail_size1(struct supertype *st, __u64 devsize,
+ unsigned long long data_offset)
+{
+ return _avail_size1(st, devsize, data_offset, 0);
+}
static int
add_internal_bitmap1(struct supertype *st,
static int validate_geometry1(struct supertype *st, int level,
int layout, int raiddisks,
int *chunk, unsigned long long size,
+ unsigned long long data_offset,
char *subdev, unsigned long long *freesize,
int verbose)
{
}
close(fd);
- *freesize = avail_size1(st, ldsize >> 9);
+ *freesize = _avail_size1(st, ldsize >> 9, data_offset, *chunk);
return 1;
}
#endif /* MDASSEMBLE */
projects / thirdparty / mdadm.git / blobdiff