From: Nikolay Borisov <nborisov@suse.com>
To: Qu Wenruo <quwenruo.btrfs@gmx.com>, WenRuo Qu <wqu@suse.com>,
linux-btrfs@vger.kernel.org
Subject: Re: [PATCH v2 3/6] btrfs-progs: check/common: Make repair_imode_common() to handle inodes in subvolume trees
Date: Wed, 11 Sep 2019 15:27:37 +0300 [thread overview]
Message-ID: <b7ccda0e-55e4-85be-0c97-b9f80fad4862@suse.com> (raw)
In-Reply-To: <9ab43823-0649-f277-5b19-224aa66f781e@gmx.com>
On 11.09.19 г. 3:39 ч., Qu Wenruo wrote:
> [...]
>>> - Search for DIR_INDEX/DIR_ITEM
>>> If above search fails, we falls back to locate the DIR_INDEX/DIR_ITEM
>>> just after the INODE_ITEM.
>>> If any can be found, it's definitely a directory.
>>
>> This needs an explicit satement that it will only work for non-empty files and directories
>
> Indeed.
>
>>>
>>> - Search for EXTENT_DATA
>>> If EXTENT_DATA can be found, it's either REG or LNK.
>>> For this case, we default to REG, as user can inspect the file to
>>> determine if it's a file or just a path.
>>>
>>> - Use rdev to detect BLK/CHR
>>> If all above fails, but INODE_ITEM has non-zero rdev, then it's either
>>> a BLK or CHR file. Then we default to BLK.
>>>
>>> - Fail out if none of above methods succeeded
>>> No educated guess to make things worse.
>>>
>>> Signed-off-by: Qu Wenruo <wqu@suse.com>
>>> ---
>>> check/mode-common.c | 130 +++++++++++++++++++++++++++++++++++++++-----
>>> 1 file changed, 117 insertions(+), 13 deletions(-)
>>>
>>> diff --git a/check/mode-common.c b/check/mode-common.c
>>> index c0ddc50a1dd0..abea2ceda4c4 100644
>>> --- a/check/mode-common.c
>>> +++ b/check/mode-common.c
>>> @@ -935,6 +935,113 @@ out:
>>> return ret;
>>> }
>>>
>>> +static int detect_imode(struct btrfs_root *root, struct btrfs_path *path,
>>> + u32 *imode_ret)
>>> +{
>>> + struct btrfs_key key;
>>> + struct btrfs_inode_item iitem;
>>> + const u32 priv = 0700;
>>> + bool found = false;
>>> + u64 ino;
>>> + u32 imode;
>>> + int ret = 0;
>>> +
>>> + btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]);
>>> + ino = key.objectid;
>>> + read_extent_buffer(path->nodes[0], &iitem,
>>> + btrfs_item_ptr_offset(path->nodes[0], path->slots[0]),
>>> + sizeof(iitem));
>>> + /* root inode */
>>> + if (ino == BTRFS_FIRST_FREE_OBJECTID) {
>>> + imode = S_IFDIR;
>>> + found = true;
>>> + goto out;
>>> + }
>>> +
>>> + while (1) {
>>> + struct btrfs_inode_ref *iref;
>>> + struct extent_buffer *leaf;
>>> + unsigned long cur;
>>> + unsigned long end;
>>> + char namebuf[BTRFS_NAME_LEN] = {0};
>>> + u64 index;
>>> + u32 namelen;
>>> + int slot;
>>> +
>>> + ret = btrfs_next_item(root, path);
>>> + if (ret > 0) {
>>> + /* falls back to rdev check */
>>> + ret = 0;
>>> + goto out;
>>> + }
>>
>> In my testing if an inode is the last one in the leaf and it doesn't have
>> an INODE_REF item then it won't be repaired. But e.g. it can have perfectly
>> valid DIR_ITEM/DIR_INDEX entries which describe this inode as being a file. E.g.
>>
>> item 2 key (256 DIR_ITEM 388586943) itemoff 16076 itemsize 35
>> location key (260 INODE_ITEM 0) type FILE
>> transid 7 data_len 0 name_len 5
>> name: file3
>>
>> .....
>> item 15 key (260 INODE_ITEM 0) itemoff 15184 itemsize 160
>> generation 7 transid 7 size 0 nbytes 0
>> block group 0 mode 26772225102 links 1 uid 0 gid 0 rdev 0
>> sequence 1 flags 0x0(none)
>> atime 1568127261.284993602 (2019-09-10 14:54:21)
>> ctime 1568127261.284993602 (2019-09-10 14:54:21)
>> mtime 1568127261.284993602 (2019-09-10 14:54:21)
>> otime 1568127261.284993602 (2019-09-10 14:54:21)
>>
>> I have intentionally deleted INODE_REF too see what's happening. Is this intended?
>
> Yes, completely intended.
>
> For this case, you need to iterate through the whole tree to locate the
> DIR_INDEX to fix, which is not really possible with current code base,
> which only search based on the INODE, not the DIR_INDEX/DIR_ITEM from
> its parent dir.
>
> Furthermore, didn't you mention that if we don't have confident about
> the imode, then we should fail out instead of using REG as default?
I did, what I supposed could happen here is if we can't find an
INODE_REF then do a search for DIR_INDEX/DIR_ITEM since those items also
contain the type of the inode they are pointing to. Fixing really boils
down to exploiting redundancy in the on-disk metadata to repair existing
items. Here comes the question, of course, what to do if we don't have
an INODE_REF and DIR_INDEX/DIR_ITEM are broken. I guess it's a judgement
call, currently you decided that inode_ref will be the source of
information. I'm fine with that I was merely pointing there is more we
can do. Of course we need to weigh the pros/cons between code complexity
and the returns we get.
Just that I will advise to make it explicit in the changelog that you
made a judgement call to utilize INODE_REF as the starting point of
doing imode repair but not necessarily the only one.
<snip>
next prev parent reply other threads:[~2019-09-11 12:27 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-05 7:57 [PATCH v2 0/6] btrfs-progs: check: Repair invalid inode mode in Qu Wenruo
2019-09-05 7:57 ` [PATCH v2 1/6] btrfs-progs: check: Export btrfs_type_to_imode Qu Wenruo
2019-09-05 7:57 ` [PATCH v2 2/6] btrfs-progs: check/common: Introduce a function to find imode using INODE_REF Qu Wenruo
2019-09-09 13:25 ` Nikolay Borisov
2019-09-09 14:24 ` Qu Wenruo
2019-09-09 14:34 ` Nikolay Borisov
2019-09-09 13:42 ` Nikolay Borisov
2019-09-09 14:26 ` Qu Wenruo
2019-09-09 14:35 ` Nikolay Borisov
2019-09-05 7:57 ` [PATCH v2 3/6] btrfs-progs: check/common: Make repair_imode_common() to handle inodes in subvolume trees Qu Wenruo
2019-09-09 14:17 ` Nikolay Borisov
2019-09-09 14:27 ` Qu Wenruo
2019-09-10 4:27 ` Su Yue
2019-09-10 16:14 ` Nikolay Borisov
2019-09-11 0:39 ` Qu Wenruo
2019-09-11 12:27 ` Nikolay Borisov [this message]
2019-09-11 12:44 ` Qu Wenruo
2019-09-05 7:57 ` [PATCH v2 4/6] btrfs-progs: check/lowmem: Repair bad imode early Qu Wenruo
2019-09-09 14:55 ` Nikolay Borisov
2019-09-10 2:35 ` Qu Wenruo
2019-09-05 7:57 ` [PATCH v2 5/6] btrfs-progs: check/original: Fix inode mode in subvolume trees Qu Wenruo
2019-09-05 7:58 ` [PATCH v2 6/6] btrfs-progs: tests/fsck: Add new images for inode mode repair functionality Qu Wenruo
2019-09-09 15:37 ` Nikolay Borisov
2019-09-09 23:22 ` Qu Wenruo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b7ccda0e-55e4-85be-0c97-b9f80fad4862@suse.com \
--to=nborisov@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=quwenruo.btrfs@gmx.com \
--cc=wqu@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox