From patchwork Fri Sep 29 06:48:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 9977129 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 7B7E160365 for ; Fri, 29 Sep 2017 06:49:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E61C29761 for ; Fri, 29 Sep 2017 06:49:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 62D0A2976B; Fri, 29 Sep 2017 06:49:11 +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 D329229761 for ; Fri, 29 Sep 2017 06:49:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752007AbdI2GtI (ORCPT ); Fri, 29 Sep 2017 02:49:08 -0400 Received: from mout.gmx.net ([212.227.17.22]:58996 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750899AbdI2GtH (ORCPT ); Fri, 29 Sep 2017 02:49:07 -0400 Received: from localhost.localdomain ([104.207.157.105]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0LjvV7-1dM0NW3ExV-00bvX0; Fri, 29 Sep 2017 08:49:00 +0200 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz, nborisov@suse.com Subject: [PATCH v3 5/5] btrfs: tree-checker: Enhance output for check_extent_data_item Date: Fri, 29 Sep 2017 06:48:49 +0000 Message-Id: <20170929064849.15086-6-quwenruo.btrfs@gmx.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20170929064849.15086-1-quwenruo.btrfs@gmx.com> References: <20170929064849.15086-1-quwenruo.btrfs@gmx.com> X-Provags-ID: V03:K0:X3Qf/uumiHRr12Bu4D7FrR6yeOp4tYROY7icMgfQMvHwIupgITX 56q3FkGZbKo4yRtfkxyy9+Pha4sJHh5du0T+ZZBDMFV9FFe5j1f3iRN9+3xD4GHTm9tiZHQ dWfCM3x7H8B/CwqzBXj8qboWJbT+y6lvfFUHAF3urej71i+yB+vATWr1hM3Hxbdoi4sM4ef 2wpahYK8cwx57BYzPVpGA== X-UI-Out-Filterresults: notjunk:1; V01:K0:56BnjEEdH9Q=:0/yYGpJNNxq0r1UVW71poq VnWYbsXkAWFbhQKU6fW13DSZPD5hFQ3DwuZdfWFhC1klAgBdajQKkVr/i0h+d7BWd9PK1FGpG Tj8nMg/QY4EnC3KJ+400eCdeB62DO3f+ctBLqddkYJDJyVwqbLPdfJ9RIi/6DJz7C6B7gKB9e I+AlAcIdsvJXQgQiFNW6jyoGs7SeGZ1svesQ/gVZBYVmXnzj7G0nWpdc/uwyyc/tnW3zU2vG8 iov9Jq5k+LJn1+dRAJN77BVjikV509bA6g9q4E6J/7jQmuSJUHq1XAC1dP22xGD90feiGmwF3 QbXjHGCrKGsw3gZ8suZSsBnwxWb3eSPS/rmMyGU0CPyXbREbn5BWlFQKdZnywxetMTfdpi9KL +aQwl8tzd5tg71gwKXmN06Gl+2m/RVJW3wG2kF/aahXFYj/hdfKweEY+I1jben7TpDQNIMoZm JapMYQHrS5mOdFDjL4KVAv3KZ9/R8eRaAAfPzTqF2yEuiaMWbOQjNwByT4MBlc5ZyaVGBwmnG NKMgj3dJXmjvDYkCc4upXyFfNmGyGwU1zaHZe9nrlr6mirwKCQd3cARb2AqykSnocP4ej+8AS MxQKCKjKuHkvZmhiuCfqIV6QBMKSCEndlBfKgKkQyJJlU0bc+yc8iXKXaQ2dWvJxnigYbYHw6 kN9QG9TE9E0cyiDQAugAM8snQEaBlqiFKSWSQUN+r6k3jbsmNX85pdtlmluPZi0UpuwJdNV0H Xw7j5a16NWYo6wp0xAOW1GG3rD10ziN58YyKrASocuAEevDgefU1dZISgmlPulTwzMbkCDtCb MDKBfP0raSGwJmfAyKLGoYjQsZ9aw== 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 c0fd192f8140..d546c723069e 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; }