Merge ~paelzer/ubuntu/+source/mdadm:lp-1811795-1811228-cosmic into ubuntu/+source/mdadm:ubuntu/cosmic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA is available at: https://launchpad.net/~paelzer/+archive/ubuntu/bug-1811228-1811795-mdadm-imsm

Testing needs special IMSM HW which I don't have, lets check how active the reporters are in helping with that.

[Andreas Hasenack (ahasenack)]

+1

- sru template ok
- changelog ok
- sru version ok
- patches identical to upstream commits
- reporter confirmed ppa fixes the issue

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks for the review - I tagged, pushed and uploaded it now.

diff --git a/debian/changelog b/debian/changelog
index 14f9660..74a8a67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mdadm (4.1~rc1-4ubuntu1.1) cosmic; urgency=medium
+
+  * d/p/lp-1811228-imsm-Block-volume-creation-with-empty-name.patch: avoid
+    creating whitespaced or empty names (LP: #1811228)
+  * d/p/lp-1811795-remove-external-arrays-and-devices.patch: fix removal of
+    failing disks with external metadata (LP: #1811795)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 10 Apr 2019 16:14:17 +0200
+
 mdadm (4.1~rc1-4ubuntu1) cosmic; urgency=medium
 
   * Ship finalrd hook.
diff --git a/debian/patches/lp-1811228-imsm-Block-volume-creation-with-empty-name.patch b/debian/patches/lp-1811228-imsm-Block-volume-creation-with-empty-name.patch
new file mode 100644
index 0000000..00fffd2
--- /dev/null
+++ b/debian/patches/lp-1811228-imsm-Block-volume-creation-with-empty-name.patch
@@ -0,0 +1,50 @@
+From 9bd99a90e110bd39beaa539cb44a70ee3264a270 Mon Sep 17 00:00:00 2001
+From: Roman Sobanski <[e-mail]>
+Date: Fri, 10 Aug 2018 14:20:35 +0200
+Subject: [PATCH] imsm: Block volume creation with empty name
+
+There is a possibility to create a RAID with empty name. Block it. Also
+remove trailing and leading whitespaces from given name.
+
+Signed-off-by: Roman Sobanski <[e-mail]>
+Signed-off-by: Jes Sorensen <[e-mail]>
+
+Origin: upstream, https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=9bd99a90e110bd39beaa539cb44a70ee3264a270
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1811228
+Last-Update: 2019-04-10
+
+---
+ super-intel.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/super-intel.c b/super-intel.c
+index f011a31f..d3d256a4 100644
+--- a/super-intel.c
++++ b/super-intel.c
+@@ -5285,10 +5285,22 @@ static int check_name(struct intel_super *super, char *name, int quiet)
+ {
+ 	struct imsm_super *mpb = super->anchor;
+ 	char *reason = NULL;
++	char *start = name;
++	size_t len = strlen(name);
+ 	int i;
+ 
+-	if (strlen(name) > MAX_RAID_SERIAL_LEN)
++	if (len > 0) {
++		while (isspace(start[len - 1]))
++			start[--len] = 0;
++		while (*start && isspace(*start))
++			++start, --len;
++		memmove(name, start, len + 1);
++	}
++
++	if (len > MAX_RAID_SERIAL_LEN)
+ 		reason = "must be 16 characters or less";
++	else if (len == 0)
++		reason = "must be a non-empty string";
+ 
+ 	for (i = 0; i < mpb->num_raid_devs; i++) {
+ 		struct imsm_dev *dev = get_imsm_dev(super, i);
+-- 
+2.17.1
+
diff --git a/debian/patches/lp-1811795-remove-external-arrays-and-devices.patch b/debian/patches/lp-1811795-remove-external-arrays-and-devices.patch
new file mode 100644
index 0000000..f7f15ab
--- /dev/null
+++ b/debian/patches/lp-1811795-remove-external-arrays-and-devices.patch
@@ -0,0 +1,138 @@
+From cb8f5371352f6c16af5aab8a40861e13aa50fc2b Mon Sep 17 00:00:00 2001
+From: Mariusz Tkaczyk <[e-mail]>
+Date: Fri, 3 Aug 2018 09:41:50 +0200
+Subject: [PATCH] Incremental: remove external arrays and devices correctly
+
+Kernel returns EBUSY when device fail invokes array fail.
+In external metadata if kernel returns it, mdadm doesn't stop member
+arrays but it will try to stop container directly. It fails because
+container still has working arrays, so udev remove is triggered.
+
+Try to set faulty state on device in member arrays first. If kernel
+returns EBUSY, stop this array. After that remove the device from
+container.
+
+In external metadata mdmon has to remove faulty devices from degraded
+arrays, just remove device from container.
+
+Raid5 array doesn't return EBUSY, it allows to remove every device.
+Mdadm shouldn't block it.
+
+Signed-off-by: Mariusz Tkaczyk <[e-mail]>
+Signed-off-by: Jes Sorensen <[e-mail]>
+
+Origin: upstream, https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=cb8f5371352f6c16af5aab8a40861e13aa50fc2b
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1811795
+Last-Update: 2019-04-10
+
+---
+ Incremental.c | 78 ++++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 52 insertions(+), 26 deletions(-)
+
+diff --git a/Incremental.c b/Incremental.c
+index 0c5698ee..a4ff7d4b 100644
+--- a/Incremental.c
++++ b/Incremental.c
+@@ -1683,6 +1683,44 @@ static void run_udisks(char *arg1, char *arg2)
+ 		;
+ }
+ 
++static int force_remove(char *devnm, int fd, struct mdinfo *mdi, int verbose)
++{
++	int rv;
++	int devid = devnm2devid(devnm);
++
++	run_udisks("--unmount", map_dev(major(devid), minor(devid), 0));
++	rv = Manage_stop(devnm, fd, verbose, 1);
++	if (rv) {
++		/* At least we can try to trigger a 'remove' */
++		sysfs_uevent(mdi, "remove");
++		if (verbose)
++			pr_err("Fail to stop %s too.\n", devnm);
++	}
++	return rv;
++}
++
++static void remove_from_member_array(struct mdstat_ent *memb,
++				    struct mddev_dev *devlist, int verbose)
++{
++	int rv;
++	struct mdinfo mmdi;
++	int subfd = open_dev(memb->devnm);
++
++	if (subfd >= 0) {
++		rv = Manage_subdevs(memb->devnm, subfd, devlist, verbose,
++				    0, NULL, 0);
++		if (rv & 2) {
++			if (sysfs_init(&mmdi, -1, memb->devnm))
++				pr_err("unable to initialize sysfs for: %s\n",
++				       memb->devnm);
++			else
++				force_remove(memb->devnm, subfd, &mmdi,
++					     verbose);
++		}
++		close(subfd);
++	}
++}
++
+ /*
+  * IncrementalRemove - Attempt to see if the passed in device belongs to any
+  * raid arrays, and if so first fail (if needed) and then remove the device.
+@@ -1754,40 +1792,28 @@ int IncrementalRemove(char *devname, char *id_path, int verbose)
+ 	    strncmp(ent->metadata_version, "external:", 9) == 0) {
+ 		struct mdstat_ent *mdstat = mdstat_read(0, 0);
+ 		struct mdstat_ent *memb;
+-		for (memb = mdstat ; memb ; memb = memb->next)
+-			if (is_container_member(memb, ent->devnm)) {
+-				int subfd = open_dev(memb->devnm);
+-				if (subfd >= 0) {
+-					rv |= Manage_subdevs(
+-						memb->devnm, subfd,
+-						&devlist, verbose, 0,
+-						NULL, 0);
+-					close(subfd);
+-				}
+-			}
++		for (memb = mdstat ; memb ; memb = memb->next) {
++			if (is_container_member(memb, ent->devnm))
++				remove_from_member_array(memb,
++					&devlist, verbose);
++		}
+ 		free_mdstat(mdstat);
+-	} else
++	} else {
+ 		rv |= Manage_subdevs(ent->devnm, mdfd, &devlist,
+ 				    verbose, 0, NULL, 0);
+-	if (rv & 2) {
++		if (rv & 2) {
+ 		/* Failed due to EBUSY, try to stop the array.
+ 		 * Give udisks a chance to unmount it first.
+ 		 */
+-		int devid = devnm2devid(ent->devnm);
+-		run_udisks("--unmount", map_dev(major(devid),minor(devid), 0));
+-		rv = Manage_stop(ent->devnm, mdfd, verbose, 1);
+-		if (rv)
+-			/* At least we can try to trigger a 'remove' */
+-			sysfs_uevent(&mdi, "remove");
+-		if (verbose) {
+-			if (rv)
+-				pr_err("Fail to stop %s too.\n", ent->devnm);
++			rv = force_remove(ent->devnm, mdfd, &mdi, verbose);
++			goto end;
+ 		}
+-	} else {
+-		devlist.disposition = 'r';
+-		rv = Manage_subdevs(ent->devnm, mdfd, &devlist,
+-				    verbose, 0, NULL, 0);
+ 	}
++
++	devlist.disposition = 'r';
++	rv = Manage_subdevs(ent->devnm, mdfd, &devlist,
++			    verbose, 0, NULL, 0);
++end:
+ 	close(mdfd);
+ 	free_mdstat(ent);
+ 	return rv;
+-- 
+2.17.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 60f1eed..387d877 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -44,3 +44,5 @@ sha1-includes.diff
 readlink-path.patch
 mdmonitor-service-simplify.diff
 0001-udev.rules-make-safe-timeouts-compatible-with-split-.patch
+lp-1811228-imsm-Block-volume-creation-with-empty-name.patch
+lp-1811795-remove-external-arrays-and-devices.patch