Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230730024409.1738559-1-zhangshida@kylinos.cn>
In-Reply-To: <20230730024409.1738559-1-zhangshida@kylinos.cn>
From:   Stephen Zhang <starzhangzsd@gmail.com>
Date:   Mon, 31 Jul 2023 09:05:52 +0800
Message-ID: <CANubcdWBRHU1Jc+PtneaJ=YpDtoQtFhoxiNOgOVCM55VJF45TQ@mail.gmail.com>
Subject: Re: [PATCH v2] ext4: Fix rec_len verify error
To:     tytso@mit.edu, adilger.kernel@dilger.ca
Cc:     linux-kernel@vger.kernel.org, zhangshida@kylinos.cn
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

zhangshida <starzhangzsd@gmail.com> =E4=BA=8E2023=E5=B9=B47=E6=9C=8830=E6=
=97=A5=E5=91=A8=E6=97=A5 10:44=E5=86=99=E9=81=93=EF=BC=9A
>
> From: Shida Zhang <zhangshida@kylinos.cn>
>
> With the configuration PAGE_SIZE 64k and filesystem blocksize 64k,
> a problem occurred when more than 13 million files were directly created
> under a directory:
>
> EXT4-fs error (device xx): ext4_dx_csum_set:492: inode #xxxx: comm xxxxx:=
 dir seems corrupt?  Run e2fsck -D.
> EXT4-fs error (device xx): ext4_dx_csum_verify:463: inode #xxxx: comm xxx=
xx: dir seems corrupt?  Run e2fsck -D.
> EXT4-fs error (device xx): dx_probe:856: inode #xxxx: block 8188: comm xx=
xxx: Directory index failed checksum
>
> When enough files are created, the fake_dirent->reclen will be 0xffff.
> it doesn't equal to the blocksize 65536, i.e. 0x10000.
>
> But it is not the same condition when blocksize equals to 4k.
> when enough file are created, the fake_dirent->reclen will be 0x1000.
> it equals to the blocksize 4k, i.e. 0x1000.
>
> The problem seems to be related to the limitation of the 16-bit field
> when the blocksize is set to 64k. To address this, Modify the check so
> as to handle it properly.
>
> Signed-off-by: Shida Zhang <zhangshida@kylinos.cn>
> ---
> v1->v2:
>   Use a better way to check the condition, as suggested by Andreas.
>
>  fs/ext4/namei.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
> index 0caf6c730ce3..fffed95f8531 100644
> --- a/fs/ext4/namei.c
> +++ b/fs/ext4/namei.c
> @@ -445,8 +445,9 @@ static struct dx_countlimit *get_dx_countlimit(struct=
 inode *inode,
>         struct ext4_dir_entry *dp;
>         struct dx_root_info *root;
>         int count_offset;
> +       int blocksize =3D EXT4_BLOCK_SIZE(inode->i_sb);
>
> -       if (le16_to_cpu(dirent->rec_len) =3D=3D EXT4_BLOCK_SIZE(inode->i_=
sb))
> +       if (ext4_rec_len_from_disk(dirent->rec_len, blocksize) =3D=3D blo=
cksize)
>                 count_offset =3D 8;
>         else if (le16_to_cpu(dirent->rec_len) =3D=3D 12) {
>                 dp =3D (struct ext4_dir_entry *)(((void *)dirent) + 12);
> --
> 2.27.0
>

Sorry, this one seems to missing Ccing to linux-ext4@vger.kernel.org.

-Shida