From patchwork Mon Dec 26 06:29:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 9488497 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 975D462AAD for ; Mon, 26 Dec 2016 06:30:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87E4E201F3 for ; Mon, 26 Dec 2016 06:30:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C39C20265; Mon, 26 Dec 2016 06:30:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1725F201F3 for ; Mon, 26 Dec 2016 06:30:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754944AbcLZGaT (ORCPT ); Mon, 26 Dec 2016 01:30:19 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:2344 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754301AbcLZGaP (ORCPT ); Mon, 26 Dec 2016 01:30:15 -0500 X-IronPort-AV: E=Sophos;i="5.20,367,1444665600"; d="scan'208";a="1036571" Received: from unknown (HELO cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 26 Dec 2016 14:29:47 +0800 Received: from localhost.localdomain (unknown [10.167.226.34]) by cn.fujitsu.com (Postfix) with ESMTP id BD2F441B4BE1 for ; Mon, 26 Dec 2016 14:29:44 +0800 (CST) From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH v2 10/19] btrfs-progs: scrub: Introduce function to scrub mirror based tree block Date: Mon, 26 Dec 2016 14:29:30 +0800 Message-Id: <20161226062939.5841-11-quwenruo@cn.fujitsu.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161226062939.5841-1-quwenruo@cn.fujitsu.com> References: <20161226062939.5841-1-quwenruo@cn.fujitsu.com> MIME-Version: 1.0 X-yoursite-MailScanner-ID: BD2F441B4BE1.AF78B X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: quwenruo@cn.fujitsu.com Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Introduce a new function, scrub_tree_mirror(), to scrub mirror based tree blocks (Single/DUP/RAID0/1/10) This function can also be used on in-memory tree blocks using @data parameter. This is very handy for RAID5/6 case, either checking the data stripe tree block by @bytenr and 0 as @mirror, or using @data parameter for recovered in-memory data. Signed-off-by: Qu Wenruo --- disk-io.c | 4 ++-- disk-io.h | 2 ++ scrub.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 2 deletions(-) diff --git a/disk-io.c b/disk-io.c index 9140a81b..d5011572 100644 --- a/disk-io.c +++ b/disk-io.c @@ -51,8 +51,8 @@ static u32 max_nritems(u8 level, u32 nodesize) sizeof(struct btrfs_key_ptr)); } -static int check_tree_block(struct btrfs_fs_info *fs_info, - struct extent_buffer *buf) +int check_tree_block(struct btrfs_fs_info *fs_info, + struct extent_buffer *buf) { struct btrfs_fs_devices *fs_devices; diff --git a/disk-io.h b/disk-io.h index 4de9fef7..db883d57 100644 --- a/disk-io.h +++ b/disk-io.h @@ -119,6 +119,8 @@ static inline struct extent_buffer* read_tree_block( parent_transid); } +int check_tree_block(struct btrfs_fs_info *fs_info, + struct extent_buffer *buf); int read_extent_data(struct btrfs_root *root, char *data, u64 logical, u64 *len, int mirror); void readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize, diff --git a/scrub.c b/scrub.c index c9ca817e..4cf678fb 100644 --- a/scrub.c +++ b/scrub.c @@ -118,3 +118,75 @@ static struct scrub_full_stripe *alloc_full_stripe(int nr_stripes, } return ret; } + +static inline int is_data_stripe(struct scrub_stripe *stripe) +{ + u64 bytenr = stripe->logical; + + if (bytenr == BTRFS_RAID5_P_STRIPE || bytenr == BTRFS_RAID6_Q_STRIPE) + return 0; + return 1; +} + +/* + * Scrub one tree mirror given by @bytenr and @mirror, or @data. + * If @data is not given(NULL), the function will try to read out tree block + * using @bytenr and @mirror. + * If @data is given, use data directly, won't try to read from disk. + * + * The extra @data prameter is handy for RAID5/6 recovery code to verify + * the recovered data. + * + * Return 0 if everything is OK. + * Return <0 something goes wrong, and @scrub_ctx accounting will be updated + * if it's a data corruption. + */ +static int scrub_tree_mirror(struct btrfs_fs_info *fs_info, + struct btrfs_scrub_progress *scrub_ctx, + char *data, u64 bytenr, int mirror) +{ + struct extent_buffer *eb; + u32 nodesize = fs_info->tree_root->nodesize; + int ret; + + if (!IS_ALIGNED(bytenr, fs_info->tree_root->sectorsize)) { + /* Such error will be reported by check_tree_block() */ + scrub_ctx->verify_errors++; + return -EIO; + } + + eb = btrfs_find_create_tree_block(fs_info, bytenr, nodesize); + if (!eb) + return -ENOMEM; + if (data) { + memcpy(eb->data, data, nodesize); + } else { + ret = read_whole_eb(fs_info, eb, mirror); + if (ret) { + scrub_ctx->read_errors++; + error("failed to read tree block %llu mirror %d", + bytenr, mirror); + goto out; + } + } + + scrub_ctx->tree_bytes_scrubbed += nodesize; + if (csum_tree_block(fs_info->tree_root, eb, 1)) { + error("tree block %llu mirror %d checksum mismatch", bytenr, + mirror); + scrub_ctx->csum_errors++; + ret = -EIO; + goto out; + } + ret = check_tree_block(fs_info, eb); + if (ret < 0) { + error("tree block %llu mirror %d is invalid", bytenr, mirror); + scrub_ctx->verify_errors++; + goto out; + } + + scrub_ctx->tree_extents_scrubbed++; +out: + free_extent_buffer(eb); + return ret; +}