linux-ext4 - Re: [PATCH] ext4: make sure enough credits are reserved for dioread

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CANQeFDAL=Bx6dq69Rzmz_OWXkXMz=KzLvEkw4rQSSqMW9OHWMQ@mail.gmail.com>
Date:   Tue, 25 Dec 2018 16:10:25 -0800
From:   Liu Bo <obuil.liubo@...il.com>
To:     "Theodore Ts'o" <tytso@....edu>
Cc:     Ext4 Developers List <linux-ext4@...r.kernel.org>,
        stable@...nel.org
Subject: Re: [PATCH] ext4: make sure enough credits are reserved for
 dioread_nolock writes

</bo.liu@...ux.alibaba.com>
On Mon, Dec 24, 2018 at 9:36 PM Theodore Ts'o <tytso@....edu> wrote:
>
> There are enough credits reserved for most dioread_nolock writes;
> however, if the extent tree is sufficiently deep, and/or quota is
> enabled, the code was not allowing for all eventualities when
> reserving journal credits for the unwritten extent conversion.
>
> This problem can be seen using xfstests ext4/034:
>
>    WARNING: CPU: 1 PID: 257 at fs/ext4/ext4_jbd2.c:271 __ext4_handle_dirty_metadata+0x10c/0x180
>    Workqueue: ext4-rsv-conversion ext4_end_io_rsv_work
>    RIP: 0010:__ext4_handle_dirty_metadata+0x10c/0x180
>         ...
>    EXT4-fs: ext4_free_blocks:4938: aborting transaction: error 28 in __ext4_handle_dirty_metadata
>    EXT4: jbd2_journal_dirty_metadata failed: handle type 11 started at line 4921, credits 4/0, errcode -28
>    EXT4-fs error (device dm-1) in ext4_free_blocks:4950: error 28
>

I had a patch[1] to address the problem but with adding reservation
only when we need to (in ext4_ext_try_to_merge_up).

I'm fine with either way.

Reviewed-by: Liu Bo <bo.liu@...ux.alibaba.com>

BTW, the ext4/034 may need to be updated with the correct patch title/commit.

thanks,
liubo

[1]:
https://patchwork.ozlabs.org/patch/991794/

> Signed-off-by: Theodore Ts'o <tytso@....edu>
> Cc: stable@...nel.org
> ---
>  fs/ext4/inode.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> index 9affabd07682..165ff331d998 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -2778,7 +2778,8 @@ static int ext4_writepages(struct address_space *mapping,
>                  * We may need to convert up to one extent per block in
>                  * the page and we may dirty the inode.
>                  */
> -               rsv_blocks = 1 + (PAGE_SIZE >> inode->i_blkbits);
> +               rsv_blocks = 1 + ext4_chunk_trans_blocks(inode,
> +                                               PAGE_SIZE >> inode->i_blkbits);
>         }
>
>         /*
> --
> 2.19.1
>