Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e62e58a5 authored by NeilBrown's avatar NeilBrown
Browse files

md: use interruptible wait when duration is controlled by userspace. 



User space can set various limits on an md array so that resync waits
when it gets to a certain point, or so that I/O is blocked for a short
while.
When md is waiting against one of these limit, it should use an
interruptible wait so as not to add to the load average, and so are
not to trigger a warning if the wait goes on for too long.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent a5c308d4

drivers/md/md.c

+10 −4
Original line number Diff line number Diff line
@@ -6336,10 +6336,16 @@ void md_do_sync(mddev_t *mddev) 
			sysfs_notify(&mddev->kobj, NULL, "sync_completed");

		}



		if (j >= mddev->resync_max)

			wait_event(mddev->recovery_wait,

		while (j >= mddev->resync_max && !kthread_should_stop()) {

			/* As this condition is controlled by user-space,

			 * we can block indefinitely, so use '_interruptible'

			 * to avoid triggering warnings.

			 */

			flush_signals(current); /* just in case */

			wait_event_interruptible(mddev->recovery_wait,

						 mddev->resync_max > j

						 || kthread_should_stop());

		}



		if (kthread_should_stop())

			goto interrupted;

drivers/md/raid5.c

+11 −4
Original line number Diff line number Diff line
@@ -3699,13 +3699,20 @@ static int make_request(struct request_queue *q, struct bio * bi) 
					goto retry;

				}

			}

			/* FIXME what if we get a false positive because these

			 * are being updated.

			 */



			if (bio_data_dir(bi) == WRITE &&

			    logical_sector >= mddev->suspend_lo &&

			    logical_sector < mddev->suspend_hi) {

				release_stripe(sh);

				/* As the suspend_* range is controlled by

				 * userspace, we want an interruptible

				 * wait.

				 */

				flush_signals(current);

				prepare_to_wait(&conf->wait_for_overlap,

						&w, TASK_INTERRUPTIBLE);

				if (logical_sector >= mddev->suspend_lo &&

				    logical_sector < mddev->suspend_hi)

					schedule();

				goto retry;

			}