From patchwork Fri Sep 29 01:37:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 9977001 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 8B5C860365 for ; Fri, 29 Sep 2017 01:37:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D955297AF for ; Fri, 29 Sep 2017 01:37:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 72730297B1; Fri, 29 Sep 2017 01:37:27 +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,FREEMAIL_FROM, 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 DDF16297AF for ; Fri, 29 Sep 2017 01:37:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751456AbdI2BhZ (ORCPT ); Thu, 28 Sep 2017 21:37:25 -0400 Received: from mout.gmx.net ([212.227.17.20]:59407 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751344AbdI2BhX (ORCPT ); Thu, 28 Sep 2017 21:37:23 -0400 Received: from localhost.localdomain ([45.32.39.184]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0MTfZc-1doynT3W40-00QOva; Fri, 29 Sep 2017 03:37:16 +0200 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz, nborisov@suse.com Subject: [PATCH v2 5/5] btrfs: tree-checker: Enhance output for check_extent_data_item Date: Fri, 29 Sep 2017 10:37:02 +0900 Message-Id: <20170929013702.17814-6-quwenruo.btrfs@gmx.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170929013702.17814-1-quwenruo.btrfs@gmx.com> References: <20170929013702.17814-1-quwenruo.btrfs@gmx.com> X-Provags-ID: V03:K0:xLscmXHBdMkBNWxi5a9jb+/IXCXE6eCDGw0wW5nL3vGV95VpSOG OKc+4ZpmtS8dXS5Fj/PtJFyM7BW64ztS9E+v/gKhUi/rHrifWEdZZcW9Y+M8rkXsH5HWySx 2cqzinEDt+doFcid2uQWgyIibzP9vur03aV8wBkJgNozuQ5U6L3kQXgZ9dp3p6ut/3yq/Wh vAzDSGDO8MIPjwWtccnqg== X-UI-Out-Filterresults: notjunk:1; V01:K0:/zXgn3/n5+g=:S4Z09lmb0a9cbHfrhEPnrA mZMBNPMNY34IlI2gA5Fmu7vxv3LoH5zefAvvTASRrzltXwCYQaSN++gNulPfHQNOIXkRIl3g/ oTH7gAyka1IZR0jHY1lqSPQhlve6JtExpunzQ3tZWJ5lqKGjIREauTkg98WscLUplkBaTvKvF hONt5P1/7lv7so8vuCDaGkhZSxQu9b/ybZ1LywCjbci1+lgkbnqFdALxonTV3ph2DyQcBt2Jw YXlpaNaGhKRE353dUi1XVBQ8FJCbCkE2bqRmTGsVUz8V+z9LrLjJIoWLwqKmgLeqetUXGSGY7 F5pp1IKRt06vRIYKp+YSZos+zQKFcszILy+huQIx393VHaAcPZdfCFmeSs7aeOeMnmcElNYhV QOsw5ONNXXg1IEWTprbSHXzc/00i79Pk6Rk99hCImahqvcAjeFfZ9zIiztjyvpcESMlNK/DOY 1rrt3OXS8uSzisyc9ts+NXw+rDyHn2ioNyAM+wftvFIXktDogMTiNf/uLGNniqPH27g3iq10M VXrwPRSq9672GIIxDlLB3VWQlsAWqd1Icdeh6tnf1L2jyYFOG8GuW/RV9lhuKDnQBH45xlNmd FNQXWkkPDSF4p0qCwcmrifHIxd8cGLYC/vZdalNlgsTwyGWvbJQBBXBRb1TPuqqAj/eGjRjda Y+CRsa7jIupb433cWU61zPi59DkiQceZIU7QgMmKM4x+BAJ4fJAncWs8tF6V07KQcRX9vFabK 462ED83yLQyyeYTsDlwBeJkJFgU75Kxf6w7uZHq+6p2iHJuuCwPTsaDA1yjYdLBo9Z7oMk4W4 3zSub9nAjrsM0aJGycIwfQjj6KS3Q== 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 Output the invalid member name and its bad value, along with its expected value range or alignment. Signed-off-by: Qu Wenruo --- fs/btrfs/tree-checker.c | 98 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 70 insertions(+), 28 deletions(-) diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c index a5b743763362..9aeb5a288e2b 100644 --- a/fs/btrfs/tree-checker.c +++ b/fs/btrfs/tree-checker.c @@ -31,12 +31,6 @@ #include "disk-io.h" #include "compression.h" -#define CORRUPT(reason, eb, root, slot) \ - btrfs_crit(root->fs_info, \ - "corrupt %s, %s: block=%llu, root=%llu, slot=%d", \ - btrfs_header_level(eb) == 0 ? "leaf" : "node", \ - reason, btrfs_header_bytenr(eb), root->objectid, slot) - /* * Error message should follow the format below: * corrupt : , [, ] @@ -79,6 +73,47 @@ static void generic_err(const struct btrfs_root *root, va_end(args); } +/* + * Customized reporter for extent data item, since its key objectid and + * offset has its own meaning. + */ +__printf(4, 5) +static void file_extent_err(const struct btrfs_root *root, + const struct extent_buffer *eb, + int slot, const char *fmt, ...) +{ + struct btrfs_key key; + struct va_format vaf; + va_list args; + + btrfs_item_key_to_cpu(eb, &key, slot); + va_start(args, fmt); + + vaf.fmt = fmt; + vaf.va = &args; + + btrfs_crit(root->fs_info, + "corrupt %s: root=%llu block=%llu slot=%d ino=%llu file_offset=%llu, %pV", + btrfs_header_level(eb) == 0 ? "leaf" : "node", + root->objectid, btrfs_header_bytenr(eb), slot, + key.objectid, key.offset, &vaf); + va_end(args); +} + +/* + * Return 0 if the btrfs_file_extent_##name is aligned to @align + * Else return 1 + */ +#define CHECK_FI_ALIGN(root, leaf, slot, fi, name, align) \ +({ \ + if (!IS_ALIGNED(btrfs_file_extent_##name(leaf, fi), align)) \ + file_extent_err(root, leaf, slot, \ + "invalid %s for file extent, have %llu, should be aligned to %u",\ + #name, btrfs_file_extent_##name(leaf, fi), \ + align); \ + (!IS_ALIGNED(btrfs_file_extent_##name(leaf, fi), align)); \ +}) + static int check_extent_data_item(struct btrfs_root *root, struct extent_buffer *leaf, struct btrfs_key *key, int slot) @@ -88,15 +123,19 @@ static int check_extent_data_item(struct btrfs_root *root, u32 item_size = btrfs_item_size_nr(leaf, slot); if (!IS_ALIGNED(key->offset, sectorsize)) { - CORRUPT("unaligned key offset for file extent", - leaf, root, slot); + file_extent_err(root, leaf, slot, + "unaligned file_offset for file extent, have %llu should be aligned to %u", + key->offset, sectorsize); return -EUCLEAN; } fi = btrfs_item_ptr(leaf, slot, struct btrfs_file_extent_item); if (btrfs_file_extent_type(leaf, fi) > BTRFS_FILE_EXTENT_TYPES) { - CORRUPT("invalid file extent type", leaf, root, slot); + file_extent_err(root, leaf, slot, + "invalid type for file extent, have %u expect range [0, %u]", + btrfs_file_extent_type(leaf, fi), + BTRFS_FILE_EXTENT_TYPES); return -EUCLEAN; } @@ -105,18 +144,24 @@ static int check_extent_data_item(struct btrfs_root *root, * and must be caught in open_ctree(). */ if (btrfs_file_extent_compression(leaf, fi) > BTRFS_COMPRESS_TYPES) { - CORRUPT("invalid file extent compression", leaf, root, slot); + file_extent_err(root, leaf, slot, + "invalid compression for file extent, have %u expect range [0, %u]", + btrfs_file_extent_compression(leaf, fi), + BTRFS_COMPRESS_TYPES); return -EUCLEAN; } if (btrfs_file_extent_encryption(leaf, fi)) { - CORRUPT("invalid file extent encryption", leaf, root, slot); + file_extent_err(root, leaf, slot, + "invalid encryption for file extent, have %u expect 0", + btrfs_file_extent_encryption(leaf, fi)); return -EUCLEAN; } if (btrfs_file_extent_type(leaf, fi) == BTRFS_FILE_EXTENT_INLINE) { /* Inline extent must have 0 as key offset */ if (key->offset) { - CORRUPT("inline extent has non-zero key offset", - leaf, root, slot); + file_extent_err(root, leaf, slot, + "invalid file_offset for inline file extent, have %llu expect 0", + key->offset); return -EUCLEAN; } @@ -128,8 +173,10 @@ static int check_extent_data_item(struct btrfs_root *root, /* Uncompressed inline extent size must match item size */ if (item_size != BTRFS_FILE_EXTENT_INLINE_DATA_START + btrfs_file_extent_ram_bytes(leaf, fi)) { - CORRUPT("plaintext inline extent has invalid size", - leaf, root, slot); + file_extent_err(root, leaf, slot, + "invalid ram_bytes for uncompressed inline extent, have %u expect %llu", + item_size, BTRFS_FILE_EXTENT_INLINE_DATA_START + + btrfs_file_extent_ram_bytes(leaf, fi)); return -EUCLEAN; } return 0; @@ -137,22 +184,17 @@ static int check_extent_data_item(struct btrfs_root *root, /* Regular or preallocated extent has fixed item size */ if (item_size != sizeof(*fi)) { - CORRUPT( - "regluar or preallocated extent data item size is invalid", - leaf, root, slot); + file_extent_err(root, leaf, slot, + "invalid item size for reg/prealloc file extent, have %u expect %lu", + item_size, sizeof(*fi)); return -EUCLEAN; } - if (!IS_ALIGNED(btrfs_file_extent_ram_bytes(leaf, fi), sectorsize) || - !IS_ALIGNED(btrfs_file_extent_disk_bytenr(leaf, fi), sectorsize) || - !IS_ALIGNED(btrfs_file_extent_disk_num_bytes(leaf, fi), sectorsize) || - !IS_ALIGNED(btrfs_file_extent_offset(leaf, fi), sectorsize) || - !IS_ALIGNED(btrfs_file_extent_num_bytes(leaf, fi), sectorsize)) { - CORRUPT( - "regular or preallocated extent data item has unaligned value", - leaf, root, slot); + if (CHECK_FI_ALIGN(root, leaf, slot, fi, ram_bytes, sectorsize) || + CHECK_FI_ALIGN(root, leaf, slot, fi, disk_bytenr, sectorsize) || + CHECK_FI_ALIGN(root, leaf, slot, fi, disk_num_bytes, sectorsize) || + CHECK_FI_ALIGN(root, leaf, slot, fi, offset, sectorsize) || + CHECK_FI_ALIGN(root, leaf, slot, fi, num_bytes, sectorsize)) return -EUCLEAN; - } - return 0; }