From patchwork Wed Feb 15 01:39:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 9573177 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 3A4A8600F6 for ; Wed, 15 Feb 2017 01:39:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A90628346 for ; Wed, 15 Feb 2017 01:39:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E9F528450; Wed, 15 Feb 2017 01:39:36 +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 7231228346 for ; Wed, 15 Feb 2017 01:39:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751583AbdBOBj3 (ORCPT ); Tue, 14 Feb 2017 20:39:29 -0500 Received: from cn.fujitsu.com ([59.151.112.132]:17393 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1750902AbdBOBj0 (ORCPT ); Tue, 14 Feb 2017 20:39:26 -0500 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="15595266" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 15 Feb 2017 09:39:18 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 88CA047D8AB4; Wed, 15 Feb 2017 09:39:13 +0800 (CST) Received: from localhost.localdomain (10.167.226.34) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 15 Feb 2017 09:39:13 +0800 From: Qu Wenruo To: CC: , Subject: [PATCH v3] btrfs: relocation: Enhance kernel error output for relocation Date: Wed, 15 Feb 2017 09:39:05 +0800 Message-ID: <20170215013905.17677-1-quwenruo@cn.fujitsu.com> X-Mailer: git-send-email 2.11.1 MIME-Version: 1.0 X-Originating-IP: [10.167.226.34] X-yoursite-MailScanner-ID: 88CA047D8AB4.AED96 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 When balance(relocation) fails, btrfs-progs will report like: ERROR: error during balancing '/mnt/scratch': Input/output error There may be more info in syslog - try dmesg | tail However kernel can't provide may useful info in many cases to locate the problem. This patch will add error messages in relocation to help user and developer to locate the problem. Signed-off-by: Qu Wenruo --- v2: Fix typo where 'err' and 'ret' are used wrong. v3: Add space between error number and parenthesis of error string Fix gramma errors. --- fs/btrfs/relocation.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 4 deletions(-) diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 379711048fb0..6de5800e17bc 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -4011,6 +4011,8 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) rc->block_rsv, rc->block_rsv->size, BTRFS_RESERVE_FLUSH_ALL); if (ret) { + btrfs_err(fs_info, "failed to reserve space: %d (%s)", + ret, btrfs_decode_error(ret)); err = ret; break; } @@ -4019,6 +4021,9 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) if (IS_ERR(trans)) { err = PTR_ERR(trans); trans = NULL; + btrfs_err(fs_info, + "failed to start transaction: %d (%s)", + err, btrfs_decode_error(err)); break; } restart: @@ -4028,8 +4033,12 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) } ret = find_next_extent(rc, path, &key); - if (ret < 0) + if (ret < 0) { + btrfs_err(fs_info, + "failed to find next extent: %d (%s)", + ret, btrfs_decode_error(ret)); err = ret; + } if (ret != 0) break; @@ -4081,9 +4090,17 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) if (flags & BTRFS_EXTENT_FLAG_TREE_BLOCK) { ret = add_tree_block(rc, &key, path, &blocks); + if (ret < 0) + btrfs_err(fs_info, + "failed to record tree block: %d (%s)", + ret, btrfs_decode_error(ret)); } else if (rc->stage == UPDATE_DATA_PTRS && (flags & BTRFS_EXTENT_FLAG_DATA)) { ret = add_data_references(rc, &key, path, &blocks); + if (ret < 0) + btrfs_err(fs_info, + "failed to record data extent: %d (%s)", + ret, btrfs_decode_error(ret)); } else { btrfs_release_path(path); ret = 0; @@ -4103,6 +4120,9 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) rc->backref_cache.last_trans = trans->transid - 1; if (ret != -EAGAIN) { + btrfs_err(fs_info, + "failed to relocate tree blocks: %d (%s)", + ret, btrfs_decode_error(ret)); err = ret; break; } @@ -4121,6 +4141,9 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) ret = relocate_data_extent(rc->data_inode, &key, &rc->cluster); if (ret < 0) { + btrfs_err(fs_info, + "failed to relocate data extent: %d (%s)", + ret, btrfs_decode_error(ret)); err = ret; break; } @@ -4147,8 +4170,12 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) if (!err) { ret = relocate_file_extent_cluster(rc->data_inode, &rc->cluster); - if (ret < 0) + if (ret < 0) { + btrfs_err(fs_info, + "failed to relocate file extent cluster: %d (%s)", + ret, btrfs_decode_error(ret)); err = ret; + } } rc->create_reloc_tree = 0; @@ -4158,6 +4185,10 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) btrfs_block_rsv_release(fs_info, rc->block_rsv, (u64)-1); err = prepare_to_merge(rc, err); + if (err < 0) + btrfs_err(fs_info, + "failed to prepare merging of relocation trees: %d (%s)", + err, btrfs_decode_error(err)); merge_reloc_roots(rc); @@ -4336,6 +4367,9 @@ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start) ret = btrfs_inc_block_group_ro(extent_root, rc->block_group); if (ret) { + btrfs_err(fs_info, + "failed to set block group read-only: %d (%s)", + ret, btrfs_decode_error(ret)); err = ret; goto out; } @@ -4351,10 +4385,19 @@ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start) path); btrfs_free_path(path); - if (!IS_ERR(inode)) + if (!IS_ERR(inode)) { ret = delete_block_group_cache(fs_info, rc->block_group, inode, 0); - else + if (ret < 0) + btrfs_err(fs_info, + "failed to delete block group cache: %d (%s)", + ret, btrfs_decode_error(ret)); + } else { ret = PTR_ERR(inode); + if (ret < 0 && ret != -ENOENT) + btrfs_err(fs_info, + "failed to lookup free space inode: %d (%s)", + ret, btrfs_decode_error(ret)); + } if (ret && ret != -ENOENT) { err = ret; @@ -4364,6 +4407,8 @@ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start) rc->data_inode = create_reloc_inode(fs_info, rc->block_group); if (IS_ERR(rc->data_inode)) { err = PTR_ERR(rc->data_inode); + btrfs_err(fs_info, "failed to create relocation inode: %d (%s)", + err, btrfs_decode_error(err)); rc->data_inode = NULL; goto out; } @@ -4394,6 +4439,9 @@ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start) ret = btrfs_wait_ordered_range(rc->data_inode, 0, (u64)-1); if (ret) { + btrfs_err(fs_info, + "failed to wait ordered range: %d (%s)", + ret, btrfs_decode_error(ret)); err = ret; goto out; } @@ -4407,6 +4455,11 @@ int btrfs_relocate_block_group(struct btrfs_fs_info *fs_info, u64 group_start) WARN_ON(rc->block_group->reserved > 0); WARN_ON(btrfs_block_group_used(&rc->block_group->item) > 0); out: + if (err < 0) + btrfs_err(fs_info, + "failed to relocate block group %llu: %d (%s)", + rc->block_group->key.objectid, err, + btrfs_decode_error(err)); if (err && rw) btrfs_dec_block_group_ro(rc->block_group); iput(rc->data_inode);