From patchwork Sat Jan 13 08:37:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 13518898 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 00DC57E6 for ; Sat, 13 Jan 2024 08:37:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="stjxJXr/"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="stjxJXr/" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 23B97222D2 for ; Sat, 13 Jan 2024 08:37:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1705135045; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=yDd+ndzzKF3loPCFyhiLwtcmuvQE78xDG17K9Zx4i7o=; b=stjxJXr/CNthSp+XmgJCHfzpfFX3YXbhgt3fz28ztthFXL7lrJhMPntEae0F3rg5c4Tz75 wY9bh8W6NHP+9PFOxwPBvx7xjBVzSoa9Tcf+SLgmrdL34i4Bc1GRSZf2bhO0NvJ8s3Mgkm PtLL0QWIQG3HdkTh9nmUdTX7irCYlyo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1705135045; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=yDd+ndzzKF3loPCFyhiLwtcmuvQE78xDG17K9Zx4i7o=; b=stjxJXr/CNthSp+XmgJCHfzpfFX3YXbhgt3fz28ztthFXL7lrJhMPntEae0F3rg5c4Tz75 wY9bh8W6NHP+9PFOxwPBvx7xjBVzSoa9Tcf+SLgmrdL34i4Bc1GRSZf2bhO0NvJ8s3Mgkm PtLL0QWIQG3HdkTh9nmUdTX7irCYlyo= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 6100113676 for ; Sat, 13 Jan 2024 08:37:24 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap1.dmz-prg2.suse.org with ESMTPSA id +mhBCcRLomWvdwAAD6G6ig (envelope-from ) for ; Sat, 13 Jan 2024 08:37:24 +0000 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH v2] btrfs-progs: convert-ext2: insert a dummy inode item before inode ref Date: Sat, 13 Jan 2024 19:07:06 +1030 Message-ID: <6e1e07ad53a9e716be28e4d505042a50c1676254.1705134953.git.wqu@suse.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; none X-Spam-Level: X-Spam-Score: 0.70 X-Spamd-Result: default: False [0.70 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[linux-btrfs@vger.kernel.org]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Flag: NO [BUG] There is a report about failed btrfs-convert, which shows the following error: Create btrfs metadata corrupt leaf: root=5 block=5001931145216 slot=1 ino=89911763, invalid previous key objectid, have 89911762 expect 89911763 leaf 5001931145216 items 336 free space 7 generation 90 owner FS_TREE leaf 5001931145216 flags 0x1(WRITTEN) backref revision 1 fs uuid 8b69f018-37c3-4b30-b859-42ccfcbe2449 chunk uuid 448ce78c-ea41-49f6-99dc-46ad80b93da9 item 0 key (89911762 INODE_REF 3858733) itemoff 16222 itemsize 61 index 171 namelen 51 name: [FILENAME1] item 1 key (89911763 INODE_REF 3858733) itemoff 16161 itemsize 61 index 103 namelen 51 name: [FILENAME2] [CAUSE] When iterating a directory, btrfs-convert would insert the DIR_ITEMs, along with the INODE_REF of that inode. This leads to above stray INODE_REFs, and trigger the tree-checker. This can only happen for large fs, as for most cases we have all these modified tree blocks cached, thus tree-checker won't be triggered. But when the tree block cache is not hit, and we have to read from disk, then such behavior can lead to above tree-checker error. [FIX] Insert a dummy INODE_ITEM for the INODE_REF first, the inode items would be updated when iterating the child inode of the directory. Issue: #731 Signed-off-by: Qu Wenruo --- check/mode-common.h | 15 --------------- common/utils.h | 16 ++++++++++++++++ convert/source-ext2.c | 30 ++++++++++++++++++++---------- convert/source-fs.c | 20 ++++++++++++++++++++ 4 files changed, 56 insertions(+), 25 deletions(-) --- Changelog: v2: - Initialized dummy inodes' mode/generation/transid As the mode can still trigger tree-checker warnings. -- 2.43.0 diff --git a/check/mode-common.h b/check/mode-common.h index 894bbbb8141b..80672e51e870 100644 --- a/check/mode-common.h +++ b/check/mode-common.h @@ -167,21 +167,6 @@ static inline bool is_valid_imode(u32 imode) int recow_extent_buffer(struct btrfs_root *root, struct extent_buffer *eb); -static inline u32 btrfs_type_to_imode(u8 type) -{ - static u32 imode_by_btrfs_type[] = { - [BTRFS_FT_REG_FILE] = S_IFREG, - [BTRFS_FT_DIR] = S_IFDIR, - [BTRFS_FT_CHRDEV] = S_IFCHR, - [BTRFS_FT_BLKDEV] = S_IFBLK, - [BTRFS_FT_FIFO] = S_IFIFO, - [BTRFS_FT_SOCK] = S_IFSOCK, - [BTRFS_FT_SYMLINK] = S_IFLNK, - }; - - return imode_by_btrfs_type[(type)]; -} - int get_extent_item_generation(u64 bytenr, u64 *gen_ret); /* diff --git a/common/utils.h b/common/utils.h index e267814b08a8..dcd817144f9c 100644 --- a/common/utils.h +++ b/common/utils.h @@ -22,6 +22,7 @@ #include "kerncompat.h" #include #include +#include #include "kernel-lib/list.h" #include "kernel-shared/volumes.h" #include "common/fsfeatures.h" @@ -40,6 +41,21 @@ enum exclusive_operation { BTRFS_EXCLOP_UNKNOWN = -1, }; +static inline u32 btrfs_type_to_imode(u8 type) +{ + static u32 imode_by_btrfs_type[] = { + [BTRFS_FT_REG_FILE] = S_IFREG, + [BTRFS_FT_DIR] = S_IFDIR, + [BTRFS_FT_CHRDEV] = S_IFCHR, + [BTRFS_FT_BLKDEV] = S_IFBLK, + [BTRFS_FT_FIFO] = S_IFIFO, + [BTRFS_FT_SOCK] = S_IFSOCK, + [BTRFS_FT_SYMLINK] = S_IFLNK, + }; + + return imode_by_btrfs_type[(type)]; +} + /* 2 for "0x", 2 for each byte, plus nul */ #define BTRFS_CSUM_STRING_LEN (2 + 2 * BTRFS_CSUM_SIZE + 1) void btrfs_format_csum(u16 csum_type, const u8 *data, char *output); diff --git a/convert/source-ext2.c b/convert/source-ext2.c index 7e93b0901489..f56d79734715 100644 --- a/convert/source-ext2.c +++ b/convert/source-ext2.c @@ -857,6 +857,10 @@ static int ext2_copy_single_inode(struct btrfs_trans_handle *trans, struct btrfs_key inode_key; struct btrfs_path path = { 0 }; + inode_key.objectid = objectid; + inode_key.type = BTRFS_INODE_ITEM_KEY; + inode_key.offset = 0; + if (ext2_inode->i_links_count == 0) return 0; @@ -878,13 +882,23 @@ static int ext2_copy_single_inode(struct btrfs_trans_handle *trans, ext2_convert_inode_flags(&btrfs_inode, ext2_inode); /* - * The inode item must be inserted before any file extents/dir items/xattrs, - * or we may trigger tree-checker. (File extents/dir items/xattrs require - * the previous item has the same key objectid). + * The inode may already be created (with dummy contents), in that + * case we don't need to do anything yet. + * The inode item would be updated at the end anyway. */ - ret = btrfs_insert_inode(trans, root, objectid, &btrfs_inode); - if (ret < 0) - return ret; + ret = btrfs_lookup_inode(trans, root, &path, &inode_key, 1); + btrfs_release_path(&path); + if (ret > 0) { + /* + * No inode item yet, the inode item must be inserted before + * any file extents/dir items/xattrs, or we may trigger + * tree-checker. (File extents/dir items/xattrs require the + * previous item has the same key objectid). + */ + ret = btrfs_insert_inode(trans, root, objectid, &btrfs_inode); + if (ret < 0) + return ret; + } switch (ext2_inode->i_mode & S_IFMT) { case S_IFREG: @@ -917,10 +931,6 @@ static int ext2_copy_single_inode(struct btrfs_trans_handle *trans, * Update the inode item, as above insert never updates the inode's * nbytes and size. */ - inode_key.objectid = objectid; - inode_key.type = BTRFS_INODE_ITEM_KEY; - inode_key.offset = 0; - ret = btrfs_lookup_inode(trans, root, &path, &inode_key, 1); if (ret > 0) ret = -ENOENT; diff --git a/convert/source-fs.c b/convert/source-fs.c index fe1ff7d0d795..66561438866e 100644 --- a/convert/source-fs.c +++ b/convert/source-fs.c @@ -23,6 +23,8 @@ #include "kernel-shared/ctree.h" #include "kernel-shared/disk-io.h" #include "kernel-shared/volumes.h" +#include "kernel-shared/transaction.h" +#include "common/utils.h" #include "common/internal.h" #include "common/messages.h" #include "common/extent-cache.h" @@ -183,6 +185,7 @@ int convert_insert_dirent(struct btrfs_trans_handle *trans, { int ret; u64 inode_size; + struct btrfs_inode_item dummy_iitem = { 0 }; struct btrfs_key location = { .objectid = objectid, .offset = 0, @@ -193,6 +196,23 @@ int convert_insert_dirent(struct btrfs_trans_handle *trans, dir, &location, file_type, index_cnt); if (ret) return ret; + + btrfs_set_stack_inode_mode(&dummy_iitem, btrfs_type_to_imode(file_type)); + btrfs_set_stack_inode_generation(&dummy_iitem, trans->transid); + btrfs_set_stack_inode_transid(&dummy_iitem, trans->transid); + /* + * We must have an INOTE_ITEM before INODE_REF, or tree-checker won't + * be happy. + * The content of the INODE_ITEM would be properly updated when iterating + * that child inode, but we should still try to make it as valid as + * possible, or we may still trigger some tree checker. + */ + ret = btrfs_insert_inode(trans, root, objectid, &dummy_iitem); + /* The inode item is already there, just skip it. */ + if (ret == -EEXIST) + ret = 0; + if (ret < 0) + return ret; ret = btrfs_insert_inode_ref(trans, root, name, name_len, objectid, dir, index_cnt); if (ret)