From c025cf87b07306748b4bb625aa45e1fb41ce64e0 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 06 2019 11:13:28 +0000 Subject: import mdadm-4.1-1.el7 --- diff --git a/.gitignore b/.gitignore index 297b343..88c376b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mdadm-4.1-rc1.tar.xz +SOURCES/mdadm-4.1.tar.xz diff --git a/.mdadm.metadata b/.mdadm.metadata index c4f929e..b2205ce 100644 --- a/.mdadm.metadata +++ b/.mdadm.metadata @@ -1 +1 @@ -6fdb973256aedcbc77569e6a9c94ca98be944d88 SOURCES/mdadm-4.1-rc1.tar.xz +4bbbd02674ac67dc9773f41aace7677aa5374c1c SOURCES/mdadm-4.1.tar.xz diff --git a/SOURCES/0001-Assemble-keep-MD_DISK_FAILFAST-and-MD_DISK_WRITEMOST.patch b/SOURCES/0001-Assemble-keep-MD_DISK_FAILFAST-and-MD_DISK_WRITEMOST.patch new file mode 100644 index 0000000..4d58d1c --- /dev/null +++ b/SOURCES/0001-Assemble-keep-MD_DISK_FAILFAST-and-MD_DISK_WRITEMOST.patch @@ -0,0 +1,39 @@ +From 0833f9c3dbaaee202b92ea956f9e2decc7b9593a Mon Sep 17 00:00:00 2001 +From: Gioh Kim +Date: Tue, 6 Nov 2018 15:27:42 +0100 +Subject: [RHEL7.7 PATCH 01/21] Assemble: keep MD_DISK_FAILFAST and + MD_DISK_WRITEMOSTLY flag + +Before updating superblock of slave disks, desired_state value +is set for the target state of the slave disks. But it forgets +to check MD_DISK_FAILFAST and MD_DISK_WRITEMOSTLY flags. Then +start_arrays() calls ADD_NEW_DISK ioctl-call and pass the state +without MD_DISK_FAILFAST and MD_DISK_WRITEMOSTLY. + +Currenlty it does not generate any problem because kernel does not +care MD_DISK_FAILFAST or MD_DISK_WRITEMOSTLY flags. + +Reviewed-by: NeilBrown +Signed-off-by: Gioh Kim +Signed-off-by: Jes Sorensen +--- + Assemble.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Assemble.c b/Assemble.c +index a79466c..f39c9e1 100644 +--- a/Assemble.c ++++ b/Assemble.c +@@ -1704,6 +1704,9 @@ try_again: + else + desired_state = (1< -Date: Tue, 10 Apr 2018 09:25:39 +0800 -Subject: [RHEL7.5 PATCH 01/26] mdadm: fix use-after-free after free_mdstat - -e->percent access the mdstat_ent which was already freed in free_mdstat - -Signed-off-by: Zhipeng Xie -Signed-off-by: Jes Sorensen ---- - Detail.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Detail.c b/Detail.c -index 4dcf81d..860241c 100644 ---- a/Detail.c -+++ b/Detail.c -@@ -561,7 +561,6 @@ int Detail(char *dev, struct context *c) - printf(" %7s Status : %d%% complete\n", - sync_action[e->resync], e->percent); - } -- free_mdstat(ms); - - if ((st && st->sb) && (info && info->reshape_active)) { - #if 0 -@@ -609,6 +608,8 @@ This is pretty boring - printf("\n"); - } else if (e && e->percent >= 0) - printf("\n"); -+ free_mdstat(ms); -+ - if (st && st->sb) - st->ss->detail_super(st, c->homehost); - --- -2.7.4 - diff --git a/SOURCES/0002-Document-PART-POLICY-lines.patch b/SOURCES/0002-Document-PART-POLICY-lines.patch new file mode 100644 index 0000000..cb3299a --- /dev/null +++ b/SOURCES/0002-Document-PART-POLICY-lines.patch @@ -0,0 +1,77 @@ +From 6b6112842030309c297a521918d1a2e982426fa3 Mon Sep 17 00:00:00 2001 +From: NeilBrown +Date: Fri, 9 Nov 2018 17:12:33 +1100 +Subject: [RHEL7.7 PATCH 02/21] Document PART-POLICY lines + +PART-POLICY has been accepted in mdadm.conf since the same +time that POLICY was accepted, but it was never documented. +So add the missing documentation. + +Also fix a bug which would have stopped it from working if +anyone had ever tried to use it. + +Signed-off-by: NeilBrown +Signed-off-by: Jes Sorensen +--- + mdadm.conf.5 | 24 +++++++++++++++++++++++- + policy.c | 2 +- + 2 files changed, 24 insertions(+), 2 deletions(-) + +diff --git a/mdadm.conf.5 b/mdadm.conf.5 +index 18512cb..47c962a 100644 +--- a/mdadm.conf.5 ++++ b/mdadm.conf.5 +@@ -501,7 +501,7 @@ To update hot plug configuration it is necessary to execute + .B mdadm \-\-udev\-rules + command after changing the config file + +-Key words used in the ++Keywords used in the + .I POLICY + line and supported values are: + +@@ -565,6 +565,28 @@ be automatically added to that array (or it's container) + as above and the disk will become a spare in remaining cases + .RE + ++.TP ++.B PART-POLICY ++This is similar to ++.B POLICY ++and accepts the same keyword assignments. It allows a consistent set ++of policies to applied to each of the partitions of a device. ++ ++A ++.B PART-POLICY ++line should set ++.I type=disk ++and identify the path to one or more disk devices. Each partition on ++these disks will be treated according to the ++.I action= ++setting from this line. If a ++.I domain ++is set in the line, then the domain associated with each patition will ++be based on the domain, but with ++.RB \(dq -part N\(dq ++appended, when N is the partition number for the partition that was ++found. ++ + .SH EXAMPLE + DEVICE /dev/sd[bcdjkl]1 + .br +diff --git a/policy.c b/policy.c +index c0d18a7..258f393 100644 +--- a/policy.c ++++ b/policy.c +@@ -300,7 +300,7 @@ static int path_has_part(char *path, char **part) + l--; + if (l < 5 || strncmp(path+l-5, "-part", 5) != 0) + return 0; +- *part = path+l-4; ++ *part = path+l-5; + return 1; + } + +-- +2.7.5 + diff --git a/SOURCES/0002-imsm-Allow-create-RAID-volume-with-link-to-container.patch b/SOURCES/0002-imsm-Allow-create-RAID-volume-with-link-to-container.patch deleted file mode 100644 index 8b161d7..0000000 --- a/SOURCES/0002-imsm-Allow-create-RAID-volume-with-link-to-container.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b91ad097d6eecb85cf28915836370288709fbda8 Mon Sep 17 00:00:00 2001 -From: Michal Zylowski -Date: Wed, 4 Apr 2018 14:20:17 +0200 -Subject: [RHEL7.5 PATCH 02/26] imsm: Allow create RAID volume with link to - container - -After 1db03765("Subdevs can't be all missing when create raid device") -raid volume can't be created with link to container. This feature should -not be blocked in Create function. IMSM code forbids creation of -container with missing disk, so case like all dev's missing is already -handled. - -Permit IMSM volume creation when devices are given as link to container. - -Signed-off-by: Michal Zylowski -Signed-off-by: Jes Sorensen ---- - Create.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Create.c b/Create.c -index 50142d8..04b1dfc 100644 ---- a/Create.c -+++ b/Create.c -@@ -475,7 +475,7 @@ int Create(struct supertype *st, char *mddev, - close(fd); - } - } -- if (missing_disks == dnum) { -+ if (missing_disks == dnum && !have_container) { - pr_err("Subdevs can't be all missing\n"); - return 1; - } --- -2.7.4 - diff --git a/SOURCES/0003-policy-support-devices-with-multiple-paths.patch b/SOURCES/0003-policy-support-devices-with-multiple-paths.patch new file mode 100644 index 0000000..2521d28 --- /dev/null +++ b/SOURCES/0003-policy-support-devices-with-multiple-paths.patch @@ -0,0 +1,334 @@ +From cd72f9d114da206baa01fd56ff2d8ffcc08f3239 Mon Sep 17 00:00:00 2001 +From: NeilBrown +Date: Fri, 9 Nov 2018 17:12:33 +1100 +Subject: [RHEL7.7 PATCH 03/21] policy: support devices with multiple paths. + +As new releases of Linux some time change the name of +a path, some distros keep "legacy" names as well. This +is useful, but confuses mdadm which assumes each device has +precisely one path. + +So change this assumption: allow a disk to have several +paths, and allow any to match when looking for a policy +which matches a disk. + +Reported-and-tested-by: Mariusz Tkaczyk +Signed-off-by: NeilBrown +Signed-off-by: Jes Sorensen +--- + Incremental.c | 5 +- + mdadm.h | 2 +- + policy.c | 163 ++++++++++++++++++++++++++++++++-------------------------- + 3 files changed, 95 insertions(+), 75 deletions(-) + +diff --git a/Incremental.c b/Incremental.c +index a4ff7d4..d4d3c35 100644 +--- a/Incremental.c ++++ b/Incremental.c +@@ -1080,6 +1080,7 @@ static int partition_try_spare(char *devname, int *dfdp, struct dev_policy *pol, + struct supertype *st2 = NULL; + char *devname = NULL; + unsigned long long devsectors; ++ char *pathlist[2]; + + if (de->d_ino == 0 || de->d_name[0] == '.' || + (de->d_type != DT_LNK && de->d_type != DT_UNKNOWN)) +@@ -1094,7 +1095,9 @@ static int partition_try_spare(char *devname, int *dfdp, struct dev_policy *pol, + /* This is a partition - skip it */ + goto next; + +- pol2 = path_policy(de->d_name, type_disk); ++ pathlist[0] = de->d_name; ++ pathlist[1] = NULL; ++ pol2 = path_policy(pathlist, type_disk); + + domain_merge(&domlist, pol2, st ? st->ss->name : NULL); + if (domain_test(domlist, pol, st ? st->ss->name : NULL) != 1) +diff --git a/mdadm.h b/mdadm.h +index 387e681..705bd9b 100644 +--- a/mdadm.h ++++ b/mdadm.h +@@ -1247,7 +1247,7 @@ extern void policyline(char *line, char *type); + extern void policy_add(char *type, ...); + extern void policy_free(void); + +-extern struct dev_policy *path_policy(char *path, char *type); ++extern struct dev_policy *path_policy(char **paths, char *type); + extern struct dev_policy *disk_policy(struct mdinfo *disk); + extern struct dev_policy *devid_policy(int devid); + extern void dev_policy_free(struct dev_policy *p); +diff --git a/policy.c b/policy.c +index 258f393..fa67d55 100644 +--- a/policy.c ++++ b/policy.c +@@ -189,15 +189,17 @@ struct dev_policy *pol_find(struct dev_policy *pol, char *name) + return pol; + } + +-static char *disk_path(struct mdinfo *disk) ++static char **disk_paths(struct mdinfo *disk) + { + struct stat stb; + int prefix_len; + DIR *by_path; + char symlink[PATH_MAX] = "/dev/disk/by-path/"; +- char nm[PATH_MAX]; ++ char **paths; ++ int cnt = 0; + struct dirent *ent; +- int rv; ++ ++ paths = xmalloc(sizeof(*paths) * (cnt+1)); + + by_path = opendir(symlink); + if (by_path) { +@@ -214,22 +216,13 @@ static char *disk_path(struct mdinfo *disk) + continue; + if (stb.st_rdev != makedev(disk->disk.major, disk->disk.minor)) + continue; +- closedir(by_path); +- return xstrdup(ent->d_name); ++ paths[cnt++] = xstrdup(ent->d_name); ++ paths = xrealloc(paths, sizeof(*paths) * (cnt+1)); + } + closedir(by_path); + } +- /* A NULL path isn't really acceptable - use the devname.. */ +- sprintf(symlink, "/sys/dev/block/%d:%d", disk->disk.major, disk->disk.minor); +- rv = readlink(symlink, nm, sizeof(nm)-1); +- if (rv > 0) { +- char *dname; +- nm[rv] = 0; +- dname = strrchr(nm, '/'); +- if (dname) +- return xstrdup(dname + 1); +- } +- return xstrdup("unknown"); ++ paths[cnt] = NULL; ++ return paths; + } + + char type_part[] = "part"; +@@ -246,18 +239,53 @@ static char *disk_type(struct mdinfo *disk) + return type_disk; + } + +-static int pol_match(struct rule *rule, char *path, char *type) ++static int path_has_part(char *path, char **part) ++{ ++ /* check if path ends with "-partNN" and ++ * if it does, place a pointer to "-pathNN" ++ * in 'part'. ++ */ ++ int l; ++ if (!path) ++ return 0; ++ l = strlen(path); ++ while (l > 1 && isdigit(path[l-1])) ++ l--; ++ if (l < 5 || strncmp(path+l-5, "-part", 5) != 0) ++ return 0; ++ *part = path+l-5; ++ return 1; ++} ++ ++static int pol_match(struct rule *rule, char **paths, char *type, char **part) + { +- /* check if this rule matches on path and type */ ++ /* Check if this rule matches on any path and type. ++ * If 'part' is not NULL, then 'path' must end in -partN, which ++ * we ignore for matching, and return in *part on success. ++ */ + int pathok = 0; /* 0 == no path, 1 == match, -1 == no match yet */ + int typeok = 0; + +- while (rule) { ++ for (; rule; rule = rule->next) { + if (rule->name == rule_path) { ++ char *p; ++ int i; + if (pathok == 0) + pathok = -1; +- if (path && fnmatch(rule->value, path, 0) == 0) +- pathok = 1; ++ if (!paths) ++ continue; ++ for (i = 0; paths[i]; i++) { ++ if (part) { ++ if (!path_has_part(paths[i], &p)) ++ continue; ++ *p = '\0'; ++ *part = p+1; ++ } ++ if (fnmatch(rule->value, paths[i], 0) == 0) ++ pathok = 1; ++ if (part) ++ *p = '-'; ++ } + } + if (rule->name == rule_type) { + if (typeok == 0) +@@ -265,7 +293,6 @@ static int pol_match(struct rule *rule, char *path, char *type) + if (type && strcmp(rule->value, type) == 0) + typeok = 1; + } +- rule = rule->next; + } + return pathok >= 0 && typeok >= 0; + } +@@ -286,24 +313,6 @@ static void pol_merge(struct dev_policy **pol, struct rule *rule) + pol_new(pol, r->name, r->value, metadata); + } + +-static int path_has_part(char *path, char **part) +-{ +- /* check if path ends with "-partNN" and +- * if it does, place a pointer to "-pathNN" +- * in 'part'. +- */ +- int l; +- if (!path) +- return 0; +- l = strlen(path); +- while (l > 1 && isdigit(path[l-1])) +- l--; +- if (l < 5 || strncmp(path+l-5, "-part", 5) != 0) +- return 0; +- *part = path+l-5; +- return 1; +-} +- + static void pol_merge_part(struct dev_policy **pol, struct rule *rule, char *part) + { + /* copy any name assignments from rule into pol, appending +@@ -352,7 +361,7 @@ static int config_rules_has_path = 0; + * path_policy() gathers policy information for the + * disk described in the given a 'path' and a 'type'. + */ +-struct dev_policy *path_policy(char *path, char *type) ++struct dev_policy *path_policy(char **paths, char *type) + { + struct pol_rule *rules; + struct dev_policy *pol = NULL; +@@ -361,27 +370,24 @@ struct dev_policy *path_policy(char *path, char *type) + rules = config_rules; + + while (rules) { +- char *part; ++ char *part = NULL; + if (rules->type == rule_policy) +- if (pol_match(rules->rule, path, type)) ++ if (pol_match(rules->rule, paths, type, NULL)) + pol_merge(&pol, rules->rule); + if (rules->type == rule_part && strcmp(type, type_part) == 0) +- if (path_has_part(path, &part)) { +- *part = 0; +- if (pol_match(rules->rule, path, type_disk)) +- pol_merge_part(&pol, rules->rule, part+1); +- *part = '-'; +- } ++ if (pol_match(rules->rule, paths, type_disk, &part)) ++ pol_merge_part(&pol, rules->rule, part); + rules = rules->next; + } + + /* Now add any metadata-specific internal knowledge + * about this path + */ +- for (i=0; path && superlist[i]; i++) ++ for (i=0; paths[0] && superlist[i]; i++) + if (superlist[i]->get_disk_controller_domain) { + const char *d = +- superlist[i]->get_disk_controller_domain(path); ++ superlist[i]->get_disk_controller_domain( ++ paths[0]); + if (d) + pol_new(&pol, pol_domain, d, superlist[i]->name); + } +@@ -400,22 +406,34 @@ void pol_add(struct dev_policy **pol, + pol_dedup(*pol); + } + ++static void free_paths(char **paths) ++{ ++ int i; ++ ++ if (!paths) ++ return; ++ ++ for (i = 0; paths[i]; i++) ++ free(paths[i]); ++ free(paths); ++} ++ + /* + * disk_policy() gathers policy information for the + * disk described in the given mdinfo (disk.{major,minor}). + */ + struct dev_policy *disk_policy(struct mdinfo *disk) + { +- char *path = NULL; ++ char **paths = NULL; + char *type = disk_type(disk); + struct dev_policy *pol = NULL; + + if (config_rules_has_path) +- path = disk_path(disk); ++ paths = disk_paths(disk); + +- pol = path_policy(path, type); ++ pol = path_policy(paths, type); + +- free(path); ++ free_paths(paths); + return pol; + } + +@@ -756,27 +774,26 @@ int policy_check_path(struct mdinfo *disk, struct map_ent *array) + { + char path[PATH_MAX]; + FILE *f = NULL; +- char *id_path = disk_path(disk); +- int rv; ++ char **id_paths = disk_paths(disk); ++ int i; ++ int rv = 0; + +- if (!id_path) +- return 0; ++ for (i = 0; id_paths[i]; i++) { ++ snprintf(path, PATH_MAX, FAILED_SLOTS_DIR "/%s", id_paths[i]); ++ f = fopen(path, "r"); ++ if (!f) ++ continue; + +- snprintf(path, PATH_MAX, FAILED_SLOTS_DIR "/%s", id_path); +- f = fopen(path, "r"); +- if (!f) { +- free(id_path); +- return 0; ++ rv = fscanf(f, " %s %x:%x:%x:%x\n", ++ array->metadata, ++ array->uuid, ++ array->uuid+1, ++ array->uuid+2, ++ array->uuid+3); ++ fclose(f); ++ break; + } +- +- rv = fscanf(f, " %s %x:%x:%x:%x\n", +- array->metadata, +- array->uuid, +- array->uuid+1, +- array->uuid+2, +- array->uuid+3); +- fclose(f); +- free(id_path); ++ free_paths(id_paths); + return rv == 5; + } + +-- +2.7.5 + diff --git a/SOURCES/0003-tests-func.sh-Fix-some-total-breakage-in-the-test-sc.patch b/SOURCES/0003-tests-func.sh-Fix-some-total-breakage-in-the-test-sc.patch deleted file mode 100644 index f33422f..0000000 --- a/SOURCES/0003-tests-func.sh-Fix-some-total-breakage-in-the-test-sc.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 59416da78fc66084f721163b914913dc1da37b44 Mon Sep 17 00:00:00 2001 -From: Jes Sorensen -Date: Wed, 11 Apr 2018 17:01:50 -0400 -Subject: [RHEL7.5 PATCH 03/26] tests/func.sh: Fix some total breakage in the - test scripts - -We will never mandate an obsolete file system such as ext[2-4] for -running the test suite, nor should the test version of mdadm be -installed on the system for the tests to be run. - -Signed-off-by: Jes Sorensen -Fixes: 20d10b4be873ba ("mdadm/test: Refactor and revamp 'test' script") ---- - test | 2 +- - tests/func.sh | 22 +++------------------- - 2 files changed, 4 insertions(+), 20 deletions(-) - -diff --git a/test b/test -index 111a2e7..711a3c7 100755 ---- a/test -+++ b/test -@@ -5,7 +5,7 @@ mdadm=$PWD/mdadm - targetdir="/var/tmp" - logdir="$targetdir" - config=/tmp/mdadm.conf --testdir= -+testdir=$PWD/tests - devlist= - - savelogs=0 -diff --git a/tests/func.sh b/tests/func.sh -index a6995f1..9710a53 100644 ---- a/tests/func.sh -+++ b/tests/func.sh -@@ -101,8 +101,8 @@ check_env() { - echo "test: testing can only be done as 'root'." - exit 1 - } -- [ -x "raid6check" -a -x $mdadm ] || { -- echo "test: please run 'make everything' before perform testing." -+ [ \! -x $mdadm ] && { -+ echo "test: please run make everything before perform testing." - exit 1 - } - cmds=(mdadm lsblk df udevadm losetup mkfs.ext3 fsck seq) -@@ -113,23 +113,6 @@ check_env() { - exit 1 - } - done -- mdadm_src_ver="$($mdadm -V 2>&1)" -- mdadm_sbin_ver="$($(which mdadm) -V 2>&1)" -- if [ "$mdadm_src_ver" != "$mdadm_sbin_ver" ] -- then -- # it's nessesary to 'make install' mdadm to /SBIN/DIR, -- # such as systemd/mdadm-grow-continue@.service, would -- # run as an instance by systemd when reshape happens, -- # thus ensure that the correct mdadm is in testing. -- echo "test: please run 'make install' before testing." -- exit 1 -- fi -- if ! $(df -T . | grep -iq ext) -- then -- # 'external file' bitmap only supports with ext[2-4] file system -- echo "test: please run test suite with ext[2-4] file system." -- exit 1 -- fi - if $(lsblk -a | grep -iq raid) - then - # donot run mdadm -Ss directly if there are RAIDs working. -@@ -231,6 +214,7 @@ check() { - if [ $? -eq 0 ]; then - die "This command shouldn't run successfully" - fi -+ ;; - spares ) - spares=$(tr '] ' '\012\012' < /proc/mdstat | grep -c '(S)' || exit 0) - [ $spares -ne $2 ] && --- -2.7.4 - diff --git a/SOURCES/0004-imsm-change-reserved-space-to-4MB.patch b/SOURCES/0004-imsm-change-reserved-space-to-4MB.patch deleted file mode 100644 index 5db7109..0000000 --- a/SOURCES/0004-imsm-change-reserved-space-to-4MB.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 611d95290dd41d73bd8f9cc06f7ec293a40b819e Mon Sep 17 00:00:00 2001 -From: Mariusz Dabrowski -Date: Thu, 5 Apr 2018 13:38:35 +0200 -Subject: [RHEL7.5 PATCH 04/26] imsm: change reserved space to 4MB - -Due to compatibility to the newest OROM, imsm reserved space has to be -expanded to 4MB. - -Signed-off-by: Mariusz Dabrowski -Signed-off-by: Jes Sorensen ---- - super-intel.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/super-intel.c b/super-intel.c -index fb1b693..52011e5 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -88,8 +88,8 @@ - #define MPB_ATTRIB_IGNORED (MPB_ATTRIB_NEVER_USE) - - #define MPB_SECTOR_CNT 2210 --#define IMSM_RESERVED_SECTORS 4096 --#define NUM_BLOCKS_DIRTY_STRIPE_REGION 2056 -+#define IMSM_RESERVED_SECTORS 8192 -+#define NUM_BLOCKS_DIRTY_STRIPE_REGION 2048 - #define SECT_PER_MB_SHIFT 11 - #define MAX_SECTOR_SIZE 4096 - #define MULTIPLE_PPL_AREA_SIZE_IMSM (1024 * 1024) /* Size of the whole --- -2.7.4 - diff --git a/SOURCES/0004-mdcheck-add-systemd-unit-files-to-run-mdcheck.patch b/SOURCES/0004-mdcheck-add-systemd-unit-files-to-run-mdcheck.patch new file mode 100644 index 0000000..c0c25c1 --- /dev/null +++ b/SOURCES/0004-mdcheck-add-systemd-unit-files-to-run-mdcheck.patch @@ -0,0 +1,137 @@ +From 4199d3c629c14866505923d19fa50017ee92d2e1 Mon Sep 17 00:00:00 2001 +From: NeilBrown +Date: Wed, 5 Dec 2018 16:35:00 +1100 +Subject: [RHEL7.7 PATCH 04/21] mdcheck: add systemd unit files to run mdcheck. + +Having the mdcheck script is not use if is never run. +This patch adds systemd unit files so that it can easily +be run on the first Sunday of each month for 6 hours, +then on every subsequent morning until the check is +finished. + +The units still need to be enabled with + systemctl enable mdcheck_start.timer + +The timer will only actually be started when an array +which might need it becomes active. + +Signed-off-by: NeilBrown +Signed-off-by: Jes Sorensen +--- + Makefile | 5 ++++- + systemd/mdcheck_continue.service | 18 ++++++++++++++++++ + systemd/mdcheck_continue.timer | 13 +++++++++++++ + systemd/mdcheck_start.service | 17 +++++++++++++++++ + systemd/mdcheck_start.timer | 15 +++++++++++++++ + 5 files changed, 67 insertions(+), 1 deletion(-) + create mode 100644 systemd/mdcheck_continue.service + create mode 100644 systemd/mdcheck_continue.timer + create mode 100644 systemd/mdcheck_start.service + create mode 100644 systemd/mdcheck_start.timer + +diff --git a/Makefile b/Makefile +index 2767ac6..afb62cc 100644 +--- a/Makefile ++++ b/Makefile +@@ -276,7 +276,10 @@ install-udev: udev-md-raid-arrays.rules udev-md-raid-assembly.rules udev-md-raid + + install-systemd: systemd/mdmon@.service + @for file in mdmon@.service mdmonitor.service mdadm-last-resort@.timer \ +- mdadm-last-resort@.service mdadm-grow-continue@.service; \ ++ mdadm-last-resort@.service mdadm-grow-continue@.service \ ++ mdcheck_start.timer mdcheck_start.service \ ++ mdcheck_continue.timer mdcheck_continue.service \ ++ ; \ + do sed -e 's,BINDIR,$(BINDIR),g' systemd/$$file > .install.tmp.2 && \ + $(ECHO) $(INSTALL) -D -m 644 systemd/$$file $(DESTDIR)$(SYSTEMD_DIR)/$$file ; \ + $(INSTALL) -D -m 644 .install.tmp.2 $(DESTDIR)$(SYSTEMD_DIR)/$$file ; \ +diff --git a/systemd/mdcheck_continue.service b/systemd/mdcheck_continue.service +new file mode 100644 +index 0000000..592c607 +--- /dev/null ++++ b/systemd/mdcheck_continue.service +@@ -0,0 +1,18 @@ ++# This file is part of mdadm. ++# ++# mdadm is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++ ++[Unit] ++Description=MD array scrubbing - continuation ++ConditionPathExistsGlob = /var/lib/mdcheck/MD_UUID_* ++ ++[Service] ++Type=oneshot ++Environment= MDADM_CHECK_DURATION='"6 hours"' ++EnvironmentFile=-/run/sysconfig/mdadm ++ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh ++ExecStart=/usr/share/mdadm/mdcheck --continue --duration $MDADM_CHECK_DURATION ++ +diff --git a/systemd/mdcheck_continue.timer b/systemd/mdcheck_continue.timer +new file mode 100644 +index 0000000..3ccfd78 +--- /dev/null ++++ b/systemd/mdcheck_continue.timer +@@ -0,0 +1,13 @@ ++# This file is part of mdadm. ++# ++# mdadm is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++ ++[Unit] ++Description=MD array scrubbing - continuation ++ ++[Timer] ++OnCalendar= 1:05:00 ++ +diff --git a/systemd/mdcheck_start.service b/systemd/mdcheck_start.service +new file mode 100644 +index 0000000..812141b +--- /dev/null ++++ b/systemd/mdcheck_start.service +@@ -0,0 +1,17 @@ ++# This file is part of mdadm. ++# ++# mdadm is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++ ++[Unit] ++Description=MD array scrubbing ++Wants=mdcheck_continue.timer ++ ++[Service] ++Type=oneshot ++Environment= MDADM_CHECK_DURATION='"6 hours"' ++EnvironmentFile=-/run/sysconfig/mdadm ++ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh ++ExecStart=/usr/share/mdadm/mdcheck --duration $MDADM_CHECK_DURATION +diff --git a/systemd/mdcheck_start.timer b/systemd/mdcheck_start.timer +new file mode 100644 +index 0000000..6480736 +--- /dev/null ++++ b/systemd/mdcheck_start.timer +@@ -0,0 +1,15 @@ ++# This file is part of mdadm. ++# ++# mdadm is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++ ++[Unit] ++Description=MD array scrubbing ++ ++[Timer] ++OnCalendar=Sun *-*-1..7 1:00:00 ++ ++[Install] ++WantedBy= mdmonitor.service +-- +2.7.5 + diff --git a/SOURCES/0005-Monitor-add-system-timer-to-run-oneshot-periodically.patch b/SOURCES/0005-Monitor-add-system-timer-to-run-oneshot-periodically.patch new file mode 100644 index 0000000..1c0f6d3 --- /dev/null +++ b/SOURCES/0005-Monitor-add-system-timer-to-run-oneshot-periodically.patch @@ -0,0 +1,83 @@ +From 7cd7e91ab3de5aa75dc963cb08b0618c1885cf0d Mon Sep 17 00:00:00 2001 +From: NeilBrown +Date: Wed, 5 Dec 2018 16:35:00 +1100 +Subject: [RHEL7.7 PATCH 05/21] Monitor: add system timer to run --oneshot + periodically + +"mdadm --monitor --oneshot" can be used to get a warning +if there are any degraded arrays. It can be helpful to get +this warning periodically while the condition persists. + +This patch add a systemd service and timer which can +be enabled with + systemctl enable mdmonitor-oneshot.service + +and will then provide daily warnings. + +Signed-off-by: NeilBrown +Signed-off-by: Jes Sorensen +--- + Makefile | 1 + + systemd/mdmonitor-oneshot.service | 15 +++++++++++++++ + systemd/mdmonitor-oneshot.timer | 15 +++++++++++++++ + 3 files changed, 31 insertions(+) + create mode 100644 systemd/mdmonitor-oneshot.service + create mode 100644 systemd/mdmonitor-oneshot.timer + +diff --git a/Makefile b/Makefile +index afb62cc..dfe00b0 100644 +--- a/Makefile ++++ b/Makefile +@@ -279,6 +279,7 @@ install-systemd: systemd/mdmon@.service + mdadm-last-resort@.service mdadm-grow-continue@.service \ + mdcheck_start.timer mdcheck_start.service \ + mdcheck_continue.timer mdcheck_continue.service \ ++ mdmonitor-oneshot.timer mdmonitor-oneshot.service \ + ; \ + do sed -e 's,BINDIR,$(BINDIR),g' systemd/$$file > .install.tmp.2 && \ + $(ECHO) $(INSTALL) -D -m 644 systemd/$$file $(DESTDIR)$(SYSTEMD_DIR)/$$file ; \ +diff --git a/systemd/mdmonitor-oneshot.service b/systemd/mdmonitor-oneshot.service +new file mode 100644 +index 0000000..fd469b1 +--- /dev/null ++++ b/systemd/mdmonitor-oneshot.service +@@ -0,0 +1,15 @@ ++# This file is part of mdadm. ++# ++# mdadm is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++ ++[Unit] ++Description=Reminder for degraded MD arrays ++ ++[Service] ++Environment= MDADM_MONITOR_ARGS=--scan ++EnvironmentFile=-/run/sysconfig/mdadm ++ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh ++ExecStart=BINDIR/mdadm --monitor --oneshot $MDADM_MONITOR_ARGS +diff --git a/systemd/mdmonitor-oneshot.timer b/systemd/mdmonitor-oneshot.timer +new file mode 100644 +index 0000000..cb54bda +--- /dev/null ++++ b/systemd/mdmonitor-oneshot.timer +@@ -0,0 +1,15 @@ ++# This file is part of mdadm. ++# ++# mdadm is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++ ++[Unit] ++Description=Reminder for degraded MD arrays ++ ++[Timer] ++OnCalendar= 2:00:00 ++ ++[Install] ++WantedBy= mdmonitor.service +-- +2.7.5 + diff --git a/SOURCES/0005-imsm-add-functions-to-get-and-set-imsm-dev-size.patch b/SOURCES/0005-imsm-add-functions-to-get-and-set-imsm-dev-size.patch deleted file mode 100644 index d3b66aa..0000000 --- a/SOURCES/0005-imsm-add-functions-to-get-and-set-imsm-dev-size.patch +++ /dev/null @@ -1,137 +0,0 @@ -From fcc2c9daede11fcc67e4032fd6fa8da198aaa319 Mon Sep 17 00:00:00 2001 -From: Mariusz Dabrowski -Date: Thu, 5 Apr 2018 13:38:36 +0200 -Subject: [RHEL7.5 PATCH 05/26] imsm: add functions to get and set imsm dev - size - -Signed-off-by: Mariusz Dabrowski -Signed-off-by: Jes Sorensen ---- - super-intel.c | 41 +++++++++++++++++++++-------------------- - 1 file changed, 21 insertions(+), 20 deletions(-) - -diff --git a/super-intel.c b/super-intel.c -index 52011e5..fe2a705 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -1201,6 +1201,13 @@ static unsigned long long num_data_stripes(struct imsm_map *map) - return join_u32(map->num_data_stripes_lo, map->num_data_stripes_hi); - } - -+static unsigned long long imsm_dev_size(struct imsm_dev *dev) -+{ -+ if (dev == NULL) -+ return 0; -+ return join_u32(dev->size_low, dev->size_high); -+} -+ - static void set_total_blocks(struct imsm_disk *disk, unsigned long long n) - { - split_ull(n, &disk->total_blocks_lo, &disk->total_blocks_hi); -@@ -1221,6 +1228,11 @@ static void set_num_data_stripes(struct imsm_map *map, unsigned long long n) - split_ull(n, &map->num_data_stripes_lo, &map->num_data_stripes_hi); - } - -+static void set_imsm_dev_size(struct imsm_dev *dev, unsigned long long n) -+{ -+ split_ull(n, &dev->size_low, &dev->size_high); -+} -+ - static struct extent *get_extents(struct intel_super *super, struct dl *dl) - { - /* find a list of used extents on the given physical device */ -@@ -1503,9 +1515,7 @@ static void print_imsm_dev(struct intel_super *super, - } else - printf(" This Slot : ?\n"); - printf(" Sector Size : %u\n", super->sector_size); -- sz = __le32_to_cpu(dev->size_high); -- sz <<= 32; -- sz += __le32_to_cpu(dev->size_low); -+ sz = imsm_dev_size(dev); - printf(" Array Size : %llu%s\n", - (unsigned long long)sz * 512 / super->sector_size, - human_size(sz * 512)); -@@ -1634,8 +1644,7 @@ void convert_to_4k(struct intel_super *super) - struct imsm_dev *dev = __get_imsm_dev(mpb, i); - struct imsm_map *map = get_imsm_map(dev, MAP_0); - /* dev */ -- split_ull((join_u32(dev->size_low, dev->size_high)/IMSM_4K_DIV), -- &dev->size_low, &dev->size_high); -+ set_imsm_dev_size(dev, imsm_dev_size(dev)/IMSM_4K_DIV); - dev->vol.curr_migr_unit /= IMSM_4K_DIV; - - /* map0 */ -@@ -1762,8 +1771,7 @@ void convert_from_4k(struct intel_super *super) - struct imsm_dev *dev = __get_imsm_dev(mpb, i); - struct imsm_map *map = get_imsm_map(dev, MAP_0); - /* dev */ -- split_ull((join_u32(dev->size_low, dev->size_high)*IMSM_4K_DIV), -- &dev->size_low, &dev->size_high); -+ set_imsm_dev_size(dev, imsm_dev_size(dev)*IMSM_4K_DIV); - dev->vol.curr_migr_unit *= IMSM_4K_DIV; - - /* map0 */ -@@ -3240,9 +3248,7 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info, - info->array.chunk_size = - __le16_to_cpu(map_to_analyse->blocks_per_strip) << 9; - info->array.state = !(dev->vol.dirty & RAIDVOL_DIRTY); -- 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); -+ info->custom_array_size = imsm_dev_size(dev); - info->recovery_blocked = imsm_reshape_blocks_arrays_changes(st->sb); - - if (is_gen_migration(dev)) { -@@ -5370,8 +5376,7 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info, - array_blocks = round_size_to_mb(array_blocks, data_disks); - size_per_member = array_blocks / data_disks; - -- dev->size_low = __cpu_to_le32((__u32) array_blocks); -- dev->size_high = __cpu_to_le32((__u32) (array_blocks >> 32)); -+ set_imsm_dev_size(dev, array_blocks); - dev->status = (DEV_READ_COALESCING | DEV_WRITE_COALESCING); - vol = &dev->vol; - vol->migr_state = 0; -@@ -7733,7 +7738,7 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra - level, /* RAID level */ - imsm_level_to_layout(level), - map->num_members, /* raid disks */ -- &chunk, join_u32(dev->size_low, dev->size_high), -+ &chunk, imsm_dev_size(dev), - 1 /* verbose */)) { - pr_err("IMSM RAID geometry validation failed. Array %s activation is blocked.\n", - dev->volume); -@@ -8143,9 +8148,7 @@ static unsigned long long imsm_set_array_size(struct imsm_dev *dev, - /* 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); -+ array_blocks = imsm_dev_size(dev); - - return array_blocks; - } -@@ -8165,8 +8168,7 @@ static unsigned long long imsm_set_array_size(struct imsm_dev *dev, - } - - array_blocks = round_size_to_mb(array_blocks, used_disks); -- dev->size_low = __cpu_to_le32((__u32)array_blocks); -- dev->size_high = __cpu_to_le32((__u32)(array_blocks >> 32)); -+ set_imsm_dev_size(dev, array_blocks); - - return array_blocks; - } -@@ -9139,8 +9141,7 @@ static int apply_reshape_migration_update(struct imsm_update_reshape_migration * - map->blocks_per_strip = - __cpu_to_le16(u->new_chunksize * 2); - num_data_stripes = -- (join_u32(dev->size_low, dev->size_high) -- / used_disks); -+ imsm_dev_size(dev) / used_disks; - num_data_stripes /= map->blocks_per_strip; - num_data_stripes /= map->num_domains; - set_num_data_stripes(map, num_data_stripes); --- -2.7.4 - diff --git a/SOURCES/0006-imsm-pass-already-existing-map-to-imsm_num_data_memb.patch b/SOURCES/0006-imsm-pass-already-existing-map-to-imsm_num_data_memb.patch deleted file mode 100644 index c75d5a8..0000000 --- a/SOURCES/0006-imsm-pass-already-existing-map-to-imsm_num_data_memb.patch +++ /dev/null @@ -1,179 +0,0 @@ -From 9529d3436771d9f38884861683dee3b40ab9d180 Mon Sep 17 00:00:00 2001 -From: Mariusz Dabrowski -Date: Thu, 5 Apr 2018 13:38:37 +0200 -Subject: [RHEL7.5 PATCH 06/26] imsm: pass already existing map to - imsm_num_data_members - -In almost every place where imsm_num_data_members is called there is -already existing map so it can be used it to avoid mistake when specifying -map for imsm_num_data_members. - -Signed-off-by: Mariusz Dabrowski -Signed-off-by: Jes Sorensen ---- - super-intel.c | 41 +++++++++++++++++++++-------------------- - 1 file changed, 21 insertions(+), 20 deletions(-) - -diff --git a/super-intel.c b/super-intel.c -index fe2a705..3fc3cf4 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -2767,13 +2767,11 @@ static __u32 num_stripes_per_unit_rebuild(struct imsm_dev *dev) - return num_stripes_per_unit_resync(dev); - } - --static __u8 imsm_num_data_members(struct imsm_dev *dev, int second_map) -+static __u8 imsm_num_data_members(struct imsm_map *map) - { - /* named 'imsm_' because raid0, raid1 and raid10 - * counter-intuitively have the same number of data disks - */ -- struct imsm_map *map = get_imsm_map(dev, second_map); -- - switch (get_imsm_raid_level(map)) { - case 0: - return map->num_members; -@@ -2862,7 +2860,7 @@ static __u64 blocks_per_migr_unit(struct intel_super *super, - */ - stripes_per_unit = num_stripes_per_unit_resync(dev); - migr_chunk = migr_strip_blocks_resync(dev); -- disks = imsm_num_data_members(dev, MAP_0); -+ disks = imsm_num_data_members(map); - blocks_per_unit = stripes_per_unit * migr_chunk * disks; - stripe = __le16_to_cpu(map->blocks_per_strip) * disks; - segment = blocks_per_unit / stripe; -@@ -3381,7 +3379,7 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info, - (unsigned long long)blocks_per_unit, - info->reshape_progress); - -- used_disks = imsm_num_data_members(dev, MAP_1); -+ used_disks = imsm_num_data_members(prev_map); - if (used_disks > 0) { - array_blocks = blocks_per_member(map) * - used_disks; -@@ -8140,9 +8138,9 @@ static void handle_missing(struct intel_super *super, struct imsm_dev *dev) - static unsigned long long imsm_set_array_size(struct imsm_dev *dev, - long long new_size) - { -- int used_disks = imsm_num_data_members(dev, MAP_0); - unsigned long long array_blocks; -- struct imsm_map *map; -+ struct imsm_map *map = get_imsm_map(dev, MAP_0); -+ int used_disks = imsm_num_data_members(map); - - if (used_disks == 0) { - /* when problems occures -@@ -8155,17 +8153,15 @@ static unsigned long long imsm_set_array_size(struct imsm_dev *dev, - - /* set array size in metadata - */ -- if (new_size <= 0) { -+ if (new_size <= 0) - /* OLCE size change is caused by added disks - */ -- map = get_imsm_map(dev, MAP_0); - array_blocks = blocks_per_member(map) * used_disks; -- } else { -+ else - /* Online Volume Size Change - * Using available free space - */ - array_blocks = new_size; -- } - - array_blocks = round_size_to_mb(array_blocks, used_disks); - set_imsm_dev_size(dev, array_blocks); -@@ -8274,7 +8270,7 @@ static int imsm_set_array_state(struct active_array *a, int consistent) - int used_disks; - struct mdinfo *mdi; - -- used_disks = imsm_num_data_members(dev, MAP_0); -+ used_disks = imsm_num_data_members(map); - if (used_disks > 0) { - array_blocks = - blocks_per_member(map) * -@@ -9132,8 +9128,10 @@ static int apply_reshape_migration_update(struct imsm_update_reshape_migration * - */ - if (u->new_chunksize > 0) { - unsigned long long num_data_stripes; -+ struct imsm_map *dest_map = -+ get_imsm_map(dev, MAP_0); - int used_disks = -- imsm_num_data_members(dev, MAP_0); -+ imsm_num_data_members(dest_map); - - if (used_disks == 0) - return ret_val; -@@ -9210,7 +9208,7 @@ static int apply_size_change_update(struct imsm_update_size_change *u, - if (id->index == (unsigned)u->subdev) { - struct imsm_dev *dev = get_imsm_dev(super, u->subdev); - struct imsm_map *map = get_imsm_map(dev, MAP_0); -- int used_disks = imsm_num_data_members(dev, MAP_0); -+ int used_disks = imsm_num_data_members(map); - unsigned long long blocks_per_member; - unsigned long long num_data_stripes; - -@@ -10589,7 +10587,7 @@ void init_migr_record_imsm(struct supertype *st, struct imsm_dev *dev, - max(map_dest->blocks_per_strip, map_src->blocks_per_strip); - migr_rec->dest_depth_per_unit *= - max(map_dest->blocks_per_strip, map_src->blocks_per_strip); -- new_data_disks = imsm_num_data_members(dev, MAP_0); -+ new_data_disks = imsm_num_data_members(map_dest); - migr_rec->blocks_per_unit = - __cpu_to_le32(migr_rec->dest_depth_per_unit * new_data_disks); - migr_rec->dest_depth_per_unit = -@@ -10657,7 +10655,7 @@ int save_backup_imsm(struct supertype *st, - int dest_layout = 0; - int dest_chunk; - unsigned long long start; -- int data_disks = imsm_num_data_members(dev, MAP_0); -+ int data_disks = imsm_num_data_members(map_dest); - - targets = xmalloc(new_disks * sizeof(int)); - -@@ -11279,6 +11277,7 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st, - int imsm_layout = -1; - int data_disks; - struct imsm_dev *dev; -+ struct imsm_map *map; - struct intel_super *super; - unsigned long long current_size; - unsigned long long free_size; -@@ -11369,7 +11368,8 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st, - - super = st->sb; - dev = get_imsm_dev(super, super->current_vol); -- data_disks = imsm_num_data_members(dev , MAP_0); -+ map = get_imsm_map(dev, MAP_0); -+ data_disks = imsm_num_data_members(map); - /* compute current size per disk member - */ - current_size = info.custom_array_size / data_disks; -@@ -11838,7 +11838,7 @@ static int imsm_manage_reshape( - struct intel_dev *dv; - unsigned int sector_size = super->sector_size; - struct imsm_dev *dev = NULL; -- struct imsm_map *map_src; -+ struct imsm_map *map_src, *map_dest; - int migr_vol_qan = 0; - int ndata, odata; /* [bytes] */ - int chunk; /* [bytes] */ -@@ -11876,12 +11876,13 @@ static int imsm_manage_reshape( - goto abort; - } - -+ map_dest = get_imsm_map(dev, MAP_0); - map_src = get_imsm_map(dev, MAP_1); - if (map_src == NULL) - goto abort; - -- ndata = imsm_num_data_members(dev, MAP_0); -- odata = imsm_num_data_members(dev, MAP_1); -+ ndata = imsm_num_data_members(map_dest); -+ odata = imsm_num_data_members(map_src); - - chunk = __le16_to_cpu(map_src->blocks_per_strip) * 512; - old_data_stripe_length = odata * chunk; --- -2.7.4 - diff --git a/SOURCES/0006-imsm-update-metadata-correctly-while-raid10-double-d.patch b/SOURCES/0006-imsm-update-metadata-correctly-while-raid10-double-d.patch new file mode 100644 index 0000000..d4fd840 --- /dev/null +++ b/SOURCES/0006-imsm-update-metadata-correctly-while-raid10-double-d.patch @@ -0,0 +1,83 @@ +From d7a1fda2769ba272d89de6caeab35d52b73a9c3c Mon Sep 17 00:00:00 2001 +From: Mariusz Tkaczyk +Date: Wed, 17 Oct 2018 12:11:41 +0200 +Subject: [RHEL7.7 PATCH 06/21] imsm: update metadata correctly while raid10 + double degradation + +Mdmon calls end_migration() when map state changes from normal to +degraded. It is not valid because in raid 10 double degradation case +mdmon breaks checkpointing but array is still rebuilding. +In this case mdmon has to mark map as degraded and continues marking +recovery checkpoint in metadata. Migration can be finished only if newly +failed device is a rebuilding device. + +Add catching double degraded to degraded transition. Migration is +finished but map state doesn't change, array is still degraded. + +Update failed_disk_num correctly. If double degradation +happens rebuild will start on the lowest slot, but this variable points +to the first failed slot. If second fail happens while rebuild this +variable shouldn't be updated until rebuild is not finished. + +Signed-off-by: Mariusz Tkaczyk +Signed-off-by: Jes Sorensen +--- + super-intel.c | 25 +++++++++++++++++++------ + 1 file changed, 19 insertions(+), 6 deletions(-) + +diff --git a/super-intel.c b/super-intel.c +index 6438987..d2035cc 100644 +--- a/super-intel.c ++++ b/super-intel.c +@@ -8136,7 +8136,8 @@ static int mark_failure(struct intel_super *super, + set_imsm_ord_tbl_ent(map2, slot2, + idx | IMSM_ORD_REBUILD); + } +- if (map->failed_disk_num == 0xff) ++ if (map->failed_disk_num == 0xff || ++ (!is_rebuilding(dev) && map->failed_disk_num > slot)) + map->failed_disk_num = slot; + + clear_disk_badblocks(super->bbm_log, ord_to_idx(ord)); +@@ -8558,13 +8559,25 @@ static void imsm_set_disk(struct active_array *a, int n, int state) + break; + } + if (is_rebuilding(dev)) { +- dprintf_cont("while rebuilding."); ++ dprintf_cont("while rebuilding "); + if (map->map_state != map_state) { +- dprintf_cont(" Map state change"); +- end_migration(dev, super, map_state); ++ dprintf_cont("map state change "); ++ if (n == map->failed_disk_num) { ++ dprintf_cont("end migration"); ++ end_migration(dev, super, map_state); ++ } else { ++ dprintf_cont("raid10 double degradation, map state change"); ++ map->map_state = map_state; ++ } + super->updates_pending++; +- } else if (!rebuild_done) { ++ } else if (!rebuild_done) + break; ++ else if (n == map->failed_disk_num) { ++ /* r10 double degraded to degraded transition */ ++ dprintf_cont("raid10 double degradation end migration"); ++ end_migration(dev, super, map_state); ++ a->last_checkpoint = 0; ++ super->updates_pending++; + } + + /* check if recovery is really finished */ +@@ -8575,7 +8588,7 @@ static void imsm_set_disk(struct active_array *a, int n, int state) + } + if (recovery_not_finished) { + dprintf_cont("\n"); +- dprintf("Rebuild has not finished yet, state not changed"); ++ dprintf_cont("Rebuild has not finished yet, map state changes only if raid10 double degradation happens"); + if (a->last_checkpoint < mdi->recovery_start) { + a->last_checkpoint = + mdi->recovery_start; +-- +2.7.5 + diff --git a/SOURCES/0007-Assemble-mask-FAILFAST-and-WRITEMOSTLY-flags-when-fi.patch b/SOURCES/0007-Assemble-mask-FAILFAST-and-WRITEMOSTLY-flags-when-fi.patch new file mode 100644 index 0000000..151bf02 --- /dev/null +++ b/SOURCES/0007-Assemble-mask-FAILFAST-and-WRITEMOSTLY-flags-when-fi.patch @@ -0,0 +1,43 @@ +From 563ac108659980b3d1e226fe416254a86656235f Mon Sep 17 00:00:00 2001 +From: Gioh Kim +Date: Tue, 6 Nov 2018 16:20:17 +0100 +Subject: [RHEL7.7 PATCH 07/21] Assemble: mask FAILFAST and WRITEMOSTLY flags + when finding the most recent device + +If devices[].i.disk.state has MD_DISK_FAILFAST or MD_DISK_WRITEMOSTLY +flag, it cannot be the most recent device. Both flags should be masked +before checking the state. + +Reviewed-by: NeilBrown +Signed-off-by: Gioh Kim +Signed-off-by: Jes Sorensen +--- + Assemble.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Assemble.c b/Assemble.c +index f39c9e1..9f75c68 100644 +--- a/Assemble.c ++++ b/Assemble.c +@@ -578,6 +578,7 @@ static int load_devices(struct devs *devices, char *devmap, + struct supertype *tst; + int i; + int dfd; ++ int disk_state; + + if (tmpdev->used != 1) + continue; +@@ -711,7 +712,9 @@ static int load_devices(struct devs *devices, char *devmap, + devices[devcnt].i.disk.major = major(stb.st_rdev); + devices[devcnt].i.disk.minor = minor(stb.st_rdev); + +- if (devices[devcnt].i.disk.state == 6) { ++ disk_state = devices[devcnt].i.disk.state & ~((1< devices[most_recent].i.events) { +-- +2.7.5 + diff --git a/SOURCES/0007-imsm-do-not-use-blocks_per_member-in-array-size-calc.patch b/SOURCES/0007-imsm-do-not-use-blocks_per_member-in-array-size-calc.patch deleted file mode 100644 index eb2740a..0000000 --- a/SOURCES/0007-imsm-do-not-use-blocks_per_member-in-array-size-calc.patch +++ /dev/null @@ -1,266 +0,0 @@ -From 444909385fdaccf961308c4319d7029b82bf8bb1 Mon Sep 17 00:00:00 2001 -From: Mariusz Dabrowski -Date: Thu, 5 Apr 2018 13:38:38 +0200 -Subject: [RHEL7.5 PATCH 07/26] imsm: do not use blocks_per_member in array - size calculations - -mdadm assumes that blocks_per_member value is equal to num_data_stripes * -blocks_per_stripe but it is not true. For IMSM arrays created in OROM -NUM_BLOCKS_DIRTY_STRIPE_REGION sectors are added up to this value. Because -of this mdadm shows invalid size of arrays created in OROM and to fix this -we need to use array size calculation based on num data stripes and blocks -per stripe. - -Signed-off-by: Mariusz Dabrowski -Signed-off-by: Jes Sorensen ---- - super-intel.c | 105 ++++++++++++++++++++++++++++++++++++++++++---------------- - 1 file changed, 76 insertions(+), 29 deletions(-) - -diff --git a/super-intel.c b/super-intel.c -index 3fc3cf4..c55c85f 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -1233,6 +1233,20 @@ static void set_imsm_dev_size(struct imsm_dev *dev, unsigned long long n) - split_ull(n, &dev->size_low, &dev->size_high); - } - -+static unsigned long long per_dev_array_size(struct imsm_map *map) -+{ -+ unsigned long long array_size = 0; -+ -+ if (map == NULL) -+ return array_size; -+ -+ array_size = num_data_stripes(map) * map->blocks_per_strip; -+ if (get_imsm_raid_level(map) == 1 || get_imsm_raid_level(map) == 10) -+ array_size *= 2; -+ -+ return array_size; -+} -+ - static struct extent *get_extents(struct intel_super *super, struct dl *dl) - { - /* find a list of used extents on the given physical device */ -@@ -1259,7 +1273,7 @@ static struct extent *get_extents(struct intel_super *super, struct dl *dl) - - if (get_imsm_disk_slot(map, dl->index) >= 0) { - e->start = pba_of_lba0(map); -- e->size = blocks_per_member(map); -+ e->size = per_dev_array_size(map); - e++; - } - } -@@ -2787,6 +2801,36 @@ static __u8 imsm_num_data_members(struct imsm_map *map) - } - } - -+static unsigned long long calc_component_size(struct imsm_map *map, -+ struct imsm_dev *dev) -+{ -+ unsigned long long component_size; -+ unsigned long long dev_size = imsm_dev_size(dev); -+ unsigned long long calc_dev_size = 0; -+ unsigned int member_disks = imsm_num_data_members(map); -+ -+ if (member_disks == 0) -+ return 0; -+ -+ component_size = per_dev_array_size(map); -+ calc_dev_size = component_size * member_disks; -+ -+ /* Component size is rounded to 1MB so difference between size from -+ * metadata and size calculated from num_data_stripes equals up to -+ * 2048 blocks per each device. If the difference is higher it means -+ * that array size was expanded and num_data_stripes was not updated. -+ */ -+ if ((unsigned int)abs(calc_dev_size - dev_size) > -+ (1 << SECT_PER_MB_SHIFT) * member_disks) { -+ component_size = dev_size / member_disks; -+ dprintf("Invalid num_data_stripes in metadata; expected=%llu, found=%llu\n", -+ component_size / map->blocks_per_strip, -+ num_data_stripes(map)); -+ } -+ -+ return component_size; -+} -+ - static __u32 parity_segment_depth(struct imsm_dev *dev) - { - struct imsm_map *map = get_imsm_map(dev, MAP_0); -@@ -3306,14 +3350,7 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info, - } - - info->data_offset = pba_of_lba0(map_to_analyse); -- -- if (info->array.level == 5) { -- info->component_size = num_data_stripes(map_to_analyse) * -- map_to_analyse->blocks_per_strip; -- } else { -- info->component_size = blocks_per_member(map_to_analyse); -- } -- -+ info->component_size = calc_component_size(map, dev); - info->component_size = imsm_component_size_aligment_check( - info->array.level, - info->array.chunk_size, -@@ -3381,7 +3418,7 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info, - - used_disks = imsm_num_data_members(prev_map); - if (used_disks > 0) { -- array_blocks = blocks_per_member(map) * -+ array_blocks = per_dev_array_size(map) * - used_disks; - info->custom_array_size = - round_size_to_mb(array_blocks, -@@ -5383,9 +5420,6 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info, - vol->curr_migr_unit = 0; - map = get_imsm_map(dev, MAP_0); - set_pba_of_lba0(map, super->create_offset); -- set_blocks_per_member(map, info_to_blocks_per_member(info, -- size_per_member / -- BLOCKS_PER_KB)); - map->blocks_per_strip = __cpu_to_le16(info_to_blocks_per_strip(info)); - map->failed_disk_num = ~0; - if (info->level > 0) -@@ -5417,6 +5451,11 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info, - num_data_stripes /= map->num_domains; - set_num_data_stripes(map, num_data_stripes); - -+ size_per_member += NUM_BLOCKS_DIRTY_STRIPE_REGION; -+ set_blocks_per_member(map, info_to_blocks_per_member(info, -+ size_per_member / -+ BLOCKS_PER_KB)); -+ - map->num_members = info->raid_disks; - for (i = 0; i < map->num_members; i++) { - /* initialized in add_to_super */ -@@ -7821,18 +7860,14 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra - - info_d->events = __le32_to_cpu(mpb->generation_num); - info_d->data_offset = pba_of_lba0(map); -+ info_d->component_size = calc_component_size(map, dev); - - if (map->raid_level == 5) { -- info_d->component_size = -- num_data_stripes(map) * -- map->blocks_per_strip; - info_d->ppl_sector = this->ppl_sector; - info_d->ppl_size = this->ppl_size; - if (this->consistency_policy == CONSISTENCY_POLICY_PPL && - recovery_start == 0) - this->resync_start = 0; -- } else { -- info_d->component_size = blocks_per_member(map); - } - - info_d->bb.supported = 1; -@@ -8156,7 +8191,7 @@ static unsigned long long imsm_set_array_size(struct imsm_dev *dev, - if (new_size <= 0) - /* OLCE size change is caused by added disks - */ -- array_blocks = blocks_per_member(map) * used_disks; -+ array_blocks = per_dev_array_size(map) * used_disks; - else - /* Online Volume Size Change - * Using available free space -@@ -8273,7 +8308,7 @@ static int imsm_set_array_state(struct active_array *a, int consistent) - used_disks = imsm_num_data_members(map); - if (used_disks > 0) { - array_blocks = -- blocks_per_member(map) * -+ per_dev_array_size(map) * - used_disks; - array_blocks = - round_size_to_mb(array_blocks, -@@ -8715,11 +8750,11 @@ static struct dl *imsm_add_spare(struct intel_super *super, int slot, - pos = 0; - array_start = pba_of_lba0(map); - array_end = array_start + -- blocks_per_member(map) - 1; -+ per_dev_array_size(map) - 1; - - do { - /* check that we can start at pba_of_lba0 with -- * blocks_per_member of space -+ * num_data_stripes*blocks_per_stripe of space - */ - if (array_start >= pos && array_end < ex[j].start) { - found = 1; -@@ -9145,6 +9180,12 @@ static int apply_reshape_migration_update(struct imsm_update_reshape_migration * - set_num_data_stripes(map, num_data_stripes); - } - -+ /* ensure blocks_per_member has valid value -+ */ -+ set_blocks_per_member(map, -+ per_dev_array_size(map) + -+ NUM_BLOCKS_DIRTY_STRIPE_REGION); -+ - /* add disk - */ - if (u->new_level != 5 || migr_map->raid_level != 0 || -@@ -9211,15 +9252,21 @@ static int apply_size_change_update(struct imsm_update_size_change *u, - int used_disks = imsm_num_data_members(map); - unsigned long long blocks_per_member; - unsigned long long num_data_stripes; -+ unsigned long long new_size_per_disk; -+ -+ if (used_disks == 0) -+ return 0; - - /* calculate new size - */ -- blocks_per_member = u->new_size / used_disks; -- num_data_stripes = blocks_per_member / -+ new_size_per_disk = u->new_size / used_disks; -+ blocks_per_member = new_size_per_disk + -+ NUM_BLOCKS_DIRTY_STRIPE_REGION; -+ num_data_stripes = new_size_per_disk / - map->blocks_per_strip; - num_data_stripes /= map->num_domains; - dprintf("(size: %llu, blocks per member: %llu, num_data_stipes: %llu)\n", -- u->new_size, blocks_per_member, -+ u->new_size, new_size_per_disk, - num_data_stripes); - set_blocks_per_member(map, blocks_per_member); - set_num_data_stripes(map, num_data_stripes); -@@ -9476,7 +9523,7 @@ static int apply_takeover_update(struct imsm_update_takeover *u, - unsigned long long num_data_stripes; - - map->num_domains = 1; -- num_data_stripes = blocks_per_member(map); -+ num_data_stripes = imsm_dev_size(dev) / 2; - num_data_stripes /= map->blocks_per_strip; - num_data_stripes /= map->num_domains; - set_num_data_stripes(map, num_data_stripes); -@@ -9692,7 +9739,7 @@ static void imsm_process_update(struct supertype *st, - - new_map = get_imsm_map(&u->dev, MAP_0); - new_start = pba_of_lba0(new_map); -- new_end = new_start + blocks_per_member(new_map); -+ new_end = new_start + per_dev_array_size(new_map); - inf = get_disk_info(u); - - /* handle activate_spare versus create race: -@@ -9703,7 +9750,7 @@ static void imsm_process_update(struct supertype *st, - dev = get_imsm_dev(super, i); - map = get_imsm_map(dev, MAP_0); - start = pba_of_lba0(map); -- end = start + blocks_per_member(map); -+ end = start + per_dev_array_size(map); - if ((new_start >= start && new_start <= end) || - (start >= new_start && start <= new_end)) - /* overlap */; -@@ -10492,7 +10539,7 @@ static struct md_bb *imsm_get_badblocks(struct active_array *a, int slot) - return NULL; - - get_volume_badblocks(super->bbm_log, ord_to_idx(ord), pba_of_lba0(map), -- blocks_per_member(map), &super->bb); -+ per_dev_array_size(map), &super->bb); - - return &super->bb; - } --- -2.7.4 - diff --git a/SOURCES/0008-Grow-avoid-overflow-in-compute_backup_blocks.patch b/SOURCES/0008-Grow-avoid-overflow-in-compute_backup_blocks.patch new file mode 100644 index 0000000..21e9cb4 --- /dev/null +++ b/SOURCES/0008-Grow-avoid-overflow-in-compute_backup_blocks.patch @@ -0,0 +1,34 @@ +From 085df42259cba7863cd6ebe5cd0d8492ac5b869e Mon Sep 17 00:00:00 2001 +From: NeilBrown +Date: Thu, 6 Dec 2018 10:35:41 +1100 +Subject: [RHEL7.7 PATCH 08/21] Grow: avoid overflow in compute_backup_blocks() + +With a chunk size of 16Meg and data drive count of 8, +this calculate can easily overflow the 'int' type that +is used for the multiplications. +So force it to use "long" instead. + +Reported-and-tested-by: Ed Spiridonov +Signed-off-by: NeilBrown +Signed-off-by: Jes Sorensen +--- + Grow.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Grow.c b/Grow.c +index 4436a4d..76f82c0 100644 +--- a/Grow.c ++++ b/Grow.c +@@ -1196,7 +1196,8 @@ unsigned long compute_backup_blocks(int nchunk, int ochunk, + /* Find GCD */ + a = GCD(a, b); + /* LCM == product / GCD */ +- blocks = (ochunk/512) * (nchunk/512) * odata * ndata / a; ++ blocks = (unsigned long)(ochunk/512) * (unsigned long)(nchunk/512) * ++ odata * ndata / a; + + return blocks; + } +-- +2.7.5 + diff --git a/SOURCES/0008-Prevent-create-IMSM-volume-with-size-smaller-than-1M.patch b/SOURCES/0008-Prevent-create-IMSM-volume-with-size-smaller-than-1M.patch deleted file mode 100644 index e2351c1..0000000 --- a/SOURCES/0008-Prevent-create-IMSM-volume-with-size-smaller-than-1M.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 54865c30d5b94920318950e29a4f6c1ce075cae8 Mon Sep 17 00:00:00 2001 -From: Roman Sobanski -Date: Wed, 25 Apr 2018 11:25:06 +0200 -Subject: [RHEL7.5 PATCH 08/26] Prevent create IMSM volume with size smaller - than 1M or chunk - -Block creation of the imsm volume when given size is smaller than 1M and -print appropriate message. - -Commit b53bfba6119d3f6f56eb9e10e5a59da6901af159 -(imsm: use rounded size for metadata initialization) introduces issue with -rounding volume sizes smaller than 1M to 0. There is an inconsistency when -size smaller than 1M was given depends of what we give as target device: -1) When block devices was given created volume has maximum available size. -2) When container symlink was given created volume has size 0. Additionally -it causes below call trace: - -[69587.891556] WARNING: CPU: 28 PID: 22485 at ../drivers/md/md.c:7582 md_seq_show+0x764/0x770 [md_mod] -[69588.066405] Call Trace: -[69588.066409] seq_read+0x336/0x430 -[69588.066411] proc_reg_read+0x40/0x70 -[69588.066412] __vfs_read+0x26/0x140 -[69588.066414] vfs_read+0x89/0x130 -[69588.066415] SyS_read+0x42/0x90 -[69588.066417] do_syscall_64+0x74/0x140 -[69588.066419] entry_SYSCALL_64_after_hwframe+0x3d/0xa2 - -Signed-off-by: Roman Sobanski -Signed-off-by: Jes Sorensen ---- - super-intel.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/super-intel.c b/super-intel.c -index c55c85f..520abf5 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -7358,6 +7358,16 @@ static int validate_geometry_imsm(struct supertype *st, int level, int layout, - verbose); - } - -+ if (size && ((size < 1024) || (*chunk != UnSet && -+ size < (unsigned long long) *chunk))) { -+ pr_err("Given size must be greater than 1M and chunk size.\n"); -+ /* Depends on algorithm in Create.c : -+ * if container was given (dev == NULL) return -1, -+ * if block device was given ( dev != NULL) return 0. -+ */ -+ return dev ? -1 : 0; -+ } -+ - if (!dev) { - if (st->sb) { - struct intel_super *super = st->sb; --- -2.7.4 - diff --git a/SOURCES/0009-Grow-report-correct-new-chunk-size.patch b/SOURCES/0009-Grow-report-correct-new-chunk-size.patch new file mode 100644 index 0000000..9d05ee7 --- /dev/null +++ b/SOURCES/0009-Grow-report-correct-new-chunk-size.patch @@ -0,0 +1,30 @@ +From 76d505dec6c9f92564553596fc8350324be82463 Mon Sep 17 00:00:00 2001 +From: NeilBrown +Date: Thu, 6 Dec 2018 10:36:28 +1100 +Subject: [RHEL7.7 PATCH 09/21] Grow: report correct new chunk size. + +When using "--grow --chunk=" to change chunk +size, the old chunksize is reported instead of the new. + +Signed-off-by: NeilBrown +Signed-off-by: Jes Sorensen +--- + Grow.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Grow.c b/Grow.c +index 76f82c0..363b209 100644 +--- a/Grow.c ++++ b/Grow.c +@@ -3286,7 +3286,7 @@ static int reshape_array(char *container, int fd, char *devname, + goto release; + } else if (verbose >= 0) + printf("chunk size for %s set to %d\n", +- devname, array.chunk_size); ++ devname, info->new_chunk); + } + unfreeze(st); + return 0; +-- +2.7.5 + diff --git a/SOURCES/0009-mdadm-grow-correct-size-and-chunk_size-casting.patch b/SOURCES/0009-mdadm-grow-correct-size-and-chunk_size-casting.patch deleted file mode 100644 index e09704d..0000000 --- a/SOURCES/0009-mdadm-grow-correct-size-and-chunk_size-casting.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5d518de84e7cd3382b4984cc1243ddb4102aa4f4 Mon Sep 17 00:00:00 2001 -From: Roman Sobanski -Date: Fri, 27 Apr 2018 12:12:21 +0200 -Subject: [RHEL7.5 PATCH 09/26] mdadm/grow: correct size and chunk_size casting - -With commit 4b74a905a67e -("mdadm/grow: Component size must be larger than chunk size") mdadm returns -incorrect message if size given to grow was greater than 2 147 483 647 K. -Cast chunk_size to "unsigned long long" instead of casting size to "int". - -Signed-off-by: Roman Sobanski -Signed-off-by: Jes Sorensen ---- - Grow.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Grow.c b/Grow.c -index 8722969..a4be7e7 100644 ---- a/Grow.c -+++ b/Grow.c -@@ -1821,7 +1821,7 @@ int Grow_reshape(char *devname, int fd, - } - - if (array.level > 1 && s->size > 1 && -- (array.chunk_size / 1024) > (int)s->size) { -+ (unsigned long long) (array.chunk_size / 1024) > s->size) { - pr_err("component size must be larger than chunk size.\n"); - return 1; - } --- -2.7.4 - diff --git a/SOURCES/0010-Fix-misspelling-of-alignment-and-geometry.patch b/SOURCES/0010-Fix-misspelling-of-alignment-and-geometry.patch deleted file mode 100644 index 060107d..0000000 --- a/SOURCES/0010-Fix-misspelling-of-alignment-and-geometry.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 3e684231ebe10c08e7cf23743d4516f707e605a2 Mon Sep 17 00:00:00 2001 -From: Michal Zylowski -Date: Tue, 29 May 2018 15:46:40 +0200 -Subject: [RHEL7.5 PATCH 10/26] Fix misspelling of 'alignment' and 'geometry' - -Set gemetry to geometry in error message about geometry validation failed. -Fix misspelled 'alignment' word in imsm_component_size_alignment_check -function. - -Signed-off-by: Michal Zylowski -Signed-off-by: Jes Sorensen ---- - super-intel.c | 30 +++++++++++++++--------------- - 1 file changed, 15 insertions(+), 15 deletions(-) - -diff --git a/super-intel.c b/super-intel.c -index 520abf5..ce08af4 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -3228,27 +3228,27 @@ int imsm_reshape_blocks_arrays_changes(struct intel_super *super) - } - return rv; - } --static unsigned long long imsm_component_size_aligment_check(int level, -+static unsigned long long imsm_component_size_alignment_check(int level, - int chunk_size, - unsigned int sector_size, - unsigned long long component_size) - { -- unsigned int component_size_alligment; -+ unsigned int component_size_alignment; - -- /* check component size aligment -+ /* check component size alignment - */ -- component_size_alligment = component_size % (chunk_size/sector_size); -+ component_size_alignment = component_size % (chunk_size/sector_size); - -- dprintf("(Level: %i, chunk_size = %i, component_size = %llu), component_size_alligment = %u\n", -+ dprintf("(Level: %i, chunk_size = %i, component_size = %llu), component_size_alignment = %u\n", - level, chunk_size, component_size, -- component_size_alligment); -+ component_size_alignment); - -- if (component_size_alligment && (level != 1) && (level != UnSet)) { -- dprintf("imsm: reported component size alligned from %llu ", -+ if (component_size_alignment && (level != 1) && (level != UnSet)) { -+ dprintf("imsm: reported component size aligned from %llu ", - component_size); -- component_size -= component_size_alligment; -+ component_size -= component_size_alignment; - dprintf_cont("to %llu (%i).\n", -- component_size, component_size_alligment); -+ component_size, component_size_alignment); - } - - return component_size; -@@ -3351,7 +3351,7 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info, - - info->data_offset = pba_of_lba0(map_to_analyse); - info->component_size = calc_component_size(map, dev); -- info->component_size = imsm_component_size_aligment_check( -+ info->component_size = imsm_component_size_alignment_check( - info->array.level, - info->array.chunk_size, - super->sector_size, -@@ -7089,7 +7089,7 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level, - mpb = super->anchor; - - if (!validate_geometry_imsm_orom(super, level, layout, raiddisks, chunk, size, verbose)) { -- pr_err("RAID gemetry validation failed. Cannot proceed with the action(s).\n"); -+ pr_err("RAID geometry validation failed. Cannot proceed with the action(s).\n"); - return 0; - } - if (!dev) { -@@ -11434,7 +11434,7 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st, - if (geo->size > 0 && geo->size != MAX_SIZE) { - /* align component size - */ -- geo->size = imsm_component_size_aligment_check( -+ geo->size = imsm_component_size_alignment_check( - get_imsm_raid_level(dev->vol.map), - chunk * 1024, super->sector_size, - geo->size * 2); -@@ -11468,7 +11468,7 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st, - max_size = free_size + current_size; - /* align component size - */ -- max_size = imsm_component_size_aligment_check( -+ max_size = imsm_component_size_alignment_check( - get_imsm_raid_level(dev->vol.map), - chunk * 1024, super->sector_size, - max_size); -@@ -11970,7 +11970,7 @@ static int imsm_manage_reshape( - 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 */ -+ /* add space for stripe alignment */ - buf_size += old_data_stripe_length; - if (posix_memalign((void **)&buf, MAX_SECTOR_SIZE, buf_size)) { - dprintf("imsm: Cannot allocate checkpoint buffer\n"); --- -2.7.4 - diff --git a/SOURCES/0010-policy.c-prevent-NULL-pointer-referencing.patch b/SOURCES/0010-policy.c-prevent-NULL-pointer-referencing.patch new file mode 100644 index 0000000..5e17bfd --- /dev/null +++ b/SOURCES/0010-policy.c-prevent-NULL-pointer-referencing.patch @@ -0,0 +1,31 @@ +From 467e6a1b4ece8e552ee638dab7f44a4d235ece1a Mon Sep 17 00:00:00 2001 +From: Gioh Kim +Date: Fri, 7 Dec 2018 12:04:44 +0100 +Subject: [RHEL7.7 PATCH 10/21] policy.c: prevent NULL pointer referencing + +paths could be NULL and paths[0] should be followed by NULL pointer +checking. + +Reviewed-by: NeilBrown +Signed-off-by: Gioh Kim +Signed-off-by: Jes Sorensen +--- + policy.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/policy.c b/policy.c +index fa67d55..e3a0671 100644 +--- a/policy.c ++++ b/policy.c +@@ -383,7 +383,7 @@ struct dev_policy *path_policy(char **paths, char *type) + /* Now add any metadata-specific internal knowledge + * about this path + */ +- for (i=0; paths[0] && superlist[i]; i++) ++ for (i=0; paths && paths[0] && superlist[i]; i++) + if (superlist[i]->get_disk_controller_domain) { + const char *d = + superlist[i]->get_disk_controller_domain( +-- +2.7.5 + diff --git a/SOURCES/0011-Do-not-confuse-gcc.patch b/SOURCES/0011-Do-not-confuse-gcc.patch deleted file mode 100644 index 0866f76..0000000 --- a/SOURCES/0011-Do-not-confuse-gcc.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 760365f94409ccccbcb54d55070f0f422bee44a1 Mon Sep 17 00:00:00 2001 -From: Jes Sorensen -Date: Tue, 29 May 2018 15:52:48 -0400 -Subject: [RHEL7.5 PATCH 11/26] Do not confuse gcc - -gcc-8.1's -Werror=stringop-truncation is easily confused. Rather than -disabling the check, make it explicit we are OK truncating here. - -Signed-off-by: Jes Sorensen ---- - super-intel.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/super-intel.c b/super-intel.c -index ce08af4..449da1d 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -5323,6 +5323,7 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info, - struct imsm_map *map; - int idx = mpb->num_raid_devs; - int i; -+ int namelen; - unsigned long long array_blocks; - size_t size_old, size_new; - unsigned long long num_data_stripes; -@@ -5402,7 +5403,12 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info, - return 0; - dv = xmalloc(sizeof(*dv)); - dev = xcalloc(1, sizeof(*dev) + sizeof(__u32) * (info->raid_disks - 1)); -- strncpy((char *) dev->volume, name, MAX_RAID_SERIAL_LEN); -+ /* -+ * Explicitly allow truncating to not confuse gcc's -+ * -Werror=stringop-truncation -+ */ -+ namelen = min((int) strlen(name), MAX_RAID_SERIAL_LEN); -+ memcpy(dev->volume, name, namelen); - array_blocks = calc_array_size(info->level, info->raid_disks, - info->layout, info->chunk_size, - s->size * BLOCKS_PER_KB); --- -2.7.4 - diff --git a/SOURCES/0011-policy.c-Fix-for-compiler-error.patch b/SOURCES/0011-policy.c-Fix-for-compiler-error.patch new file mode 100644 index 0000000..377f4b2 --- /dev/null +++ b/SOURCES/0011-policy.c-Fix-for-compiler-error.patch @@ -0,0 +1,36 @@ +From 757e55435997e355ee9b03e5d913b5496a3c39a8 Mon Sep 17 00:00:00 2001 +From: Mariusz Tkaczyk +Date: Tue, 11 Dec 2018 15:04:07 +0100 +Subject: [RHEL7.7 PATCH 11/21] policy.c: Fix for compiler error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +After cd72f9d(policy: support devices with multiple paths.) compilation +on old compilers fails because "‘p’ may be used uninitialized +in this function". + +Initialize it with NULL to prevent this. + +Signed-off-by: Mariusz Tkaczyk +Signed-off-by: Jes Sorensen +--- + policy.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/policy.c b/policy.c +index e3a0671..3c53bd3 100644 +--- a/policy.c ++++ b/policy.c +@@ -268,7 +268,7 @@ static int pol_match(struct rule *rule, char **paths, char *type, char **part) + + for (; rule; rule = rule->next) { + if (rule->name == rule_path) { +- char *p; ++ char *p = NULL; + int i; + if (pathok == 0) + pathok = -1; +-- +2.7.5 + diff --git a/SOURCES/0012-imsm-finish-recovery-when-drive-with-rebuild-fails.patch b/SOURCES/0012-imsm-finish-recovery-when-drive-with-rebuild-fails.patch new file mode 100644 index 0000000..aa770fa --- /dev/null +++ b/SOURCES/0012-imsm-finish-recovery-when-drive-with-rebuild-fails.patch @@ -0,0 +1,95 @@ +From a4e96fd8f3f0b5416783237c1cb6ee87e7eff23d Mon Sep 17 00:00:00 2001 +From: Mariusz Tkaczyk +Date: Fri, 8 Feb 2019 11:07:10 +0100 +Subject: [RHEL7.7 PATCH 12/21] imsm: finish recovery when drive with rebuild + fails + +Commit d7a1fda2769b ("imsm: update metadata correctly while raid10 double +degradation") resolves main Imsm double degradation problems but it +omits one case. Now metadata hangs in the rebuilding state if the drive +under rebuild is removed during recovery from double degradation. + +The root cause of this problem is comparing new map_state with current +and if they both are degraded assuming that nothing new happens. + +Don't rely on map states, just check if device is failed. If the drive +under rebuild fails then finish migration, in other cases update map +state only (second fail means that destination map state can't be normal). + +To avoid problems with reassembling move end_migration (called after +double degradation successful recovery) after check if recovery really +finished, for details see (7ce057018 "imsm: fix: rebuild does not +continue after reboot"). +Remove redundant code responsible for finishing rebuild process. Function +end_migration do exactly the same. Set last_checkpoint to 0, to prepare +it for the next rebuild. + +Signed-off-by: Mariusz Tkaczyk +Signed-off-by: Jes Sorensen +--- + super-intel.c | 26 +++++++++++--------------- + 1 file changed, 11 insertions(+), 15 deletions(-) + +diff --git a/super-intel.c b/super-intel.c +index d2035cc..38a1b6c 100644 +--- a/super-intel.c ++++ b/super-intel.c +@@ -8560,26 +8560,22 @@ static void imsm_set_disk(struct active_array *a, int n, int state) + } + if (is_rebuilding(dev)) { + dprintf_cont("while rebuilding "); +- if (map->map_state != map_state) { +- dprintf_cont("map state change "); ++ if (state & DS_FAULTY) { ++ dprintf_cont("removing failed drive "); + if (n == map->failed_disk_num) { + dprintf_cont("end migration"); + end_migration(dev, super, map_state); ++ a->last_checkpoint = 0; + } else { +- dprintf_cont("raid10 double degradation, map state change"); ++ dprintf_cont("fail detected during rebuild, changing map state"); + map->map_state = map_state; + } + super->updates_pending++; +- } else if (!rebuild_done) +- break; +- else if (n == map->failed_disk_num) { +- /* r10 double degraded to degraded transition */ +- dprintf_cont("raid10 double degradation end migration"); +- end_migration(dev, super, map_state); +- a->last_checkpoint = 0; +- super->updates_pending++; + } + ++ if (!rebuild_done) ++ break; ++ + /* check if recovery is really finished */ + for (mdi = a->info.devs; mdi ; mdi = mdi->next) + if (mdi->recovery_start != MaxSector) { +@@ -8588,7 +8584,7 @@ static void imsm_set_disk(struct active_array *a, int n, int state) + } + if (recovery_not_finished) { + dprintf_cont("\n"); +- dprintf_cont("Rebuild has not finished yet, map state changes only if raid10 double degradation happens"); ++ dprintf_cont("Rebuild has not finished yet"); + if (a->last_checkpoint < mdi->recovery_start) { + a->last_checkpoint = + mdi->recovery_start; +@@ -8598,9 +8594,9 @@ static void imsm_set_disk(struct active_array *a, int n, int state) + } + + dprintf_cont(" Rebuild done, still degraded"); +- dev->vol.migr_state = 0; +- set_migr_type(dev, 0); +- dev->vol.curr_migr_unit = 0; ++ end_migration(dev, super, map_state); ++ a->last_checkpoint = 0; ++ super->updates_pending++; + + for (i = 0; i < map->num_members; i++) { + int idx = get_imsm_ord_tbl_ent(dev, i, MAP_0); +-- +2.7.5 + diff --git a/SOURCES/0012-super-intel-Use-memcpy-to-avoid-confusing-gcc.patch b/SOURCES/0012-super-intel-Use-memcpy-to-avoid-confusing-gcc.patch deleted file mode 100644 index 5302b94..0000000 --- a/SOURCES/0012-super-intel-Use-memcpy-to-avoid-confusing-gcc.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 167d8bb8302170676f0e15123738e333383fec7b Mon Sep 17 00:00:00 2001 -From: Jes Sorensen -Date: Tue, 29 May 2018 16:09:47 -0400 -Subject: [RHEL7.5 PATCH 12/26] super-intel: Use memcpy() to avoid confusing - gcc - -When added :0 to serial number and copying it back, use memcpy() -instead of strncpy() as we know the actual length. This stops gcc -from complaining with -Werror=stringop-truncation enabled - -Signed-off-by: Jes Sorensen ---- - super-intel.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/super-intel.c b/super-intel.c -index 449da1d..ec7683d 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -8098,7 +8098,7 @@ static int mark_failure(struct intel_super *super, - strcat(buf, ":0"); - if ((len = strlen(buf)) >= MAX_RAID_SERIAL_LEN) - shift = len - MAX_RAID_SERIAL_LEN + 1; -- strncpy((char *)disk->serial, &buf[shift], MAX_RAID_SERIAL_LEN); -+ memcpy(disk->serial, &buf[shift], len + 1 - shift); - - disk->status |= FAILED_DISK; - set_imsm_ord_tbl_ent(map, slot, idx | IMSM_ORD_REBUILD); --- -2.7.4 - diff --git a/SOURCES/0013-imsm-fix-reshape-for-2TB-drives.patch b/SOURCES/0013-imsm-fix-reshape-for-2TB-drives.patch new file mode 100644 index 0000000..264ce72 --- /dev/null +++ b/SOURCES/0013-imsm-fix-reshape-for-2TB-drives.patch @@ -0,0 +1,322 @@ +From 9f4218274cd4a1e1f356a1617f9a1d09960cf255 Mon Sep 17 00:00:00 2001 +From: Pawel Baldysiak +Date: Mon, 28 Jan 2019 17:10:41 +0100 +Subject: [RHEL7.7 PATCH 13/21] imsm: fix reshape for >2TB drives + +If reshape is performed on drives larger then 2 TB, +migration checkpoint area that is calculated exeeds 32-bit value. +This checkpoint area is a reserved space threated as backup +during reshape - at the end of the drive, right before metadata. +As a result - wrong space is used and the data that may exists there +is overwritten. + +Adding additional field to migration record to track high order 32-bits +of pba of this area. Three other fields that may exceed 32-bit value +for large drives are added as well. + +Signed-off-by: Pawel Baldysiak +Signed-off-by: Jes Sorensen +--- + super-intel.c | 149 +++++++++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 107 insertions(+), 42 deletions(-) + +diff --git a/super-intel.c b/super-intel.c +index 38a1b6c..1cc7d5f 100644 +--- a/super-intel.c ++++ b/super-intel.c +@@ -296,7 +296,7 @@ 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 curr_migr_unit_lo; /* 0..numMigrUnits-1 */ + __u32 family_num; /* Family number of MPB + * containing the RaidDev + * that is migrating */ +@@ -306,16 +306,23 @@ struct migr_record { + __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 ckpt_area_pba_lo; /* Pba of first block of ckpt copy area */ ++ __u32 dest_1st_member_lba_lo; /* First member lba on first ++ * stripe of destination */ ++ __u32 num_migr_units_lo; /* 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) */ ++ __u32 curr_migr_unit_hi; /* 0..numMigrUnits-1 high order 32 bits */ ++ __u32 ckpt_area_pba_hi; /* Pba of first block of ckpt copy area ++ * high order 32 bits */ ++ __u32 dest_1st_member_lba_hi; /* First member lba on first stripe of ++ * destination - high order 32 bits */ ++ __u32 num_migr_units_hi; /* Total num migration units-of-op ++ * high order 32 bits */ + } __attribute__ ((__packed__)); + + struct md_list { +@@ -1208,6 +1215,38 @@ static unsigned long long imsm_dev_size(struct imsm_dev *dev) + return join_u32(dev->size_low, dev->size_high); + } + ++static unsigned long long migr_chkp_area_pba(struct migr_record *migr_rec) ++{ ++ if (migr_rec == NULL) ++ return 0; ++ return join_u32(migr_rec->ckpt_area_pba_lo, ++ migr_rec->ckpt_area_pba_hi); ++} ++ ++static unsigned long long current_migr_unit(struct migr_record *migr_rec) ++{ ++ if (migr_rec == NULL) ++ return 0; ++ return join_u32(migr_rec->curr_migr_unit_lo, ++ migr_rec->curr_migr_unit_hi); ++} ++ ++static unsigned long long migr_dest_1st_member_lba(struct migr_record *migr_rec) ++{ ++ if (migr_rec == NULL) ++ return 0; ++ return join_u32(migr_rec->dest_1st_member_lba_lo, ++ migr_rec->dest_1st_member_lba_hi); ++} ++ ++static unsigned long long get_num_migr_units(struct migr_record *migr_rec) ++{ ++ if (migr_rec == NULL) ++ return 0; ++ return join_u32(migr_rec->num_migr_units_lo, ++ migr_rec->num_migr_units_hi); ++} ++ + static void set_total_blocks(struct imsm_disk *disk, unsigned long long n) + { + split_ull(n, &disk->total_blocks_lo, &disk->total_blocks_hi); +@@ -1233,6 +1272,33 @@ static void set_imsm_dev_size(struct imsm_dev *dev, unsigned long long n) + split_ull(n, &dev->size_low, &dev->size_high); + } + ++static void set_migr_chkp_area_pba(struct migr_record *migr_rec, ++ unsigned long long n) ++{ ++ split_ull(n, &migr_rec->ckpt_area_pba_lo, &migr_rec->ckpt_area_pba_hi); ++} ++ ++static void set_current_migr_unit(struct migr_record *migr_rec, ++ unsigned long long n) ++{ ++ split_ull(n, &migr_rec->curr_migr_unit_lo, ++ &migr_rec->curr_migr_unit_hi); ++} ++ ++static void set_migr_dest_1st_member_lba(struct migr_record *migr_rec, ++ unsigned long long n) ++{ ++ split_ull(n, &migr_rec->dest_1st_member_lba_lo, ++ &migr_rec->dest_1st_member_lba_hi); ++} ++ ++static void set_num_migr_units(struct migr_record *migr_rec, ++ unsigned long long n) ++{ ++ split_ull(n, &migr_rec->num_migr_units_lo, ++ &migr_rec->num_migr_units_hi); ++} ++ + static unsigned long long per_dev_array_size(struct imsm_map *map) + { + unsigned long long array_size = 0; +@@ -1629,12 +1695,14 @@ void convert_to_4k_imsm_migr_rec(struct intel_super *super) + struct migr_record *migr_rec = super->migr_rec; + + migr_rec->blocks_per_unit /= IMSM_4K_DIV; +- migr_rec->ckpt_area_pba /= IMSM_4K_DIV; +- migr_rec->dest_1st_member_lba /= IMSM_4K_DIV; + migr_rec->dest_depth_per_unit /= IMSM_4K_DIV; + split_ull((join_u32(migr_rec->post_migr_vol_cap, + migr_rec->post_migr_vol_cap_hi) / IMSM_4K_DIV), + &migr_rec->post_migr_vol_cap, &migr_rec->post_migr_vol_cap_hi); ++ set_migr_chkp_area_pba(migr_rec, ++ migr_chkp_area_pba(migr_rec) / IMSM_4K_DIV); ++ set_migr_dest_1st_member_lba(migr_rec, ++ migr_dest_1st_member_lba(migr_rec) / IMSM_4K_DIV); + } + + void convert_to_4k_imsm_disk(struct imsm_disk *disk) +@@ -1727,8 +1795,8 @@ void examine_migr_rec_imsm(struct intel_super *super) + printf("Normal\n"); + else + printf("Contains Data\n"); +- printf(" Current Unit : %u\n", +- __le32_to_cpu(migr_rec->curr_migr_unit)); ++ printf(" Current Unit : %llu\n", ++ current_migr_unit(migr_rec)); + printf(" Family : %u\n", + __le32_to_cpu(migr_rec->family_num)); + printf(" Ascending : %u\n", +@@ -1737,16 +1805,15 @@ void examine_migr_rec_imsm(struct intel_super *super) + __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(" Checkpoint Area pba : %llu\n", ++ migr_chkp_area_pba(migr_rec)); ++ printf(" First member lba : %llu\n", ++ migr_dest_1st_member_lba(migr_rec)); ++ printf(" Total Number of Units : %llu\n", ++ get_num_migr_units(migr_rec)); ++ printf(" Size of volume : %llu\n", ++ join_u32(migr_rec->post_migr_vol_cap, ++ migr_rec->post_migr_vol_cap_hi)); + printf(" Record was read from : %u\n", + __le32_to_cpu(migr_rec->ckpt_read_disk_num)); + +@@ -1759,13 +1826,15 @@ void convert_from_4k_imsm_migr_rec(struct intel_super *super) + struct migr_record *migr_rec = super->migr_rec; + + migr_rec->blocks_per_unit *= IMSM_4K_DIV; +- migr_rec->ckpt_area_pba *= IMSM_4K_DIV; +- migr_rec->dest_1st_member_lba *= IMSM_4K_DIV; + migr_rec->dest_depth_per_unit *= IMSM_4K_DIV; + split_ull((join_u32(migr_rec->post_migr_vol_cap, + migr_rec->post_migr_vol_cap_hi) * IMSM_4K_DIV), + &migr_rec->post_migr_vol_cap, + &migr_rec->post_migr_vol_cap_hi); ++ set_migr_chkp_area_pba(migr_rec, ++ migr_chkp_area_pba(migr_rec) * IMSM_4K_DIV); ++ set_migr_dest_1st_member_lba(migr_rec, ++ migr_dest_1st_member_lba(migr_rec) * IMSM_4K_DIV); + } + + void convert_from_4k(struct intel_super *super) +@@ -3096,7 +3165,7 @@ static int imsm_create_metadata_checkpoint_update( + return 0; + } + (*u)->type = update_general_migration_checkpoint; +- (*u)->curr_migr_unit = __le32_to_cpu(super->migr_rec->curr_migr_unit); ++ (*u)->curr_migr_unit = current_migr_unit(super->migr_rec); + dprintf("prepared for %u\n", (*u)->curr_migr_unit); + + return update_memory_size; +@@ -3397,13 +3466,13 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info, + case MIGR_GEN_MIGR: { + __u64 blocks_per_unit = blocks_per_migr_unit(super, + dev); +- __u64 units = __le32_to_cpu(migr_rec->curr_migr_unit); ++ __u64 units = current_migr_unit(migr_rec); + unsigned long long array_blocks; + int used_disks; + + if (__le32_to_cpu(migr_rec->ascending_migr) && + (units < +- (__le32_to_cpu(migr_rec->num_migr_units)-1)) && ++ (get_num_migr_units(migr_rec)-1)) && + (super->migr_rec->rec_status == + __cpu_to_le32(UNIT_SRC_IN_CP_AREA))) + units++; +@@ -10697,7 +10766,7 @@ void init_migr_record_imsm(struct supertype *st, struct imsm_dev *dev, + + 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); ++ set_num_migr_units(migr_rec, num_migr_units); + + migr_rec->post_migr_vol_cap = dev->size_low; + migr_rec->post_migr_vol_cap_hi = dev->size_high; +@@ -10714,7 +10783,7 @@ void init_migr_record_imsm(struct supertype *st, struct imsm_dev *dev, + min_dev_sectors = dev_sectors; + close(fd); + } +- migr_rec->ckpt_area_pba = __cpu_to_le32(min_dev_sectors - ++ set_migr_chkp_area_pba(migr_rec, min_dev_sectors - + RAID_DISK_RESERVED_BLOCKS_IMSM_HI); + + write_imsm_migr_rec(st); +@@ -10765,8 +10834,7 @@ int save_backup_imsm(struct supertype *st, + + start = info->reshape_progress * 512; + for (i = 0; i < new_disks; i++) { +- target_offsets[i] = (unsigned long long) +- __le32_to_cpu(super->migr_rec->ckpt_area_pba) * 512; ++ target_offsets[i] = migr_chkp_area_pba(super->migr_rec) * 512; + /* move back copy area adderss, it will be moved forward + * in restore_stripes() using start input variable + */ +@@ -10845,12 +10913,11 @@ int save_checkpoint_imsm(struct supertype *st, struct mdinfo *info, int state) + if (info->reshape_progress % blocks_per_unit) + curr_migr_unit++; + +- super->migr_rec->curr_migr_unit = +- __cpu_to_le32(curr_migr_unit); ++ set_current_migr_unit(super->migr_rec, curr_migr_unit); + super->migr_rec->rec_status = __cpu_to_le32(state); +- super->migr_rec->dest_1st_member_lba = +- __cpu_to_le32(curr_migr_unit * +- __le32_to_cpu(super->migr_rec->dest_depth_per_unit)); ++ set_migr_dest_1st_member_lba(super->migr_rec, ++ super->migr_rec->dest_depth_per_unit * curr_migr_unit); ++ + if (write_imsm_migr_rec(st) < 0) { + dprintf("imsm: Cannot write migration record outside backup area\n"); + return 1; +@@ -10884,8 +10951,8 @@ int recover_backup_imsm(struct supertype *st, struct mdinfo *info) + char *buf = NULL; + int retval = 1; + unsigned int sector_size = super->sector_size; +- 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); ++ unsigned long curr_migr_unit = current_migr_unit(migr_rec); ++ unsigned long num_migr_units = get_num_migr_units(migr_rec); + char buffer[20]; + int skipped_disks = 0; + +@@ -10912,11 +10979,9 @@ int recover_backup_imsm(struct supertype *st, struct mdinfo *info) + map_dest = get_imsm_map(id->dev, MAP_0); + new_disks = map_dest->num_members; + +- read_offset = (unsigned long long) +- __le32_to_cpu(migr_rec->ckpt_area_pba) * 512; ++ read_offset = migr_chkp_area_pba(migr_rec) * 512; + +- write_offset = ((unsigned long long) +- __le32_to_cpu(migr_rec->dest_1st_member_lba) + ++ write_offset = (migr_dest_1st_member_lba(migr_rec) + + pba_of_lba0(map_dest)) * 512; + + unit_len = __le32_to_cpu(migr_rec->dest_depth_per_unit) * 512; +@@ -12019,12 +12084,12 @@ static int imsm_manage_reshape( + max_position = sra->component_size * ndata; + source_layout = imsm_level_to_layout(map_src->raid_level); + +- while (__le32_to_cpu(migr_rec->curr_migr_unit) < +- __le32_to_cpu(migr_rec->num_migr_units)) { ++ while (current_migr_unit(migr_rec) < ++ get_num_migr_units(migr_rec)) { + /* 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); ++ * current_migr_unit(migr_rec); + unsigned long long border; + + /* Check that array hasn't become failed. +-- +2.7.5 + diff --git a/SOURCES/0013-super-intel-Get-rid-of-unnused-string.patch b/SOURCES/0013-super-intel-Get-rid-of-unnused-string.patch deleted file mode 100644 index 918c87c..0000000 --- a/SOURCES/0013-super-intel-Get-rid-of-unnused-string.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1cdc06dfda62775647b81e2753fc7908e1bbffc2 Mon Sep 17 00:00:00 2001 -From: Jes Sorensen -Date: Tue, 29 May 2018 16:55:41 -0400 -Subject: [RHEL7.5 PATCH 13/26] super-intel: Get rid of unnused string - -No need to snprintf() into the string when we don't use it afterards - -Signed-off-by: Jes Sorensen ---- - super-intel.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/super-intel.c b/super-intel.c -index ec7683d..cc53f0f 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -1928,7 +1928,6 @@ static void examine_super_imsm(struct supertype *st, char *homehost) - strncpy(str, (char *)mpb->sig, MPB_SIG_LEN); - str[MPB_SIG_LEN-1] = '\0'; - printf(" Magic : %s\n", str); -- snprintf(str, strlen(MPB_VERSION_RAID0), "%s", get_imsm_version(mpb)); - printf(" Version : %s\n", get_imsm_version(mpb)); - printf(" Orig Family : %08x\n", __le32_to_cpu(mpb->orig_family_num)); - printf(" Family : %08x\n", __le32_to_cpu(mpb->family_num)); --- -2.7.4 - diff --git a/SOURCES/0014-Fix-spelling-typos.patch b/SOURCES/0014-Fix-spelling-typos.patch new file mode 100644 index 0000000..e9b8a17 --- /dev/null +++ b/SOURCES/0014-Fix-spelling-typos.patch @@ -0,0 +1,101 @@ +From ebf3be9931f31df54df52b1821479e6a80a4d9c6 Mon Sep 17 00:00:00 2001 +From: Dimitri John Ledkov +Date: Tue, 15 Jan 2019 19:08:37 +0000 +Subject: [RHEL7.7 PATCH 14/21] Fix spelling typos. + +Signed-off-by: Dimitri John Ledkov +Signed-off-by: Jes Sorensen +--- + Assemble.c | 2 +- + Create.c | 2 +- + Grow.c | 6 +++--- + super-ddf.c | 2 +- + super-intel.c | 2 +- + 5 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Assemble.c b/Assemble.c +index 9f75c68..9f050c1 100644 +--- a/Assemble.c ++++ b/Assemble.c +@@ -879,7 +879,7 @@ static int force_array(struct mdinfo *content, + current_events = devices[chosen_drive].i.events; + add_another: + if (c->verbose >= 0) +- pr_err("forcing event count in %s(%d) from %d upto %d\n", ++ pr_err("forcing event count in %s(%d) from %d up to %d\n", + devices[chosen_drive].devname, + devices[chosen_drive].i.disk.raid_disk, + (int)(devices[chosen_drive].i.events), +diff --git a/Create.c b/Create.c +index 04b1dfc..6f1b228 100644 +--- a/Create.c ++++ b/Create.c +@@ -823,7 +823,7 @@ int Create(struct supertype *st, char *mddev, + } + bitmap_fd = open(s->bitmap_file, O_RDWR); + if (bitmap_fd < 0) { +- pr_err("weird: %s cannot be openned\n", ++ pr_err("weird: %s cannot be opened\n", + s->bitmap_file); + goto abort_locked; + } +diff --git a/Grow.c b/Grow.c +index 363b209..6d32661 100644 +--- a/Grow.c ++++ b/Grow.c +@@ -446,7 +446,7 @@ int Grow_addbitmap(char *devname, int fd, struct context *c, struct shape *s) + if (offset_setable) { + st->ss->getinfo_super(st, mdi, NULL); + if (sysfs_init(mdi, fd, NULL)) { +- pr_err("failed to intialize sysfs.\n"); ++ pr_err("failed to initialize sysfs.\n"); + free(mdi); + } + rv = sysfs_set_num_signed(mdi, NULL, "bitmap/location", +@@ -2178,7 +2178,7 @@ size_change_error: + memset(&info, 0, sizeof(info)); + info.array = array; + if (sysfs_init(&info, fd, NULL)) { +- pr_err("failed to intialize sysfs.\n"); ++ pr_err("failed to initialize sysfs.\n"); + rv = 1; + goto release; + } +@@ -2903,7 +2903,7 @@ static int impose_level(int fd, int level, char *devname, int verbose) + struct mdinfo info; + + if (sysfs_init(&info, fd, NULL)) { +- pr_err("failed to intialize sysfs.\n"); ++ pr_err("failed to initialize sysfs.\n"); + return 1; + } + +diff --git a/super-ddf.c b/super-ddf.c +index 618542c..c095e8a 100644 +--- a/super-ddf.c ++++ b/super-ddf.c +@@ -1900,7 +1900,7 @@ static struct vd_config *find_vdcr(struct ddf_super *ddf, unsigned int inst, + return conf; + } + bad: +- pr_err("Could't find disk %d in array %u\n", n, inst); ++ pr_err("Couldn't find disk %d in array %u\n", n, inst); + return NULL; + } + +diff --git a/super-intel.c b/super-intel.c +index 1cc7d5f..c399433 100644 +--- a/super-intel.c ++++ b/super-intel.c +@@ -10034,7 +10034,7 @@ static void imsm_process_update(struct supertype *st, + break; + } + default: +- pr_err("error: unsuported process update type:(type: %d)\n", type); ++ pr_err("error: unsupported process update type:(type: %d)\n", type); + } + } + +-- +2.7.5 + diff --git a/SOURCES/0014-super-intel-Avoid-gcc-8.1-complaining-about-truncati.patch b/SOURCES/0014-super-intel-Avoid-gcc-8.1-complaining-about-truncati.patch deleted file mode 100644 index 0bcdcd9..0000000 --- a/SOURCES/0014-super-intel-Avoid-gcc-8.1-complaining-about-truncati.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 40659392ff90fc9c2861ec18c34ed1bdb54f92ca Mon Sep 17 00:00:00 2001 -From: Jes Sorensen -Date: Wed, 30 May 2018 11:56:37 -0400 -Subject: [RHEL7.5 PATCH 14/26] super-intel: Avoid gcc-8.1 complaining about - truncating snprintf() - -We know the max size of the volume name, so no need to play the -snprintf() game. - -Signed-off-by: Jes Sorensen ---- - super-intel.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/super-intel.c b/super-intel.c -index cc53f0f..520d292 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -9881,6 +9881,7 @@ static void imsm_process_update(struct supertype *st, - /* sanity check that we are not affecting the uuid of - * an active array - */ -+ memset(name, 0, sizeof(name)); - snprintf(name, MAX_RAID_SERIAL_LEN, "%s", (char *) u->name); - name[MAX_RAID_SERIAL_LEN] = '\0'; - for (a = st->arrays; a; a = a->next) -@@ -9892,7 +9893,7 @@ static void imsm_process_update(struct supertype *st, - break; - } - -- snprintf((char *) dev->volume, MAX_RAID_SERIAL_LEN, "%s", name); -+ memcpy(dev->volume, name, MAX_RAID_SERIAL_LEN); - super->updates_pending++; - break; - } --- -2.7.4 - diff --git a/SOURCES/0015-Detail.c-do-not-skip-first-character-when-calling-xs.patch b/SOURCES/0015-Detail.c-do-not-skip-first-character-when-calling-xs.patch new file mode 100644 index 0000000..23b6e60 --- /dev/null +++ b/SOURCES/0015-Detail.c-do-not-skip-first-character-when-calling-xs.patch @@ -0,0 +1,46 @@ +From e3615ecb5b6ad8eb408296878aad5628e0e27166 Mon Sep 17 00:00:00 2001 +From: Coly Li +Date: Tue, 12 Feb 2019 12:53:18 +0800 +Subject: [RHEL7.7 PATCH 15/21] Detail.c: do not skip first character when + calling xstrdup in Detail() + +'Commit b9c9bd9bacaa ("Detail: ensure --export names are acceptable as +shell variables")' duplicates mdi->sys_name to sysdev string by, + char *sysdev = xstrdup(mdi->sys_name + 1); +which skips the first character of mdi->sys_name. Then when running +mdadm --detail --export, the output looks like, + MD_DEVICE_ev_sda2_ROLE=1 + MD_DEVICE_ev_sda2_DEV=/dev/sda2 +The first character of md device (between MD_DEVICE and _ROLE/_DEV) +is dropped. The expected output should be, + MD_DEVICE_dev_sda2_ROLE=1 + MD_DEVICE_dev_sda2_DEV=/dev/sda2 + +This patch removes the '+ 1' from calling xstrdup() in Detail(), which +gets the dropped first character back. + +Reported-by: Arvin Schnell +Fixes: b9c9bd9bacaa ("Detail: ensure --export names are acceptable as 4 shell variables") +Signed-off-by: Coly Li +Cc: NeilBrown +Signed-off-by: Jes Sorensen +--- + Detail.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Detail.c b/Detail.c +index b3e857a..20ea03a 100644 +--- a/Detail.c ++++ b/Detail.c +@@ -284,7 +284,7 @@ int Detail(char *dev, struct context *c) + struct mdinfo *mdi; + for (mdi = sra->devs; mdi; mdi = mdi->next) { + char *path; +- char *sysdev = xstrdup(mdi->sys_name + 1); ++ char *sysdev = xstrdup(mdi->sys_name); + char *cp; + + path = map_dev(mdi->disk.major, +-- +2.7.5 + diff --git a/SOURCES/0015-super-intel-Do-not-truncate-last-character-of-volume.patch b/SOURCES/0015-super-intel-Do-not-truncate-last-character-of-volume.patch deleted file mode 100644 index 296f400..0000000 --- a/SOURCES/0015-super-intel-Do-not-truncate-last-character-of-volume.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ebad3af29b401dec7203e8fa5a77bcf16532f49c Mon Sep 17 00:00:00 2001 -From: Jes Sorensen -Date: Wed, 30 May 2018 12:10:13 -0400 -Subject: [RHEL7.5 PATCH 15/26] super-intel: Do not truncate last character of - volume name - -Clear up strncpy abuse to avoid gcc-8.1 complaining about truncating -the string. - -Signed-off-by: Jes Sorensen ---- - super-intel.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/super-intel.c b/super-intel.c -index 520d292..aa93a9e 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -7587,11 +7587,12 @@ static int update_subarray_imsm(struct supertype *st, char *subarray, - append_metadata_update(st, u, sizeof(*u)); - } else { - struct imsm_dev *dev; -- int i; -+ int i, namelen; - - dev = get_imsm_dev(super, vol); -- strncpy((char *) dev->volume, name, MAX_RAID_SERIAL_LEN); -- dev->volume[MAX_RAID_SERIAL_LEN-1] = '\0'; -+ memset(dev->volume, '\0', MAX_RAID_SERIAL_LEN); -+ namelen = min((int)strlen(name), MAX_RAID_SERIAL_LEN); -+ memcpy(dev->volume, name, namelen); - for (i = 0; i < mpb->num_raid_devs; i++) { - dev = get_imsm_dev(super, i); - handle_missing(super, dev); --- -2.7.4 - diff --git a/SOURCES/0016-Fix-reshape-for-decreasing-data-offset.patch b/SOURCES/0016-Fix-reshape-for-decreasing-data-offset.patch new file mode 100644 index 0000000..b6c064d --- /dev/null +++ b/SOURCES/0016-Fix-reshape-for-decreasing-data-offset.patch @@ -0,0 +1,70 @@ +From cab114c5ca870e5f1b57fb2602cd9a038271c2e0 Mon Sep 17 00:00:00 2001 +From: Corey Hickey +Date: Mon, 11 Feb 2019 17:18:38 -0800 +Subject: [RHEL7.7 PATCH 16/21] Fix reshape for decreasing data offset + +...when not changing the number of disks. + +This patch needs context to explain. These are the relevant parts of +the original code (condensed and annotated): + +if (dir > 0) { + /* Increase data offset (reshape backwards) */ + if (data_offset < sd->data_offset + min) { + pr_err("--data-offset too small on %s\n", + dn); + goto release; + } +} else { + /* Decrease data offset (reshape forwards) */ + if (data_offset < sd->data_offset - min) { + pr_err("--data-offset too small on %s\n", + dn); + goto release; + } +} + +When this code is reached, mdadm has already decided on a reshape +direction. When increasing the data offset, the reshape runs backwards +(dir==1); when decreasing the data offset, the reshape runs forwards +(dir==-1). + +The conditional within the backwards reshape is correct: the requested +offset must be larger than the old offset plus a minimum delta; thus the +reshape has room to work. + +For the forwards reshape, the requested offset needs to be smaller than +the old offset minus a minimum delta; to do this correctly, the +comparison must be reversed. + +Also update the error message. + +Note: I have tested this change on a RAID 5 on Linux 4.18.0 and verified +that there were no errors from the kernel and that the device data +remained intact. I do not know if there are considerations for different +RAID levels. + +Signed-off-by: Corey Hickey +Signed-off-by: Jes Sorensen +--- + Grow.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Grow.c b/Grow.c +index 6d32661..764374f 100644 +--- a/Grow.c ++++ b/Grow.c +@@ -2613,8 +2613,8 @@ static int set_new_data_offset(struct mdinfo *sra, struct supertype *st, + goto release; + } + if (data_offset != INVALID_SECTORS && +- data_offset < sd->data_offset - min) { +- pr_err("--data-offset too small on %s\n", ++ data_offset > sd->data_offset - min) { ++ pr_err("--data-offset too large on %s\n", + dn); + goto release; + } +-- +2.7.5 + diff --git a/SOURCES/0016-imsm-Do-not-block-volume-creation-when-container-has.patch b/SOURCES/0016-imsm-Do-not-block-volume-creation-when-container-has.patch deleted file mode 100644 index 663bfd3..0000000 --- a/SOURCES/0016-imsm-Do-not-block-volume-creation-when-container-has.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 59632db96bdd09b44e9927f63a67cccbe8b15cdf Mon Sep 17 00:00:00 2001 -From: Michal Zylowski -Date: Tue, 29 May 2018 15:47:09 +0200 -Subject: [RHEL7.5 PATCH 16/26] imsm: Do not block volume creation when - container has disks with mixed sector size - -Currently when created container keeps disks with mixed sector size (few -4K disks and some 512 disks) there is no possibility to create volume from -disks with one sector size. -Allow volume creation when given disks are related with mixed container. - -Signed-off-by: Michal Zylowski -Signed-off-by: Jes Sorensen ---- - super-intel.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/super-intel.c b/super-intel.c -index aa93a9e..12f60f6 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -5616,6 +5616,11 @@ static int add_to_super_imsm_volume(struct supertype *st, mdu_disk_info_t *dk, - return 1; - } - -+ if (mpb->num_disks == 0) -+ if (!get_dev_sector_size(dl->fd, dl->devname, -+ &super->sector_size)) -+ return 1; -+ - if (!drive_validate_sector_size(super, dl)) { - pr_err("Combining drives of different sector size in one volume is not allowed\n"); - return 1; --- -2.7.4 - diff --git a/SOURCES/0017-imsm-Do-not-require-MDADM_EXPERIMENTAL-flag-anymore.patch b/SOURCES/0017-imsm-Do-not-require-MDADM_EXPERIMENTAL-flag-anymore.patch deleted file mode 100644 index c13522e..0000000 --- a/SOURCES/0017-imsm-Do-not-require-MDADM_EXPERIMENTAL-flag-anymore.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 5a5b3a6725ded07697f03ddd05ee537ce289e951 Mon Sep 17 00:00:00 2001 -From: Michal Zylowski -Date: Tue, 29 May 2018 15:47:25 +0200 -Subject: [RHEL7.5 PATCH 17/26] imsm: Do not require MDADM_EXPERIMENTAL flag - anymore - -Grow feature for IMSM metadata is currently fully supported and tested. -Reshape operation is not in experimental state anymore, so usage of this -flag is unnecessary. - -Do not require MDADM_EXPERIMENTAL flag and remove obsolete information -from manual. - -Signed-off-by: Michal Zylowski -Acked-by: Mariusz Dabrowski -Acked-by: Roman Sobanski -Signed-off-by: Jes Sorensen ---- - mdadm.8.in | 24 ++++++------------------ - mdadm.h | 1 - - super-intel.c | 3 --- - tests/env-imsm-template | 1 - - util.c | 10 ---------- - 5 files changed, 6 insertions(+), 33 deletions(-) - -diff --git a/mdadm.8.in b/mdadm.8.in -index ea45bbc..d6bb3fa 100644 ---- a/mdadm.8.in -+++ b/mdadm.8.in -@@ -2718,27 +2718,15 @@ above. Resizing arrays in an IMSM container with - .B "--grow --size" - is not yet supported. - --Grow functionality (e.g. expand a number of raid devices) for Intel's --IMSM container format has an experimental status. It is guarded by the --.B MDADM_EXPERIMENTAL --environment variable which must be set to '1' for a GROW command to --succeed. --This is for the following reasons: -- --.IP 1. --Intel's native IMSM check-pointing is not fully tested yet. --This can causes IMSM incompatibility during the grow process: an array --which is growing cannot roam between Microsoft Windows(R) and Linux --systems. -- --.IP 2. --Interrupting a grow operation is not recommended, because it --has not been fully tested for Intel's IMSM container format yet. -- - .PP --Note: Intel's native checkpointing doesn't use -+Notes: -+.IP \(bu 4 -+Intel's native checkpointing doesn't use - .B --backup-file - option and it is transparent for assembly feature. -+.IP \(bu 4 -+Roaming between Windows(R) and Linux systems for IMSM metadata is not -+supported during grow process. - - .SS SIZE CHANGES - Normally when an array is built the "size" is taken from the smallest -diff --git a/mdadm.h b/mdadm.h -index 61bc7af..387e681 100644 ---- a/mdadm.h -+++ b/mdadm.h -@@ -1485,7 +1485,6 @@ extern struct mddev_ident *conf_match(struct supertype *st, - struct mdinfo *info, - char *devname, - int verbose, int *rvp); --extern int experimental(void); - - extern void free_line(char *line); - extern int match_oneof(char *devices, char *devname); -diff --git a/super-intel.c b/super-intel.c -index 12f60f6..a01be13 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -11607,9 +11607,6 @@ static int imsm_reshape_super(struct supertype *st, unsigned long long size, - dprintf("for level : %i\n", geo.level); - dprintf("for raid_disks : %i\n", geo.raid_disks); - -- if (experimental() == 0) -- return ret_val; -- - if (strcmp(st->container_devnm, st->devnm) == 0) { - /* On container level we can only increase number of devices. */ - dprintf("imsm: info: Container operation\n"); -diff --git a/tests/env-imsm-template b/tests/env-imsm-template -index bc5f585..ea45bae 100644 ---- a/tests/env-imsm-template -+++ b/tests/env-imsm-template -@@ -65,7 +65,6 @@ imsm_check() { - export IMSM_NO_PLATFORM=1 - export IMSM_DEVNAME_AS_SERIAL=1 - export IMSM_TEST_OROM=1 --export MDADM_EXPERIMENTAL=1 - container=/dev/md/container - member0=/dev/md/vol0 - member1=/dev/md/vol1 -diff --git a/util.c b/util.c -index 4adbbff..c26cf5f 100644 ---- a/util.c -+++ b/util.c -@@ -2149,16 +2149,6 @@ void append_metadata_update(struct supertype *st, void *buf, int len) - unsigned int __invalid_size_argument_for_IOC = 0; - #endif - --int experimental(void) --{ -- if (check_env("MDADM_EXPERIMENTAL")) -- return 1; -- else { -- pr_err("To use this feature MDADM_EXPERIMENTAL environment variable has to be defined.\n"); -- return 0; -- } --} -- - /* Pick all spares matching given criteria from a container - * if min_size == 0 do not check size - * if domlist == NULL do not check domains --- -2.7.4 - diff --git a/SOURCES/0017-mdadm-tests-add-one-test-case-for-failfast-of-raid1.patch b/SOURCES/0017-mdadm-tests-add-one-test-case-for-failfast-of-raid1.patch new file mode 100644 index 0000000..ffdc433 --- /dev/null +++ b/SOURCES/0017-mdadm-tests-add-one-test-case-for-failfast-of-raid1.patch @@ -0,0 +1,100 @@ +From 76b906d2406cdf136f64de77e881eb2d180108d9 Mon Sep 17 00:00:00 2001 +From: Gioh Kim +Date: Fri, 7 Dec 2018 14:30:09 +0100 +Subject: [RHEL7.7 PATCH 17/21] mdadm/tests: add one test case for failfast of + raid1 + +This creates raid1 device with the failfast option and check all +slaves have the failfast flag. And it does assembling and growing +the raid1 device and check the failfast works fine. + +Signed-off-by: Gioh Kim +Signed-off-by: Jes Sorensen +--- + tests/05r1-failfast | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 74 insertions(+) + create mode 100644 tests/05r1-failfast + +diff --git a/tests/05r1-failfast b/tests/05r1-failfast +new file mode 100644 +index 0000000..823dd6f +--- /dev/null ++++ b/tests/05r1-failfast +@@ -0,0 +1,74 @@ ++ ++# create a simple mirror and check failfast flag works ++mdadm -CR $md0 -e1.2 --level=raid1 --failfast -n2 $dev0 $dev1 ++check raid1 ++if grep -v failfast /sys/block/md0/md/rd*/state > /dev/null ++then ++ die "failfast missing" ++fi ++ ++# Removing works with the failfast flag ++mdadm $md0 -f $dev0 ++mdadm $md0 -r $dev0 ++if grep -v failfast /sys/block/md0/md/rd1/state > /dev/null ++then ++ die "failfast missing" ++fi ++ ++# Adding works with the failfast flag ++mdadm $md0 -a --failfast $dev0 ++check wait ++if grep -v failfast /sys/block/md0/md/rd0/state > /dev/null ++then ++ die "failfast missing" ++fi ++ ++mdadm -S $md0 ++ ++# Assembling works with the failfast flag ++mdadm -A $md0 $dev0 $dev1 ++check raid1 ++if grep -v failfast /sys/block/md0/md/rd*/state > /dev/null ++then ++ die "failfast missing" ++fi ++ ++# Adding works with the nofailfast flag ++mdadm $md0 -f $dev0 ++mdadm $md0 -r $dev0 ++mdadm $md0 -a --nofailfast $dev0 ++check wait ++if grep failfast /sys/block/md0/md/rd0/state > /dev/null ++then ++ die "failfast should be missing" ++fi ++ ++# Assembling with one faulty slave works with the failfast flag ++mdadm $md0 -f $dev0 ++mdadm $md0 -r $dev0 ++mdadm -S $md0 ++mdadm -A $md0 $dev0 $dev1 ++check raid1 ++mdadm -S $md0 ++ ++# Spare works with the failfast flag ++mdadm -CR $md0 -e1.2 --level=raid1 --failfast -n2 $dev0 $dev1 ++check raid1 ++mdadm $md0 -a --failfast $dev2 ++check wait ++check spares 1 ++if grep -v failfast /sys/block/md0/md/rd*/state > /dev/null ++then ++ die "failfast missing" ++fi ++ ++# Grow works with the failfast flag ++mdadm -G $md0 --raid-devices=3 ++check wait ++if grep -v failfast /sys/block/md0/md/rd*/state > /dev/null ++then ++ die "failfast missing" ++fi ++mdadm -S $md0 ++ ++exit 0 +-- +2.7.5 + diff --git a/SOURCES/0018-Monitor-Increase-size-of-percentalert-to-avoid-gcc-w.patch b/SOURCES/0018-Monitor-Increase-size-of-percentalert-to-avoid-gcc-w.patch deleted file mode 100644 index 748d72a..0000000 --- a/SOURCES/0018-Monitor-Increase-size-of-percentalert-to-avoid-gcc-w.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 975898395951835f5a8051441af21cc995921f8c Mon Sep 17 00:00:00 2001 -From: Jes Sorensen -Date: Thu, 31 May 2018 11:45:21 -0400 -Subject: [RHEL7.5 PATCH 18/26] Monitor: Increase size of percentalert to avoid - gcc warning - -gcc-8.1 complains about truncated string operations. While we know -percent will never grow larger than 100, it doesn't cost us anything -to increase the size of 'percentalert' on the stack like this. - -Signed-off-by: Jes Sorensen ---- - Monitor.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Monitor.c b/Monitor.c -index c7c05d2..036103f 100644 ---- a/Monitor.c -+++ b/Monitor.c -@@ -557,7 +557,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat, - alert("RebuildStarted", dev, NULL, ainfo); - if (st->percent >= 0 && mse->percent >= 0 && - (mse->percent / increments) > (st->percent / increments)) { -- char percentalert[15]; -+ char percentalert[18]; - /* - * "RebuildNN" (10 chars) or "RebuildStarted" (15 chars) - */ --- -2.7.4 - diff --git a/SOURCES/0018-mdmon-don-t-attempt-to-manage-new-arrays-when-termin.patch b/SOURCES/0018-mdmon-don-t-attempt-to-manage-new-arrays-when-termin.patch new file mode 100644 index 0000000..f291302 --- /dev/null +++ b/SOURCES/0018-mdmon-don-t-attempt-to-manage-new-arrays-when-termin.patch @@ -0,0 +1,50 @@ +From 69d084784de196acec8ab703cd1b379af211d624 Mon Sep 17 00:00:00 2001 +From: Artur Paszkiewicz +Date: Fri, 22 Feb 2019 10:15:45 +0100 +Subject: [RHEL7.7 PATCH 18/21] mdmon: don't attempt to manage new arrays when + terminating + +When mdmon gets a SIGTERM, it stops managing arrays that are clean. If +there is more that one array in the container and one of them is dirty +and the clean one is still present in mdstat, mdmon will treat it as a +new array and start managing it again. This leads to a cycle of +remove_old() / manage_new() calls for the clean array, until the other +one also becomes clean. + +Prevent this by not calling manage_new() if sigterm is set. Also, remove +a check for sigterm in manage_new() because the condition will never be +true. + +Signed-off-by: Artur Paszkiewicz +Signed-off-by: Jes Sorensen +--- + managemon.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/managemon.c b/managemon.c +index 101231c..29b91ba 100644 +--- a/managemon.c ++++ b/managemon.c +@@ -727,9 +727,7 @@ static void manage_new(struct mdstat_ent *mdstat, + dprintf("inst: %s action: %d state: %d\n", inst, + new->action_fd, new->info.state_fd); + +- if (sigterm) +- new->info.safe_mode_delay = 1; +- else if (mdi->safe_mode_delay >= 50) ++ if (mdi->safe_mode_delay >= 50) + /* Normal start, mdadm set this. */ + new->info.safe_mode_delay = mdi->safe_mode_delay; + else +@@ -803,7 +801,7 @@ void manage(struct mdstat_ent *mdstat, struct supertype *container) + break; + } + } +- if (a == NULL || !a->container) ++ if ((a == NULL || !a->container) && !sigterm) + manage_new(mdstat, container, a); + } + } +-- +2.7.5 + diff --git a/SOURCES/0019-mdmon-wait-for-previous-mdmon-to-exit-during-takeove.patch b/SOURCES/0019-mdmon-wait-for-previous-mdmon-to-exit-during-takeove.patch new file mode 100644 index 0000000..d494ad9 --- /dev/null +++ b/SOURCES/0019-mdmon-wait-for-previous-mdmon-to-exit-during-takeove.patch @@ -0,0 +1,58 @@ +From d2e11da4b7fd0453e942f43e4196dc63b3dbd708 Mon Sep 17 00:00:00 2001 +From: Pawel Baldysiak +Date: Fri, 22 Feb 2019 13:30:27 +0100 +Subject: [RHEL7.7 PATCH 19/21] mdmon: wait for previous mdmon to exit during + takeover + +Since the patch c76242c5("mdmon: get safe mode delay file descriptor +early"), safe_mode_dalay is set properly by initrd mdmon. But in some +cases with filesystem traffic since the very start of the system, it +might take a while to transit to clean state. Due to fact that new +mdmon does not wait for the old one to exit - it might happen that the +new one switches safe_mode_delay back to seconds, before old one exits. +As the result two mdmons are running concurrently on same array. + +Wait for the old mdmon to exit by pinging it with SIGUSR1 signal, just +in case it is sleeping. + +Signed-off-by: Pawel Baldysiak +Signed-off-by: Jes Sorensen +--- + mdmon.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/mdmon.c b/mdmon.c +index 0955fcc..ff985d2 100644 +--- a/mdmon.c ++++ b/mdmon.c +@@ -171,6 +171,7 @@ static void try_kill_monitor(pid_t pid, char *devname, int sock) + int fd; + int n; + long fl; ++ int rv; + + /* first rule of survival... don't off yourself */ + if (pid == getpid()) +@@ -201,9 +202,16 @@ static void try_kill_monitor(pid_t pid, char *devname, int sock) + fl &= ~O_NONBLOCK; + fcntl(sock, F_SETFL, fl); + n = read(sock, buf, 100); +- /* Ignore result, it is just the wait that +- * matters +- */ ++ ++ /* If there is I/O going on it might took some time to get to ++ * clean state. Wait for monitor to exit fully to avoid races. ++ * Ping it with SIGUSR1 in case that it is sleeping */ ++ for (n = 0; n < 25; n++) { ++ rv = kill(pid, SIGUSR1); ++ if (rv < 0) ++ break; ++ usleep(200000); ++ } + } + + void remove_pidfile(char *devname) +-- +2.7.5 + diff --git a/SOURCES/0019-mdopen-fix-gcc-8.1-string-overflow-error.patch b/SOURCES/0019-mdopen-fix-gcc-8.1-string-overflow-error.patch deleted file mode 100644 index 281667d..0000000 --- a/SOURCES/0019-mdopen-fix-gcc-8.1-string-overflow-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c1b78589cf042221e22a014332b195b2309cb178 Mon Sep 17 00:00:00 2001 -From: Jes Sorensen -Date: Thu, 31 May 2018 13:11:21 -0400 -Subject: [RHEL7.5 PATCH 19/26] mdopen: fix gcc 8.1 string overflow error - -We already cut symlinks longer than 1000, so rely on this calling -readlink and error out if we are able to read more than 1000 bytes. - -Signed-off-by: Jes Sorensen ---- - mdopen.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/mdopen.c b/mdopen.c -index 4ec13f5..98c54e4 100644 ---- a/mdopen.c -+++ b/mdopen.c -@@ -44,7 +44,7 @@ void make_parts(char *dev, int cnt) - int nlen = strlen(dev) + 20; - char *name; - int dig = isdigit(dev[strlen(dev)-1]); -- char orig[1024]; -+ char orig[1001]; - char sym[1024]; - int err; - -@@ -58,8 +58,10 @@ void make_parts(char *dev, int cnt) - minor_num = minor(stb.st_rdev); - odig = -1; - } else if (S_ISLNK(stb.st_mode)) { -- int len = readlink(dev, orig, sizeof(orig)); -- if (len < 0 || len > 1000) -+ int len; -+ -+ len = readlink(dev, orig, sizeof(orig)); -+ if (len < 0 || len >= (int)sizeof(orig)) - return; - orig[len] = 0; - odig = isdigit(orig[len-1]); --- -2.7.4 - diff --git a/SOURCES/0020-Assemble-Fix-starting-array-with-initial-reshape-che.patch b/SOURCES/0020-Assemble-Fix-starting-array-with-initial-reshape-che.patch new file mode 100644 index 0000000..9fb2899 --- /dev/null +++ b/SOURCES/0020-Assemble-Fix-starting-array-with-initial-reshape-che.patch @@ -0,0 +1,52 @@ +From 2b57e4fe041d52ae29866c93a878a11c07223cff Mon Sep 17 00:00:00 2001 +From: Pawel Baldysiak +Date: Fri, 22 Feb 2019 12:56:27 +0100 +Subject: [RHEL7.7 PATCH 20/21] Assemble: Fix starting array with initial + reshape checkpoint + +If array was stopped during reshape initialization, +there might be a "0" checkpoint recorded in metadata. +If array with such condition (reshape with position 0) +is passed to kernel - it will refuse to start such array. + +Treat such array as normal during assemble, Grow_continue() will +reinitialize and start the reshape. + +Signed-off-by: Pawel Baldysiak +Signed-off-by: Jes Sorensen +--- + Assemble.c | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/Assemble.c b/Assemble.c +index 9f050c1..420c7b3 100644 +--- a/Assemble.c ++++ b/Assemble.c +@@ -2061,8 +2061,22 @@ int assemble_container_content(struct supertype *st, int mdfd, + spare, &c->backup_file, c->verbose) == 1) + return 1; + +- err = sysfs_set_str(content, NULL, +- "array_state", "readonly"); ++ if (content->reshape_progress == 0) { ++ /* If reshape progress is 0 - we are assembling the ++ * array that was stopped, before reshape has started. ++ * Array needs to be started as active, Grow_continue() ++ * will start the reshape. ++ */ ++ sysfs_set_num(content, NULL, "reshape_position", ++ MaxSector); ++ err = sysfs_set_str(content, NULL, ++ "array_state", "active"); ++ sysfs_set_num(content, NULL, "reshape_position", 0); ++ } else { ++ err = sysfs_set_str(content, NULL, ++ "array_state", "readonly"); ++ } ++ + if (err) + return 1; + +-- +2.7.5 + diff --git a/SOURCES/0020-super0-Use-memmove-when-adjusting-sparc2.2-superbloc.patch b/SOURCES/0020-super0-Use-memmove-when-adjusting-sparc2.2-superbloc.patch deleted file mode 100644 index 62338f1..0000000 --- a/SOURCES/0020-super0-Use-memmove-when-adjusting-sparc2.2-superbloc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2dcd6492718c2921feac993aa71ed3a7c2522077 Mon Sep 17 00:00:00 2001 -From: Jes Sorensen -Date: Thu, 31 May 2018 13:17:46 -0400 -Subject: [RHEL7.5 PATCH 20/26] super0: Use memmove() when adjusting sparc2.2 - superblock data - -memcpy() does not allow overlapping copies, switch to memmove() - -Signed-off-by: Jes Sorensen ---- - super0.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/super0.c b/super0.c -index 756cab5..42989b9 100644 ---- a/super0.c -+++ b/super0.c -@@ -520,9 +520,10 @@ static int update_super0(struct supertype *st, struct mdinfo *info, - * up 4 bytes before continuing - */ - __u32 *sb32 = (__u32*)sb; -- memcpy(sb32+MD_SB_GENERIC_CONSTANT_WORDS+7, -- sb32+MD_SB_GENERIC_CONSTANT_WORDS+7+1, -- (MD_SB_WORDS - (MD_SB_GENERIC_CONSTANT_WORDS+7+1))*4); -+ -+ memmove(sb32+MD_SB_GENERIC_CONSTANT_WORDS+7, -+ sb32+MD_SB_GENERIC_CONSTANT_WORDS+7+1, -+ (MD_SB_WORDS - (MD_SB_GENERIC_CONSTANT_WORDS+7+1))*4); - if (verbose >= 0) - pr_err("adjusting superblock of %s for 2.2/sparc compatibility.\n", - devname); --- -2.7.4 - diff --git a/SOURCES/0021-add-missing-units-to-examine.patch b/SOURCES/0021-add-missing-units-to-examine.patch new file mode 100644 index 0000000..31d34f5 --- /dev/null +++ b/SOURCES/0021-add-missing-units-to-examine.patch @@ -0,0 +1,59 @@ +From 227aeaa872d4898273cf87a4253898823d556c43 Mon Sep 17 00:00:00 2001 +From: Corey Hickey +Date: Mon, 11 Feb 2019 17:42:27 -0800 +Subject: [RHEL7.7 PATCH 21/21] add missing units to --examine + +Within the output of "mdadm --examine", there are three sizes reported +on adjacent lines. For example: + +$ sudo mdadm --examine /dev/md3 +[...] + Avail Dev Size : 17580545024 (8383.06 GiB 9001.24 GB) + Array Size : 17580417024 (16765.99 GiB 18002.35 GB) + Used Dev Size : 11720278016 (5588.66 GiB 6000.78 GB) +[...] + +This can be confusing, since the first and third line are in 512-byte +sectors, and the second is in KiB. + +Add units to avoid ambiguity. + +(I don't particularly like the "KiB" notation, but it is at least +unambiguous.) + +Signed-off-by: Corey Hickey +Signed-off-by: Jes Sorensen +--- + super1.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/super1.c b/super1.c +index 636a286..b85dc20 100644 +--- a/super1.c ++++ b/super1.c +@@ -360,7 +360,7 @@ static void examine_super1(struct supertype *st, char *homehost) + printf(" Raid Level : %s\n", c?c:"-unknown-"); + printf(" Raid Devices : %d\n", __le32_to_cpu(sb->raid_disks)); + printf("\n"); +- printf(" Avail Dev Size : %llu%s\n", ++ printf(" Avail Dev Size : %llu sectors%s\n", + (unsigned long long)__le64_to_cpu(sb->data_size), + human_size(__le64_to_cpu(sb->data_size)<<9)); + if (__le32_to_cpu(sb->level) > 0) { +@@ -378,11 +378,11 @@ static void examine_super1(struct supertype *st, char *homehost) + if (ddsks) { + long long asize = __le64_to_cpu(sb->size); + asize = (asize << 9) * ddsks / ddsks_denom; +- printf(" Array Size : %llu%s\n", ++ printf(" Array Size : %llu KiB%s\n", + asize >> 10, human_size(asize)); + } + if (sb->size != sb->data_size) +- printf(" Used Dev Size : %llu%s\n", ++ printf(" Used Dev Size : %llu sectors%s\n", + (unsigned long long)__le64_to_cpu(sb->size), + human_size(__le64_to_cpu(sb->size)<<9)); + } +-- +2.7.5 + diff --git a/SOURCES/0021-super1-Fix-cases-triggering-gcc-8.1-strncpy-truncate.patch b/SOURCES/0021-super1-Fix-cases-triggering-gcc-8.1-strncpy-truncate.patch deleted file mode 100644 index b1fee02..0000000 --- a/SOURCES/0021-super1-Fix-cases-triggering-gcc-8.1-strncpy-truncate.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 4d061b02b61d5e6d4186e0118166fdd40ea8b55f Mon Sep 17 00:00:00 2001 -From: Jes Sorensen -Date: Thu, 31 May 2018 13:38:08 -0400 -Subject: [RHEL7.5 PATCH 21/26] super1: Fix cases triggering gcc-8.1 strncpy - truncate warning - -Find the string length, copy it, and zero out the rest, instead of -relying on strncpy cleaning up for us. - -Signed-off-by: Jes Sorensen ---- - super1.c | 22 ++++++++++++++++++---- - 1 file changed, 18 insertions(+), 4 deletions(-) - -diff --git a/super1.c b/super1.c -index 6774fbd..636a286 100644 ---- a/super1.c -+++ b/super1.c -@@ -1434,8 +1434,15 @@ static int update_super1(struct supertype *st, struct mdinfo *info, - strcpy(sb->set_name, homehost); - strcat(sb->set_name, ":"); - strcat(sb->set_name, info->name); -- } else -- strncpy(sb->set_name, info->name, sizeof(sb->set_name)); -+ } else { -+ int namelen; -+ -+ namelen = min((int)strlen(info->name), -+ (int)sizeof(sb->set_name) - 1); -+ memcpy(sb->set_name, info->name, namelen); -+ memset(&sb->set_name[namelen], '\0', -+ sizeof(sb->set_name) - namelen); -+ } - } else if (strcmp(update, "devicesize") == 0 && - __le64_to_cpu(sb->super_offset) < - __le64_to_cpu(sb->data_offset)) { -@@ -1592,8 +1599,15 @@ static int init_super1(struct supertype *st, mdu_array_info_t *info, - strcpy(sb->set_name, homehost); - strcat(sb->set_name, ":"); - strcat(sb->set_name, name); -- } else -- strncpy(sb->set_name, name, sizeof(sb->set_name)); -+ } else { -+ int namelen; -+ -+ namelen = min((int)strlen(name), -+ (int)sizeof(sb->set_name) - 1); -+ memcpy(sb->set_name, name, namelen); -+ memset(&sb->set_name[namelen], '\0', -+ sizeof(sb->set_name) - namelen); -+ } - - sb->ctime = __cpu_to_le64((unsigned long long)time(0)); - sb->level = __cpu_to_le32(info->level); --- -2.7.4 - diff --git a/SOURCES/0022-super-ddf-Fix-gcc-8.1-overflow-warnings.patch b/SOURCES/0022-super-ddf-Fix-gcc-8.1-overflow-warnings.patch deleted file mode 100644 index df51b36..0000000 --- a/SOURCES/0022-super-ddf-Fix-gcc-8.1-overflow-warnings.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 002a5978f015a77ecc48487006b1030f9dbe1394 Mon Sep 17 00:00:00 2001 -From: Jes Sorensen -Date: Thu, 31 May 2018 16:07:33 -0400 -Subject: [RHEL7.5 PATCH 22/26] super-ddf: Fix gcc-8.1 overflow warnings - -Cast to types that are big enough to hold the values, but also guarantee -no overflow of the buffer keepts gcc happy. - -Signed-off-by: Jes Sorensen ---- - super-ddf.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/super-ddf.c b/super-ddf.c -index d02a19a..618542c 100644 ---- a/super-ddf.c -+++ b/super-ddf.c -@@ -2881,8 +2881,9 @@ static int add_to_super_ddf(struct supertype *st, - dd->disk.magic = DDF_PHYS_DATA_MAGIC; - now = time(0); - tm = localtime(&now); -- sprintf(dd->disk.guid, "%8s%04d%02d%02d", -- T10, tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday); -+ sprintf(dd->disk.guid, "%8s%04d%02d%02d", T10, -+ (__u16)tm->tm_year+1900, -+ (__u8)tm->tm_mon+1, (__u8)tm->tm_mday); - tptr = (__u32 *)(dd->disk.guid + 16); - *tptr++ = random32(); - *tptr = random32(); --- -2.7.4 - diff --git a/SOURCES/0023-Check-major-number-of-block-device-when-querying-md-.patch b/SOURCES/0023-Check-major-number-of-block-device-when-querying-md-.patch deleted file mode 100644 index 112af22..0000000 --- a/SOURCES/0023-Check-major-number-of-block-device-when-querying-md-.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 27e39ad31cbdfe516f9f390cc860a4f681750ef0 Mon Sep 17 00:00:00 2001 -From: Xiao Ni -Date: Wed, 30 May 2018 13:49:41 +0800 -Subject: [RHEL7.5 PATCH 23/26] Check major number of block device when - querying md device - -It give error message when query a non md device. -mdadm /dev/null -/dev/null: is an md device, but gives "Inappropriate ioctl for device" when queried - -It's introduced by commit 5cb8599 and 8d0cd09 -At first it checks whether a block is md device by function md_get_version. -In this function it does mainly two jobs: -1. send request by ioctl. (now it can be replace by argument ioctlerr) -2. check the block device major number which we don't do this. - -We add the second judgement in this patch. - -Fixes: 5cb8599 and 8d0cd09 -Reported-by: Karsten Weiss -Signed-off-by: Xiao Ni -Signed-off-by: Jes Sorensen ---- - Query.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/Query.c b/Query.c -index 2bd0e2a..23fbf8a 100644 ---- a/Query.c -+++ b/Query.c -@@ -85,12 +85,11 @@ int Query(char *dev) - - if (ioctlerr == ENODEV) - printf("%s: is an md device which is not active\n", dev); -+ else if (ioctlerr && major(stb.st_rdev) != MD_MAJOR) -+ printf("%s: is not an md array\n", dev); - else if (ioctlerr) - printf("%s: is an md device, but gives \"%s\" when queried\n", - dev, strerror(ioctlerr)); -- else if (staterr) -- printf("%s: is not a valid md device, returning %s\n", -- dev, strerror(ioctlerr)); - else { - printf("%s: %s %s %d devices, %d spare%s. Use mdadm --detail for more detail.\n", - dev, human_size_brief(larray_size,IEC), --- -2.7.4 - diff --git a/SOURCES/0024-mdadm-test-mdadm-needn-t-make-install-on-the-system.patch b/SOURCES/0024-mdadm-test-mdadm-needn-t-make-install-on-the-system.patch deleted file mode 100644 index 3cdd526..0000000 --- a/SOURCES/0024-mdadm-test-mdadm-needn-t-make-install-on-the-system.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 38e955cbf030bc9e564bd87bc9f02f949884a83f Mon Sep 17 00:00:00 2001 -From: Zhilong Liu -Date: Wed, 30 May 2018 15:04:05 +0800 -Subject: [RHEL7.5 PATCH 24/26] mdadm/test: mdadm needn't make install on the - system - -Fixes: beb71de04d31 ("mdadm/test: enable clustermd testing under clustermd_tests/") -clustermd_tests/func.sh: -remove unnecessary 'make install', just ensure 'make everything' has done. -the original idea is to make the /sbin/mdadm version same as ./mdadm, and -this breakage has pointed out by commit: -59416da78fc6 ("tests/func.sh: Fix some total breakage in the test scripts") - -Signed-off-by: Zhilong Liu -Signed-off-by: Jes Sorensen ---- - clustermd_tests/func.sh | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/clustermd_tests/func.sh b/clustermd_tests/func.sh -index c2be0e5..642cc96 100644 ---- a/clustermd_tests/func.sh -+++ b/clustermd_tests/func.sh -@@ -86,10 +86,13 @@ check_env() - echo "testing can only be done as 'root'." - exit 1 - } -+ [ \! -x $mdadm ] && { -+ echo "test: please run make everything before perform testing." -+ exit 1 -+ } - check_ssh - commands=(mdadm iscsiadm bc modinfo dlm_controld - udevadm crm crm_mon lsblk pgrep sbd) -- mdadm_src_ver="$($mdadm -V 2>&1)" - for ip in $NODE1 $NODE2 - do - for cmd in ${commands[@]} -@@ -99,12 +102,6 @@ check_env() - exit 1 - } - done -- mdadm_sbin_ver="$(ssh $ip "mdadm -V 2>&1")" -- if [ "$mdadm_src_ver" != "$mdadm_sbin_ver" ] -- then -- echo "$ip: please run 'make install' before testing." -- exit 1 -- fi - mods=(raid1 raid10 md_mod dlm md-cluster) - for mod in ${mods[@]} - do --- -2.7.4 - diff --git a/SOURCES/0025-mdadm-test-correct-tests-testdev-as-testdev-in-02r5g.patch b/SOURCES/0025-mdadm-test-correct-tests-testdev-as-testdev-in-02r5g.patch deleted file mode 100644 index 8615d83..0000000 --- a/SOURCES/0025-mdadm-test-correct-tests-testdev-as-testdev-in-02r5g.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7d4815f84cba133ee7439db5348ce554779f8342 Mon Sep 17 00:00:00 2001 -From: Zhilong Liu -Date: Wed, 30 May 2018 15:04:41 +0800 -Subject: [RHEL7.5 PATCH 25/26] mdadm/test: correct tests/testdev as testdev in - 02r5grow - -Fixes: a6994ccc230b ("mdadm/test: get rid of the tests/testdev") - -Signed-off-by: Zhilong Liu -Signed-off-by: Jes Sorensen ---- - tests/02r5grow | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/02r5grow b/tests/02r5grow -index bb9bd6d..2da78ee 100644 ---- a/tests/02r5grow -+++ b/tests/02r5grow -@@ -31,7 +31,7 @@ testdev $md0 3 $[mdsize1_l] 128 - - mdadm --grow $md0 --size $[size/2] - check nosync --sh tests/testdev $md0 3 $[size/2] 128 -+testdev $md0 3 $[size/2] 128 - - mdadm -S $md0 - --- -2.7.4 - diff --git a/SOURCES/0026-gcc-8-coverity-hack.patch b/SOURCES/0026-gcc-8-coverity-hack.patch deleted file mode 100644 index 934fb40..0000000 --- a/SOURCES/0026-gcc-8-coverity-hack.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 28156667e5c7dc3c7b978f2d58c2a427038fedda Mon Sep 17 00:00:00 2001 -From: Jes Sorensen -Date: Mon, 4 Jun 2018 14:49:59 -0400 -Subject: [RHEL7.5 PATCH 26/26] gcc-8 coverity hack - -Coverity still has issues with gcc-7, not to mention gcc-8. Hack around -it, until they fix it. - -Signed-off-by: Jes Sorensen ---- - Makefile | 15 +++++++++++---- - coverity-gcc-hack.h | 10 ++++++++++ - 2 files changed, 21 insertions(+), 4 deletions(-) - create mode 100644 coverity-gcc-hack.h - -diff --git a/Makefile b/Makefile -index 188a218..2767ac6 100644 ---- a/Makefile -+++ b/Makefile -@@ -42,6 +42,10 @@ KLIBC=/home/src/klibc/klibc-0.77 - - KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32 - -+ifdef COVERITY -+COVERITY_FLAGS=-include coverity-gcc-hack.h -+endif -+ - CC ?= $(CROSS_COMPILE)gcc - CXFLAGS ?= -ggdb - CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter -@@ -177,6 +181,9 @@ everything-test: all mdadm.static swap_super test_stripe \ - # mdadm.uclibc doesn't work on x86-64 - # mdadm.tcc doesn't work.. - -+%.o: %.c -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(COVERITY_FLAGS) -o $@ -c $< -+ - mdadm : $(OBJS) | check_rundir - $(CC) $(CFLAGS) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS) - -@@ -291,10 +298,10 @@ test: mdadm mdmon test_stripe swap_super raid6check - - clean : - rm -f mdadm mdmon $(OBJS) $(MON_OBJS) $(STATICOBJS) core *.man \ -- mdadm.tcc mdadm.uclibc mdadm.static *.orig *.porig *.rej *.alt .merge_file_* \ -- mdadm.Os mdadm.O2 mdmon.O2 swap_super \ -- init.cpio.gz mdadm.uclibc.static test_stripe raid6check raid6check.o mdmon \ -- mdadm.8 -+ mdadm.tcc mdadm.uclibc mdadm.static *.orig *.porig *.rej *.alt \ -+ .merge_file_* mdadm.Os mdadm.O2 mdmon.O2 swap_super init.cpio.gz \ -+ mdadm.uclibc.static test_stripe raid6check raid6check.o mdmon mdadm.8 -+ rm -rf cov-int - - dist : clean - ./makedist -diff --git a/coverity-gcc-hack.h b/coverity-gcc-hack.h -new file mode 100644 -index 0000000..2d94a8b ---- /dev/null -+++ b/coverity-gcc-hack.h -@@ -0,0 +1,10 @@ -+#if !defined(__KERNEL__) && defined(__x86_64__) && defined(__COVERITY_GCC_VERSION_AT_LEAST) -+#if __COVERITY_GCC_VERSION_AT_LEAST(7, 0) -+typedef float _Float128 __attribute__((__vector_size__(128))); -+typedef float _Float64 __attribute__((__vector_size__(64))); -+typedef float _Float32 __attribute__((__vector_size__(32))); -+typedef float _Float128x __attribute__((__vector_size__(128))); -+typedef float _Float64x __attribute__((__vector_size__(64))); -+typedef float _Float32x __attribute__((__vector_size__(32))); -+#endif -+#endif --- -2.7.4 - diff --git a/SOURCES/0027-Assemble.c-Don-t-ignore-faulty-disk-when-array-is-au.patch b/SOURCES/0027-Assemble.c-Don-t-ignore-faulty-disk-when-array-is-au.patch deleted file mode 100644 index 428e41a..0000000 --- a/SOURCES/0027-Assemble.c-Don-t-ignore-faulty-disk-when-array-is-au.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7298c9a6facea469d9e7ed55a7a0806500096415 Mon Sep 17 00:00:00 2001 -From: Mariusz Tkaczyk -Date: Thu, 7 Jun 2018 14:47:47 +0200 -Subject: [RHEL7.5 PATCH 1/1] Assemble.c Don't ignore faulty disk when array is - auto assembled. - -Since commit 20dc76d15b40 ("imsm: Set disk slot number") mdadm -sets slot number for each disk in imsm array. Now auto-assemble determines -devices using slot number and ignores devices on the same slot that have -older generation number. -It causes infinit loop if failed device is still visible in system -(it has metadata, but it is not merged with exisiting array). - -To avoid it, out-of-sync device should be added to the best[]. Later -mdadm adds it as spare to the container. - -Imsm doesn't support disk replacement feature, so it can use rooms for -replacements. - -Signed-off-by: Mariusz Tkaczyk -Signed-off-by: Jes Sorensen ---- - Assemble.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Assemble.c b/Assemble.c -index e83d550..32e6f6f 100644 ---- a/Assemble.c -+++ b/Assemble.c -@@ -779,6 +779,8 @@ static int load_devices(struct devs *devices, char *devmap, - if (best[i] == -1 || (devices[best[i]].i.events - < devices[devcnt].i.events)) - best[i] = devcnt; -+ else if (st->ss == &super_imsm) -+ best[i+1] = devcnt; - } - devcnt++; - } --- -2.7.4 - diff --git a/SOURCES/0028-imsm-correct-num_data_stripes-in-metadata-map-for-mi.patch b/SOURCES/0028-imsm-correct-num_data_stripes-in-metadata-map-for-mi.patch deleted file mode 100644 index 53b87e0..0000000 --- a/SOURCES/0028-imsm-correct-num_data_stripes-in-metadata-map-for-mi.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 4a353e6ec48e35437b27978add6cd2cd015f2cfe Mon Sep 17 00:00:00 2001 -From: Roman Sobanski -Date: Fri, 8 Jun 2018 12:34:18 +0200 -Subject: [RHEL7.5 PATCH 1/1] imsm: correct num_data_stripes in metadata map - for migration - -When migrating an array from R0 to R10 num_data_stripes in metadata map -will not be updated. Update it to allow correct migration process. -Changes in R10 to R0 migration for clarity of code. - -Signed-off-by: Roman Sobanski -Signed-off-by: Jes Sorensen ---- - super-intel.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/super-intel.c b/super-intel.c -index a01be13..f011a31 100644 ---- a/super-intel.c -+++ b/super-intel.c -@@ -9543,12 +9543,6 @@ static int apply_takeover_update(struct imsm_update_takeover *u, - if (u->direction == R10_TO_R0) { - unsigned long long num_data_stripes; - -- map->num_domains = 1; -- num_data_stripes = imsm_dev_size(dev) / 2; -- num_data_stripes /= map->blocks_per_strip; -- num_data_stripes /= map->num_domains; -- set_num_data_stripes(map, num_data_stripes); -- - /* Number of failed disks must be half of initial disk number */ - if (imsm_count_failed(super, dev, MAP_0) != - (map->num_members / 2)) -@@ -9574,10 +9568,15 @@ static int apply_takeover_update(struct imsm_update_takeover *u, - map->num_domains = 1; - map->raid_level = 0; - map->failed_disk_num = -1; -+ num_data_stripes = imsm_dev_size(dev) / 2; -+ num_data_stripes /= map->blocks_per_strip; -+ set_num_data_stripes(map, num_data_stripes); - } - - if (u->direction == R0_TO_R10) { - void **space; -+ unsigned long long num_data_stripes; -+ - /* update slots in current disk list */ - for (dm = super->disks; dm; dm = dm->next) { - if (dm->index >= 0) -@@ -9615,6 +9614,11 @@ static int apply_takeover_update(struct imsm_update_takeover *u, - map->map_state = IMSM_T_STATE_DEGRADED; - map->num_domains = 2; - map->raid_level = 1; -+ num_data_stripes = imsm_dev_size(dev) / 2; -+ num_data_stripes /= map->blocks_per_strip; -+ num_data_stripes /= map->num_domains; -+ set_num_data_stripes(map, num_data_stripes); -+ - /* replace dev<->dev_new */ - dv->dev = dev_new; - } --- -2.7.4 - diff --git a/SPECS/mdadm.spec b/SPECS/mdadm.spec index f0ddd5b..d0bf245 100644 --- a/SPECS/mdadm.spec +++ b/SPECS/mdadm.spec @@ -1,9 +1,8 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 4.1 -%define subversion rc1 -Release: rc1_2%{?dist} -Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-%{subversion}.tar.xz +Release: 1%{?dist} +Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz Source1: mdmonitor.init Source2: raid-check Source3: mdadm.rules @@ -13,34 +12,27 @@ Source6: mdmonitor.service Source7: mdadm.conf Source8: mdadm_event.conf -Patch1: 0001-mdadm-fix-use-after-free-after-free_mdstat.patch -Patch2: 0002-imsm-Allow-create-RAID-volume-with-link-to-container.patch -Patch3: 0003-tests-func.sh-Fix-some-total-breakage-in-the-test-sc.patch -Patch4: 0004-imsm-change-reserved-space-to-4MB.patch -Patch5: 0005-imsm-add-functions-to-get-and-set-imsm-dev-size.patch -Patch6: 0006-imsm-pass-already-existing-map-to-imsm_num_data_memb.patch -Patch7: 0007-imsm-do-not-use-blocks_per_member-in-array-size-calc.patch -Patch8: 0008-Prevent-create-IMSM-volume-with-size-smaller-than-1M.patch -Patch9: 0009-mdadm-grow-correct-size-and-chunk_size-casting.patch -Patch10: 0010-Fix-misspelling-of-alignment-and-geometry.patch -Patch11: 0011-Do-not-confuse-gcc.patch -Patch12: 0012-super-intel-Use-memcpy-to-avoid-confusing-gcc.patch -Patch13: 0013-super-intel-Get-rid-of-unnused-string.patch -Patch14: 0014-super-intel-Avoid-gcc-8.1-complaining-about-truncati.patch -Patch15: 0015-super-intel-Do-not-truncate-last-character-of-volume.patch -Patch16: 0016-imsm-Do-not-block-volume-creation-when-container-has.patch -Patch17: 0017-imsm-Do-not-require-MDADM_EXPERIMENTAL-flag-anymore.patch -Patch18: 0018-Monitor-Increase-size-of-percentalert-to-avoid-gcc-w.patch -Patch19: 0019-mdopen-fix-gcc-8.1-string-overflow-error.patch -Patch20: 0020-super0-Use-memmove-when-adjusting-sparc2.2-superbloc.patch -Patch21: 0021-super1-Fix-cases-triggering-gcc-8.1-strncpy-truncate.patch -Patch22: 0022-super-ddf-Fix-gcc-8.1-overflow-warnings.patch -Patch23: 0023-Check-major-number-of-block-device-when-querying-md-.patch -Patch24: 0024-mdadm-test-mdadm-needn-t-make-install-on-the-system.patch -Patch25: 0025-mdadm-test-correct-tests-testdev-as-testdev-in-02r5g.patch -Patch26: 0026-gcc-8-coverity-hack.patch -Patch27: 0027-Assemble.c-Don-t-ignore-faulty-disk-when-array-is-au.patch -Patch28: 0028-imsm-correct-num_data_stripes-in-metadata-map-for-mi.patch +Patch1: 0001-Assemble-keep-MD_DISK_FAILFAST-and-MD_DISK_WRITEMOST.patch +Patch2: 0002-Document-PART-POLICY-lines.patch +Patch3: 0003-policy-support-devices-with-multiple-paths.patch +Patch4: 0004-mdcheck-add-systemd-unit-files-to-run-mdcheck.patch +Patch5: 0005-Monitor-add-system-timer-to-run-oneshot-periodically.patch +Patch6: 0006-imsm-update-metadata-correctly-while-raid10-double-d.patch +Patch7: 0007-Assemble-mask-FAILFAST-and-WRITEMOSTLY-flags-when-fi.patch +Patch8: 0008-Grow-avoid-overflow-in-compute_backup_blocks.patch +Patch9: 0009-Grow-report-correct-new-chunk-size.patch +Patch10: 0010-policy.c-prevent-NULL-pointer-referencing.patch +Patch11: 0011-policy.c-Fix-for-compiler-error.patch +Patch12: 0012-imsm-finish-recovery-when-drive-with-rebuild-fails.patch +Patch13: 0013-imsm-fix-reshape-for-2TB-drives.patch +Patch14: 0014-Fix-spelling-typos.patch +Patch15: 0015-Detail.c-do-not-skip-first-character-when-calling-xs.patch +Patch16: 0016-Fix-reshape-for-decreasing-data-offset.patch +Patch17: 0017-mdadm-tests-add-one-test-case-for-failfast-of-raid1.patch +Patch18: 0018-mdmon-don-t-attempt-to-manage-new-arrays-when-termin.patch +Patch19: 0019-mdmon-wait-for-previous-mdmon-to-exit-during-takeove.patch +Patch20: 0020-Assemble-Fix-starting-array-with-initial-reshape-che.patch +Patch21: 0021-add-missing-units-to-examine.patch # RHEL customization patches Patch195: mdadm-3.4-udev-race.patch @@ -70,7 +62,7 @@ almost all functions without a configuration file, though a configuration file can be used to help with some common tasks. %prep -%setup -q -n %{name}-%{version}_%{subversion} +%setup -q %patch1 -p1 -b .0001 %patch2 -p1 -b .0002 @@ -93,13 +85,6 @@ file can be used to help with some common tasks. %patch19 -p1 -b .0019 %patch20 -p1 -b .0020 %patch21 -p1 -b .0021 -%patch22 -p1 -b .0022 -%patch23 -p1 -b .0023 -%patch24 -p1 -b .0024 -%patch25 -p1 -b .0025 -%patch26 -p1 -b .0026 -%patch27 -p1 -b .0027 -%patch28 -p1 -b .0028 # RHEL customization patches %patch195 -p1 -b .race @@ -167,6 +152,10 @@ rm -rf %{buildroot} /etc/libreport/events.d/* %changelog +* Mon Mar 11 2019 Xiao Ni - 4.1.1 +- Update to upstream 4.1 and backport 21 patches after 4.1 +- Resolves rhbz#1641473 + * Thu Aug 02 2018 Xiao Ni - 4.1-rc1-2 - Fix two IMSM bugs - Resolves rhbz#1602362 and rhbz#1602358