Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp672866pxb; Tue, 5 Apr 2022 18:11:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNG2obz01JqfxctbQxdeKQuJeb8WBDk7VSPtJ9qbY63CKNUlQXcf1D5KQWgwEksAQXVN3D X-Received: by 2002:a50:a412:0:b0:41c:c2f5:3171 with SMTP id u18-20020a50a412000000b0041cc2f53171mr6157005edb.341.1649207428423; Tue, 05 Apr 2022 18:10:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649207428; cv=none; d=google.com; s=arc-20160816; b=K6v50ZWYCJoZgtO5/Mps9Dtboh7JBwEaCqMD89WnIj5QEwGAdIydTt48cX3d9Rnli9 JL/VF+V+Ek0giJqx0uOmOeX6k0l6Ii5W4cJ7GdXFRja2NoRM0FnF0dLZMlDPtT6XJl3R MJHbNzFrqrD6gsI+tgPhYc9vNTxuOwL+Ai23VzwfIIjUWCWkdBmBERWGwuo12teASZ4+ Yx0VCEgTRq6C1LS4LzxfPxo93iV7XMV/f+WNXzRX9Zq1KKqCIrUG6RxLGK6jBI0LHK6H 15oClFrdJyJYOpjJABAf10sm+5wGjboBEJJIN4XxRuR6KmrVO3mqqEC2C1EPOqgh06mH ly9w== 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=7UBYIOPIxND0HE3+9f82IKeuswSMDkiFLogUhXc0/og=; b=RVb+OoRJGyDvudC+gS3wJWio0F5ezywWe38KJkRsOE4af6+fNUmrO0iwHCh8r3Z2kB qSli+JytZ9yJfF7880xNiGxVdb+QKvXzsTZI0daS+UZ+2S0xnq8Vl8+U/ZZShUJM7c17 w/g6op53wjgCtJ7WES52DR7wv7nDUuBtAY5Ld/YbqBL4txe3k6vPQq8ZL5QUXuzN5Rmg Zfg5XpEwwems/XJenjKVEscj8uZ5JrFvYFhcf3g+ZtYljyV9uPa+ANG+ou0CqGt7rmxC polBuCrwgapztJlstxHsAYQLFFrSNVUQgDvzYZ43CG+9yRbbz3HhGb/zt4yn3PbpK7NQ Wwqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=bLYHWJI7; 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 m23-20020a17090679d700b006dfdf8f3378si10733784ejo.577.2022.04.05.18.10.03; Tue, 05 Apr 2022 18:10:28 -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=bLYHWJI7; 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 S1390472AbiDENmC (ORCPT + 99 others); Tue, 5 Apr 2022 09:42:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345236AbiDEJWW (ORCPT ); Tue, 5 Apr 2022 05:22:22 -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 9A2572A724; Tue, 5 Apr 2022 02:09:50 -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 435A5B81B75; Tue, 5 Apr 2022 09:09:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95962C385A2; Tue, 5 Apr 2022 09:09:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649149787; bh=0K+8KsR+j4aH3e4AuxoIRtkQ3/ATfCNbxCPkVALNxBM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bLYHWJI7RU0AYRU0qCkDp93v3CTEOg78Dh09jEa5dNg9U4ISYgyv/HanL1dDbIkbf RV02dqRXvYI+UdM1kfLTN+Wzy8nXPiHzFOylesLZy7xjEJKDjtmHPkPTTu0o1A9kIf Ij78sHOkQeCTrR6+6rY1O4qHZmpkWLochw2Hx22Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 5.16 0793/1017] f2fs: dont get FREEZE lock in f2fs_evict_inode in frozen fs Date: Tue, 5 Apr 2022 09:28:26 +0200 Message-Id: <20220405070417.790776026@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: Jaegeuk Kim [ Upstream commit ba900534f807f0b327c92d5141c85d2313e2d55c ] Let's purge inode cache in order to avoid the below deadlock. [freeze test] shrinkder freeze_super - pwercpu_down_write(SB_FREEZE_FS) - super_cache_scan - down_read(&sb->s_umount) - prune_icache_sb - dispose_list - evict - f2fs_evict_inode thaw_super - down_write(&sb->s_umount); - __percpu_down_read(SB_FREEZE_FS) Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- Documentation/ABI/testing/sysfs-fs-f2fs | 1 + fs/f2fs/debug.c | 1 + fs/f2fs/f2fs.h | 1 + fs/f2fs/inode.c | 6 ++++-- fs/f2fs/super.c | 4 ++++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-fs-f2fs b/Documentation/ABI/testing/sysfs-fs-f2fs index b268e3e18b4a..91e2b549f817 100644 --- a/Documentation/ABI/testing/sysfs-fs-f2fs +++ b/Documentation/ABI/testing/sysfs-fs-f2fs @@ -425,6 +425,7 @@ Description: Show status of f2fs superblock in real time. 0x800 SBI_QUOTA_SKIP_FLUSH skip flushing quota in current CP 0x1000 SBI_QUOTA_NEED_REPAIR quota file may be corrupted 0x2000 SBI_IS_RESIZEFS resizefs is in process + 0x4000 SBI_IS_FREEZING freefs is in process ====== ===================== ================================= What: /sys/fs/f2fs//ckpt_thread_ioprio diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c index 8c50518475a9..07ad0d81f0c5 100644 --- a/fs/f2fs/debug.c +++ b/fs/f2fs/debug.c @@ -338,6 +338,7 @@ static char *s_flag[] = { [SBI_QUOTA_SKIP_FLUSH] = " quota_skip_flush", [SBI_QUOTA_NEED_REPAIR] = " quota_need_repair", [SBI_IS_RESIZEFS] = " resizefs", + [SBI_IS_FREEZING] = " freezefs", }; static int stat_show(struct seq_file *s, void *v) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index d753094a4919..980c0c2b6350 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1259,6 +1259,7 @@ enum { SBI_QUOTA_SKIP_FLUSH, /* skip flushing quota in current CP */ SBI_QUOTA_NEED_REPAIR, /* quota file may be corrupted */ SBI_IS_RESIZEFS, /* resizefs is in process */ + SBI_IS_FREEZING, /* freezefs is in process */ }; enum { diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index 5a10f98dbbc3..a40e52ba5ec8 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -769,7 +769,8 @@ void f2fs_evict_inode(struct inode *inode) f2fs_remove_ino_entry(sbi, inode->i_ino, UPDATE_INO); f2fs_remove_ino_entry(sbi, inode->i_ino, FLUSH_INO); - sb_start_intwrite(inode->i_sb); + if (!is_sbi_flag_set(sbi, SBI_IS_FREEZING)) + sb_start_intwrite(inode->i_sb); set_inode_flag(inode, FI_NO_ALLOC); i_size_write(inode, 0); retry: @@ -800,7 +801,8 @@ void f2fs_evict_inode(struct inode *inode) if (dquot_initialize_needed(inode)) set_sbi_flag(sbi, SBI_QUOTA_NEED_REPAIR); } - sb_end_intwrite(inode->i_sb); + if (!is_sbi_flag_set(sbi, SBI_IS_FREEZING)) + sb_end_intwrite(inode->i_sb); no_delete: dquot_drop(inode); diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 45106b426e8d..9402d5b2c7fd 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -1668,11 +1668,15 @@ static int f2fs_freeze(struct super_block *sb) /* ensure no checkpoint required */ if (!llist_empty(&F2FS_SB(sb)->cprc_info.issue_list)) return -EINVAL; + + /* to avoid deadlock on f2fs_evict_inode->SB_FREEZE_FS */ + set_sbi_flag(F2FS_SB(sb), SBI_IS_FREEZING); return 0; } static int f2fs_unfreeze(struct super_block *sb) { + clear_sbi_flag(F2FS_SB(sb), SBI_IS_FREEZING); return 0; } -- 2.34.1