Commit 01acfe8d authored by Yu Kuai's avatar Yu Kuai Committed by Jialin Zhang
Browse files

md: fix soft lockup in status_resync

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6JN1I


CVE: NA

--------------------------------

status_resync() will calculate 'curr_resync - recovery_active' to show
user a progress bar like following:

[============>........]  resync = 61.4%

'curr_resync' and 'recovery_active' is updated in md_do_sync(), and
status_resync() can read them concurrently, hence it's possible that
'curr_resync - recovery_active' can overflow to a huge number. In this
case status_resync() will be stuck in the loop to print a large amount
of '=', which will end up soft lockup.

Fix the problem by setting 'resync' to MD_RESYNC_ACTIVE in this case,
this way resync in progress will be reported to user.

Signed-off-by: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarHou Tao <houtao1@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent 02858fe9
Loading
Loading
Loading
Loading
+9 −9
Original line number Diff line number Diff line
@@ -8076,16 +8076,16 @@ static int status_resync(struct seq_file *seq, struct mddev *mddev)
	} else if (resync > max_sectors) {
		resync = max_sectors;
	} else {
		resync -= atomic_read(&mddev->recovery_active);
		if (resync < MD_RESYNC_ACTIVE) {
		res = atomic_read(&mddev->recovery_active);
		/*
			 * Resync has started, but the subtraction has
			 * yielded one of the special values. Force it
			 * to active to ensure the status reports an
			 * active resync.
		 * Resync has started, but the subtraction has overflowed or
		 * yielded one of the special values. Force it to active to
		 * ensure the status reports an active resync.
		 */
		if (resync < res || resync - res < MD_RESYNC_ACTIVE)
			resync = MD_RESYNC_ACTIVE;
		}
		else
			resync -= res;
	}

	if (resync == MD_RESYNC_NONE) {