Commit 762221f0 authored by Liu Bo's avatar Liu Bo Committed by David Sterba
Browse files

Btrfs: fix scrub to repair raid6 corruption 

The raid6 corruption is that,
suppose that all disks can be read without problems and if the content
that was read out doesn't match its checksum, currently for raid6
btrfs at most retries twice,

- the 1st retry is to rebuild with all other stripes, it'll eventually
  be a raid5 xor rebuild,
- if the 1st fails, the 2nd retry will deliberately fail parity p so
  that it will do raid6 style rebuild,

however, the chances are that another non-parity stripe content also
has something corrupted, so that the above retries are not able to
return correct content.

We've fixed normal reads to rebuild raid6 correctly with more retries
in Patch "Btrfs: make raid6 rebuild retry more"[1], this is to fix
scrub to do the exactly same rebuild process.

[1]: https://patchwork.kernel.org/patch/10091755/



Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 6528b99d

fs/btrfs/scrub.c

+32 −12
Original line number Diff line number Diff line
@@ -301,6 +301,11 @@ static void __scrub_blocked_if_needed(struct btrfs_fs_info *fs_info); 
static void scrub_blocked_if_needed(struct btrfs_fs_info *fs_info);

static void scrub_put_ctx(struct scrub_ctx *sctx);



static inline int scrub_is_page_on_raid56(struct scrub_page *page)

{

	return page->recover &&

	       (page->recover->bbio->map_type & BTRFS_BLOCK_GROUP_RAID56_MASK);

}



static void scrub_pending_bio_inc(struct scrub_ctx *sctx)

{
@@ -1323,15 +1328,34 @@ nodatasum_case: 
	 * could happen otherwise that a correct page would be

	 * overwritten by a bad one).

	 */

	for (mirror_index = 0;

	     mirror_index < BTRFS_MAX_MIRRORS &&

	     sblocks_for_recheck[mirror_index].page_count > 0;

	     mirror_index++) {

	for (mirror_index = 0; ;mirror_index++) {

		struct scrub_block *sblock_other;



		if (mirror_index == failed_mirror_index)

			continue;



		/* raid56's mirror can be more than BTRFS_MAX_MIRRORS */

		if (!scrub_is_page_on_raid56(sblock_bad->pagev[0])) {

			if (mirror_index >= BTRFS_MAX_MIRRORS)

				break;

			if (!sblocks_for_recheck[mirror_index].page_count)

				break;



			sblock_other = sblocks_for_recheck + mirror_index;

		} else {

			struct scrub_recover *r = sblock_bad->pagev[0]->recover;

			int max_allowed = r->bbio->num_stripes -

						r->bbio->num_tgtdevs;



			if (mirror_index >= max_allowed)

				break;

			if (!sblocks_for_recheck[1].page_count)

				break;



			ASSERT(failed_mirror_index == 0);

			sblock_other = sblocks_for_recheck + 1;

			sblock_other->pagev[0]->mirror_num = 1 + mirror_index;

		}



		/* build and submit the bios, check checksums */

		scrub_recheck_block(fs_info, sblock_other, 0);
@@ -1671,26 +1695,22 @@ static void scrub_bio_wait_endio(struct bio *bio) 
	complete(bio->bi_private);

}



static inline int scrub_is_page_on_raid56(struct scrub_page *page)

{

	return page->recover &&

	       (page->recover->bbio->map_type & BTRFS_BLOCK_GROUP_RAID56_MASK);

}



static int scrub_submit_raid56_bio_wait(struct btrfs_fs_info *fs_info,

					struct bio *bio,

					struct scrub_page *page)

{

	DECLARE_COMPLETION_ONSTACK(done);

	int ret;

	int mirror_num;



	bio->bi_iter.bi_sector = page->logical >> 9;

	bio->bi_private = &done;

	bio->bi_end_io = scrub_bio_wait_endio;



	mirror_num = page->sblock->pagev[0]->mirror_num;

	ret = raid56_parity_recover(fs_info, bio, page->recover->bbio,

				    page->recover->map_length,

				    page->mirror_num, 0);

				    mirror_num, 0);

	if (ret)

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE