Commit b0ac58c9 authored by Li Nan's avatar Li Nan Committed by Jialin Zhang
Browse files

md/raid10: fix incorrect done of recovery 

hulk inclusion
category: bugfix
bugzilla: 188535, https://gitee.com/openeuler/kernel/issues/I6O61Q


CVE: NA

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

Recovery will go to giveup and let chunks_skipped++ in raid10_sync_request
if there are some bad_blocks, and it will return max_sector when
chunks_skipped >= geo.raid_disks. Now, recovery fail and data is
inconsistent but user think recovery is done, it is wrong.

Fix it by set mirror's recovery_disabled and spare device shouln't be
added to here.

Signed-off-by: default avatarLi Nan <linan122@huawei.com>
Reviewed-by: default avatarHou Tao <houtao1@huawei.com>
parent 2de30b8f

drivers/md/raid10.c

+15 −1
Original line number Diff line number Diff line
@@ -2940,6 +2940,7 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, 
	int chunks_skipped = 0;

	sector_t chunk_mask = conf->geo.chunk_mask;

	int page_idx = 0;

	int error_disk = -1;



	/*

	 * Allow skipping a full rebuild for incremental assembly
@@ -3023,7 +3024,18 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, 
		return reshape_request(mddev, sector_nr, skipped);



	if (chunks_skipped >= conf->geo.raid_disks) {

		/* if there has been nothing to do on any drive,

		pr_err("md/raid10:%s: %s fail\n", mdname(mddev),

			test_bit(MD_RECOVERY_SYNC, &mddev->recovery) ?  "resync" : "recovery");

		if (error_disk >= 0 && !test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) {

			/*

			 * recovery fail, set mirrors.recovory_disabled,

			 * device shouldn't be added to there.

			 */

			conf->mirrors[error_disk].recovery_disabled = mddev->recovery_disabled;

			return 0;

		}

		/*

		 * if there has been nothing to do on any drive,

		 * then there is nothing to do at all..

		 */

		*skipped = 1;
@@ -3280,6 +3292,8 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, 
						       mdname(mddev));

					mirror->recovery_disabled

						= mddev->recovery_disabled;

				} else {

					error_disk = i;

				}

				put_buf(r10_bio);

				if (rb2)