From patchwork Mon Dec 26 06:29:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 9488499 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 B35B362AAF 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 A510A2022C for ; Mon, 26 Dec 2016 06:30:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A2C7201F3; 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 375F32022C for ; Mon, 26 Dec 2016 06:30:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754947AbcLZGaU (ORCPT ); Mon, 26 Dec 2016 01:30:20 -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 S1752754AbcLZGaQ (ORCPT ); Mon, 26 Dec 2016 01:30:16 -0500 X-IronPort-AV: E=Sophos;i="5.20,367,1444665600"; d="scan'208";a="1036573" 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 9A76041B4BDC for ; Mon, 26 Dec 2016 14:29:43 +0800 (CST) From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH v2 05/19] btrfs-progs: Introduce wrapper to recover raid56 data Date: Mon, 26 Dec 2016 14:29:25 +0800 Message-Id: <20161226062939.5841-6-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: 9A76041B4BDC.AD3FE 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 wrapper to recover raid56 data. The logical is the same with kernel one, but with different interfaces, since kernel ones cares the performance while in btrfs we don't care that much. And the interface is more caller friendly inside btrfs-progs. Signed-off-by: Qu Wenruo --- kernel-lib/raid56.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++ kernel-lib/raid56.h | 11 ++++++++ 2 files changed, 88 insertions(+) diff --git a/kernel-lib/raid56.c b/kernel-lib/raid56.c index e078972b..e3a9339e 100644 --- a/kernel-lib/raid56.c +++ b/kernel-lib/raid56.c @@ -280,3 +280,80 @@ int raid6_recov_datap(int nr_devs, size_t stripe_len, int dest1, void **data) } return 0; } + +/* Original raid56 recovery wrapper */ +int raid56_recov(int nr_devs, size_t stripe_len, u64 profile, int dest1, + int dest2, void **data) +{ + int min_devs; + int ret; + + if (profile & BTRFS_BLOCK_GROUP_RAID5) + min_devs = 2; + else if (profile & BTRFS_BLOCK_GROUP_RAID6) + min_devs = 3; + else + return -EINVAL; + if (nr_devs < min_devs) + return -EINVAL; + + /* Nothing to recover */ + if (dest1 == -1 && dest2 == -1) + return 0; + + /* Reorder dest1/2, so only dest2 can be -1 */ + if (dest1 == -1) { + dest1 = dest2; + dest2 = -1; + } else if (dest2 != -1 && dest1 != -1) { + /* Reorder dest1/2, ensure dest2 > dest1 */ + if (dest1 > dest2) { + int tmp; + + tmp = dest2; + dest2 = dest1; + dest1 = tmp; + } + } + + if (profile & BTRFS_BLOCK_GROUP_RAID5) { + if (dest2 != -1) + return 1; + return raid5_gen_result(nr_devs, stripe_len, dest1, data); + } + + /* RAID6 one dev corrupted case*/ + if (dest2 == -1) { + /* Regenerate P/Q */ + if (dest1 == nr_devs - 1 || dest1 == nr_devs - 2) { + raid6_gen_syndrome(nr_devs, stripe_len, data); + return 0; + } + + /* Regerneate data from P */ + return raid5_gen_result(nr_devs - 1, stripe_len, dest1, data); + } + + /* P/Q bot corrupted */ + if (dest1 == nr_devs - 2 && dest2 == nr_devs - 1) { + raid6_gen_syndrome(nr_devs, stripe_len, data); + return 0; + } + + /* 2 Data corrupted */ + if (dest2 < nr_devs - 2) + return raid6_recov_data2(nr_devs, stripe_len, dest1, dest2, + data); + /* Data and P*/ + if (dest2 == nr_devs - 1) + return raid6_recov_datap(nr_devs, stripe_len, dest1, data); + + /* + * Final case, Data and Q, recover data first then regenerate Q + */ + ret = raid5_gen_result(nr_devs - 1, stripe_len, dest1, data); + if (ret < 0) + return ret; + raid6_gen_syndrome(nr_devs, stripe_len, data); + return 0; +} diff --git a/kernel-lib/raid56.h b/kernel-lib/raid56.h index e088279b..9aee39aa 100644 --- a/kernel-lib/raid56.h +++ b/kernel-lib/raid56.h @@ -44,4 +44,15 @@ int raid6_recov_data2(int nr_devs, size_t stripe_len, int dest1, int dest2, void **data); /* Recover data and P */ int raid6_recov_datap(int nr_devs, size_t stripe_len, int dest1, void **data); + +/* + * Recover raid56 data + * @dest1/2 can be -1 to indicate correct data + * + * Return >0 for unrecoverable case. + * Return 0 for recoverable case, And recovered data will be stored into @data + * Return <0 for fatal error + */ +int raid56_recov(int nr_devs, size_t stripe_len, u64 profile, int dest1, + int dest2, void **data); #endif