Commit bb4f1e9d authored by NeilBrown's avatar NeilBrown
Browse files

md: fix another deadlock with removing sysfs attributes. 



Move the deletion of sysfs attributes from reconfig_mutex to
open_mutex didn't really help as a process can try to take
open_mutex while holding reconfig_mutex, so the same deadlock can
happen, just requiring one more process to be involved in the chain.

I looks like I cannot easily use locking to wait for the sysfs
deletion to complete, so don't.

The only things that we cannot do while the deletions are still
pending is other things which can change the sysfs namespace: run,
takeover, stop.  Each of these can fail with -EBUSY.
So set a flag while doing a sysfs deletion, and fail run, takeover,
stop if that flag is set.

This is suitable for 2.6.35.x

Cc: stable@kernel.org
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 147e0b6a

drivers/md/md.c

+17 −14
Original line number Diff line number Diff line
@@ -580,13 +580,17 @@ static void mddev_unlock(mddev_t * mddev) 
		 * an access to the files will try to take reconfig_mutex

		 * while holding the file unremovable, which leads to

		 * a deadlock.

		 * So hold open_mutex instead - we are allowed to take

		 * it while holding reconfig_mutex, and md_run can

		 * use it to wait for the remove to complete.

		 * So hold set sysfs_active while the remove in happeing,

		 * and anything else which might set ->to_remove or my

		 * otherwise change the sysfs namespace will fail with

		 * -EBUSY if sysfs_active is still set.

		 * We set sysfs_active under reconfig_mutex and elsewhere

		 * test it under the same mutex to ensure its correct value

		 * is seen.

		 */

		struct attribute_group *to_remove = mddev->to_remove;

		mddev->to_remove = NULL;

		mutex_lock(&mddev->open_mutex);

		mddev->sysfs_active = 1;

		mutex_unlock(&mddev->reconfig_mutex);



		if (mddev->kobj.sd) {
@@ -600,7 +604,7 @@ static void mddev_unlock(mddev_t * mddev) 
				mddev->sysfs_action = NULL;

			}

		}

		mutex_unlock(&mddev->open_mutex);

		mddev->sysfs_active = 0;

	} else

		mutex_unlock(&mddev->reconfig_mutex);
@@ -3008,7 +3012,9 @@ level_store(mddev_t *mddev, const char *buf, size_t len) 
	 *  - new personality will access other array.

	 */



	if (mddev->sync_thread || mddev->reshape_position != MaxSector)

	if (mddev->sync_thread ||

	    mddev->reshape_position != MaxSector ||

	    mddev->sysfs_active)

		return -EBUSY;



	if (!mddev->pers->quiesce) {
@@ -4393,13 +4399,9 @@ int md_run(mddev_t *mddev) 


	if (mddev->pers)

		return -EBUSY;



	/* These two calls synchronise us with the

	 * sysfs_remove_group calls in mddev_unlock,

	 * so they must have completed.

	 */

	mutex_lock(&mddev->open_mutex);

	mutex_unlock(&mddev->open_mutex);

	/* Cannot run until previous stop completes properly */

	if (mddev->sysfs_active)

		return -EBUSY;



	/*

	 * Analyze all RAID superblock(s)
@@ -4770,7 +4772,8 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open) 
	mdk_rdev_t *rdev;



	mutex_lock(&mddev->open_mutex);

	if (atomic_read(&mddev->openers) > is_open) {

	if (atomic_read(&mddev->openers) > is_open ||

	    mddev->sysfs_active) {

		printk("md: %s still in use.\n",mdname(mddev));

		err = -EBUSY;

	} else if (mddev->pers) {

drivers/md/md.h

+4 −0
Original line number Diff line number Diff line
@@ -145,6 +145,10 @@ struct mddev_s 
	int				suspended;

	atomic_t			active_io;

	int				ro;

	int				sysfs_active; /* set when sysfs deletes

						       * are happening, so run/

						       * takeover/stop are not safe

						       */



	struct gendisk			*gendisk;

CRA Git | Maintained and supported by SUSTech CRA and CCSE