Commit e2d59925 authored by NeilBrown's avatar NeilBrown
Browse files

md/raid1,raid10: use freeze_array in place of raise_barrier in various places. 



Various places in raid1 and raid10 are calling raise_barrier when they
really should call freeze_array.
The former is only intended to be called from "make_request".
The later has extra checks for 'nr_queued' and makes a call to
flush_pending_writes(), so it is safe to call it from within the
management thread.

Using raise_barrier will sometimes deadlock.  Using freeze_array
should not.

As 'freeze_array' currently expects one request to be pending (in
handle_read_error - the only previous caller), we need to pass
it the number of pending requests (extra) to ignore.

The deadlock was made particularly noticeable by commits
050b6615 (raid10) and 6b740b8d (raid1) which
appeared in 3.4, so the fix is appropriate for any -stable
kernel since then.

This patch probably won't apply directly to some early kernels and
will need to be applied by hand.

Cc: stable@vger.kernel.org
Reported-by: default avatarAlexander Lyakas <alex.bolshoy@gmail.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 3056e3ae

drivers/md/raid1.c

+11 −11
Original line number Diff line number Diff line
@@ -890,17 +890,17 @@ static void allow_barrier(struct r1conf *conf) 
	wake_up(&conf->wait_barrier);

}



static void freeze_array(struct r1conf *conf)

static void freeze_array(struct r1conf *conf, int extra)

{

	/* stop syncio and normal IO and wait for everything to

	 * go quite.

	 * We increment barrier and nr_waiting, and then

	 * wait until nr_pending match nr_queued+1

	 * wait until nr_pending match nr_queued+extra

	 * This is called in the context of one normal IO request

	 * that has failed. Thus any sync request that might be pending

	 * will be blocked by nr_pending, and we need to wait for

	 * pending IO requests to complete or be queued for re-try.

	 * Thus the number queued (nr_queued) plus this request (1)

	 * Thus the number queued (nr_queued) plus this request (extra)

	 * must match the number of pending IOs (nr_pending) before

	 * we continue.

	 */
@@ -908,7 +908,7 @@ static void freeze_array(struct r1conf *conf) 
	conf->barrier++;

	conf->nr_waiting++;

	wait_event_lock_irq_cmd(conf->wait_barrier,

				conf->nr_pending == conf->nr_queued+1,

				conf->nr_pending == conf->nr_queued+extra,

				conf->resync_lock,

				flush_pending_writes(conf));

	spin_unlock_irq(&conf->resync_lock);
@@ -1568,8 +1568,8 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev) 
		 * we wait for all outstanding requests to complete.

		 */

		synchronize_sched();

		raise_barrier(conf);

		lower_barrier(conf);

		freeze_array(conf, 0);

		unfreeze_array(conf);

		clear_bit(Unmerged, &rdev->flags);

	}

	md_integrity_add_rdev(rdev, mddev);
@@ -1619,11 +1619,11 @@ static int raid1_remove_disk(struct mddev *mddev, struct md_rdev *rdev) 
			 */

			struct md_rdev *repl =

				conf->mirrors[conf->raid_disks + number].rdev;

			raise_barrier(conf);

			freeze_array(conf, 0);

			clear_bit(Replacement, &repl->flags);

			p->rdev = repl;

			conf->mirrors[conf->raid_disks + number].rdev = NULL;

			lower_barrier(conf);

			unfreeze_array(conf);

			clear_bit(WantReplacement, &rdev->flags);

		} else

			clear_bit(WantReplacement, &rdev->flags);
@@ -2240,7 +2240,7 @@ static void handle_read_error(struct r1conf *conf, struct r1bio *r1_bio) 
	 * frozen

	 */

	if (mddev->ro == 0) {

		freeze_array(conf);

		freeze_array(conf, 1);

		fix_read_error(conf, r1_bio->read_disk,

			       r1_bio->sector, r1_bio->sectors);

		unfreeze_array(conf);
@@ -3020,7 +3020,7 @@ static int raid1_reshape(struct mddev *mddev) 
		return -ENOMEM;

	}



	raise_barrier(conf);

	freeze_array(conf, 0);



	/* ok, everything is stopped */

	oldpool = conf->r1bio_pool;
@@ -3051,7 +3051,7 @@ static int raid1_reshape(struct mddev *mddev) 
	conf->raid_disks = mddev->raid_disks = raid_disks;

	mddev->delta_disks = 0;



	lower_barrier(conf);

	unfreeze_array(conf);



	set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);

	md_wakeup_thread(mddev->thread);

drivers/md/raid10.c

+7 −7
Original line number Diff line number Diff line
@@ -1065,17 +1065,17 @@ static void allow_barrier(struct r10conf *conf) 
	wake_up(&conf->wait_barrier);

}



static void freeze_array(struct r10conf *conf)

static void freeze_array(struct r10conf *conf, int extra)

{

	/* stop syncio and normal IO and wait for everything to

	 * go quiet.

	 * We increment barrier and nr_waiting, and then

	 * wait until nr_pending match nr_queued+1

	 * wait until nr_pending match nr_queued+extra

	 * This is called in the context of one normal IO request

	 * that has failed. Thus any sync request that might be pending

	 * will be blocked by nr_pending, and we need to wait for

	 * pending IO requests to complete or be queued for re-try.

	 * Thus the number queued (nr_queued) plus this request (1)

	 * Thus the number queued (nr_queued) plus this request (extra)

	 * must match the number of pending IOs (nr_pending) before

	 * we continue.

	 */
@@ -1083,7 +1083,7 @@ static void freeze_array(struct r10conf *conf) 
	conf->barrier++;

	conf->nr_waiting++;

	wait_event_lock_irq_cmd(conf->wait_barrier,

				conf->nr_pending == conf->nr_queued+1,

				conf->nr_pending == conf->nr_queued+extra,

				conf->resync_lock,

				flush_pending_writes(conf));
@@ -1849,8 +1849,8 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev) 
		 * we wait for all outstanding requests to complete.

		 */

		synchronize_sched();

		raise_barrier(conf, 0);

		lower_barrier(conf);

		freeze_array(conf, 0);

		unfreeze_array(conf);

		clear_bit(Unmerged, &rdev->flags);

	}

	md_integrity_add_rdev(rdev, mddev);
@@ -2646,7 +2646,7 @@ static void handle_read_error(struct mddev *mddev, struct r10bio *r10_bio) 
	r10_bio->devs[slot].bio = NULL;



	if (mddev->ro == 0) {

		freeze_array(conf);

		freeze_array(conf, 1);

		fix_read_error(conf, mddev, r10_bio);

		unfreeze_array(conf);

	} else

CRA Git | Maintained and supported by SUSTech CRA and CCSE