lkml.org 
[lkml]   [2019]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 02/57] Btrfs: fix deadlock when using free space tree due to block group creation
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Filipe Manana <fdmanana@suse.com>

    commit a6d8654d885d7d79a3fb82da64eaa489ca332a82 upstream.

    When modifying the free space tree we can end up COWing one of its extent
    buffers which in turn might result in allocating a new chunk, which in
    turn can result in flushing (finish creation) of pending block groups. If
    that happens we can deadlock because creating a pending block group needs
    to update the free space tree, and if any of the updates tries to modify
    the same extent buffer that we are COWing, we end up in a deadlock since
    we try to write lock twice the same extent buffer.

    So fix this by skipping pending block group creation if we are COWing an
    extent buffer from the free space tree. This is a case missed by commit
    5ce555578e091 ("Btrfs: fix deadlock when writing out free space caches").

    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=202173
    Fixes: 5ce555578e091 ("Btrfs: fix deadlock when writing out free space caches")
    CC: stable@vger.kernel.org # 4.18+
    Signed-off-by: Filipe Manana <fdmanana@suse.com>
    Reviewed-by: David Sterba <dsterba@suse.com>
    Signed-off-by: David Sterba <dsterba@suse.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/btrfs/ctree.c | 16 +++++++++-------
    1 file changed, 9 insertions(+), 7 deletions(-)

    --- a/fs/btrfs/ctree.c
    +++ b/fs/btrfs/ctree.c
    @@ -1015,19 +1015,21 @@ static noinline int __btrfs_cow_block(st
    parent_start = parent->start;

    /*
    - * If we are COWing a node/leaf from the extent, chunk or device trees,
    - * make sure that we do not finish block group creation of pending block
    - * groups. We do this to avoid a deadlock.
    + * If we are COWing a node/leaf from the extent, chunk, device or free
    + * space trees, make sure that we do not finish block group creation of
    + * pending block groups. We do this to avoid a deadlock.
    * COWing can result in allocation of a new chunk, and flushing pending
    * block groups (btrfs_create_pending_block_groups()) can be triggered
    * when finishing allocation of a new chunk. Creation of a pending block
    - * group modifies the extent, chunk and device trees, therefore we could
    - * deadlock with ourselves since we are holding a lock on an extent
    - * buffer that btrfs_create_pending_block_groups() may try to COW later.
    + * group modifies the extent, chunk, device and free space trees,
    + * therefore we could deadlock with ourselves since we are holding a
    + * lock on an extent buffer that btrfs_create_pending_block_groups() may
    + * try to COW later.
    */
    if (root == fs_info->extent_root ||
    root == fs_info->chunk_root ||
    - root == fs_info->dev_root)
    + root == fs_info->dev_root ||
    + root == fs_info->free_space_root)
    trans->can_flush_pending_bgs = false;

    cow = btrfs_alloc_tree_block(trans, root, parent_start,

    \
     
     \ /
      Last update: 2019-01-15 17:53    [W:4.273 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site