Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp663357pxb; Tue, 5 Apr 2022 17:50:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJywUV80HZeIDyic81uwquTq0z27cxeQrsflLz40tK7nNliBe1uavOjuyEURGzHBxs0MMbkb X-Received: by 2002:a17:90a:e552:b0:1ca:2d70:79ef with SMTP id ei18-20020a17090ae55200b001ca2d7079efmr6964345pjb.175.1649206242957; Tue, 05 Apr 2022 17:50:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649206242; cv=none; d=google.com; s=arc-20160816; b=U7yXI0XDs3/Cli/QCZ+XaMCGNrrZ+4g0CDau35BJ2QAg7sFFOLCYozaFXb9XDZ/o0k ngtRIkG9lRU2QiGK9lAYpyeL+Qe8GgTM7rHp14wxcFArYrHMenHKrPUIGZS6Y8q6HPnx +KJluFPFehZ6HKhfZlV2DsyFk1O5p8QDdSEefAUzpDfEEyfW5L/PMkiLnULPAedQFXgV HpEOvMWRfr+jcbuUHaELFacSmdFChKErbqzD8rqCDXLCby9Umru5PnV0SpUmAbDvOgp3 vcjSr4cPa1J0+KqNOwmvlzF+NrY876b3MIw4lhbqgkd/t6cL2kBOpKVqYVGlRwTkBs0f vwtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fXX/b2N1IcQk1JlCZP6XsoeVPxgQYrftKMtL1jqB77k=; b=atSjwBp/eOTFIN4/6kNj1xCLTwyRuuZpbzneHEsg3h141znXzWm7nWcXiF6LF9Z4+N oIFpGsQCbru85DlxpLzRjSAD830gaRhhpCGY8vdUm49rhrj3TgK0SFb0cJYJR1kondeY +FnBWmyyYDhfut9LlSJy6JBtTsFh4TsQ+0LB6yFLNFhhCNqtu8mpJI6LNu/9P+BCBP94 P79Q1zncu2FtyTgKUMI7exa4Y+SRF1qbzOuL/eAyRUcL0wT4KNB8QOrh9I6xdpiNu2IF +7uHnjcZ5ffYwES83+Bh5NeKEXfYwI1YmJ2MTWW2z9jG6O3onyTD2LWYRDVaRXLy4nJ6 YFXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="p/hAun63"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q16-20020a056a00151000b004fa3a8dffe2si16063603pfu.153.2022.04.05.17.50.27; Tue, 05 Apr 2022 17:50:42 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="p/hAun63"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379451AbiDELlI (ORCPT + 99 others); Tue, 5 Apr 2022 07:41:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244802AbiDEIwk (ORCPT ); Tue, 5 Apr 2022 04:52:40 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7F3622290; Tue, 5 Apr 2022 01:44:13 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 16889B81B18; Tue, 5 Apr 2022 08:39:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69536C385A1; Tue, 5 Apr 2022 08:39:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649147949; bh=msW2dI8/ew3KzPd9Z6LM66OajboeTObfOIEWdOuNFlM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p/hAun63090bidYjLshQxyoCJaxxqiT3loTakpZnUdSvJtC84MEvg9u2zv8ABhWLe kErTn6dJCniSFfEuXOonrPwjzF2VBRhEYQxRHzF8ysPau8HuW1698yw0NLJrPb2AeO 787MWoJdRIeJ8aFfhxdCys6uBtITYeLSNva98cN0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Thumshirn , Naohiro Aota , David Sterba Subject: [PATCH 5.16 0180/1017] btrfs: zoned: mark relocation as writing Date: Tue, 5 Apr 2022 09:18:13 +0200 Message-Id: <20220405070359.579413543@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070354.155796697@linuxfoundation.org> References: <20220405070354.155796697@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Naohiro Aota commit ca5e4ea0beaec8bc674121838bf8614c089effb9 upstream. There is a hung_task issue with running generic/068 on an SMR device. The hang occurs while a process is trying to thaw the filesystem. The process is trying to take sb->s_umount to thaw the FS. The lock is held by fsstress, which calls btrfs_sync_fs() and is waiting for an ordered extent to finish. However, as the FS is frozen, the ordered extents never finish. Having an ordered extent while the FS is frozen is the root cause of the hang. The ordered extent is initiated from btrfs_relocate_chunk() which is called from btrfs_reclaim_bgs_work(). This commit adds sb_*_write() around btrfs_relocate_chunk() call site. For the usual "btrfs balance" command, we already call it with mnt_want_file() in btrfs_ioctl_balance(). Fixes: 18bb8bbf13c1 ("btrfs: zoned: automatically reclaim zones") CC: stable@vger.kernel.org # 5.13+ Link: https://github.com/naota/linux/issues/56 Reviewed-by: Johannes Thumshirn Signed-off-by: Naohiro Aota Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/block-group.c | 8 +++++++- fs/btrfs/volumes.c | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -1521,8 +1521,12 @@ void btrfs_reclaim_bgs_work(struct work_ if (!test_bit(BTRFS_FS_OPEN, &fs_info->flags)) return; - if (!btrfs_exclop_start(fs_info, BTRFS_EXCLOP_BALANCE)) + sb_start_write(fs_info->sb); + + if (!btrfs_exclop_start(fs_info, BTRFS_EXCLOP_BALANCE)) { + sb_end_write(fs_info->sb); return; + } /* * Long running balances can keep us blocked here for eternity, so @@ -1530,6 +1534,7 @@ void btrfs_reclaim_bgs_work(struct work_ */ if (!mutex_trylock(&fs_info->reclaim_bgs_lock)) { btrfs_exclop_finish(fs_info); + sb_end_write(fs_info->sb); return; } @@ -1604,6 +1609,7 @@ next: spin_unlock(&fs_info->unused_bgs_lock); mutex_unlock(&fs_info->reclaim_bgs_lock); btrfs_exclop_finish(fs_info); + sb_end_write(fs_info->sb); } void btrfs_reclaim_bgs(struct btrfs_fs_info *fs_info) --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -8263,10 +8263,12 @@ static int relocating_repair_kthread(voi target = cache->start; btrfs_put_block_group(cache); + sb_start_write(fs_info->sb); if (!btrfs_exclop_start(fs_info, BTRFS_EXCLOP_BALANCE)) { btrfs_info(fs_info, "zoned: skip relocating block group %llu to repair: EBUSY", target); + sb_end_write(fs_info->sb); return -EBUSY; } @@ -8294,6 +8296,7 @@ out: btrfs_put_block_group(cache); mutex_unlock(&fs_info->reclaim_bgs_lock); btrfs_exclop_finish(fs_info); + sb_end_write(fs_info->sb); return ret; }