From patchwork Thu Oct 31 06:45:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Long Li X-Patchwork-Id: 13857610 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 67E93E68958 for ; Thu, 31 Oct 2024 06:49:26 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1t6Ozm-00049H-0t; Thu, 31 Oct 2024 06:49:26 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1t6Ozj-00048w-Hp for linux-f2fs-devel@lists.sourceforge.net; Thu, 31 Oct 2024 06:49:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Type:Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:CC:To:From:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=oOe6hkPr1YyWofIRAeAsDyRj5xX+Lhm2hk+codhWPrQ=; b=RHFPpC6aZNzb3zFvF4eaWqTT+o /EvpRFnoTrdOdMdd/sy/sbUtQfMDwgC2d5IkRPzGa8ehoM+di8u+phr30Pvx3owynAxFjUs33cEGX R7pSWsSUa+5dUFvoc9TsWnzyDFvoylmOmjUckFKFe7sOR4T7HeuSIxcehtNotE9mUwlA=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:CC:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=oOe6hkPr1YyWofIRAeAsDyRj5xX+Lhm2hk+codhWPrQ=; b=UarsY3UhQc+zUalJR0ri0sbMHD bZtK1jvmD43wAEIGD7owQ8JwAcvEo4cIswZS9LjvvdadC+CNvoPDwiTtXDRBiN2f+/UqcXSusmJc9 nYou9ytJOg2j+0gcwo5GfXoAassFvrsp22tajE01+/kQpS61EO5KSP2QNFtk6gjalrNw=; Received: from szxga05-in.huawei.com ([45.249.212.191]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1t6Ozh-0006Ay-Lm for linux-f2fs-devel@lists.sourceforge.net; Thu, 31 Oct 2024 06:49:23 +0000 Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4XfDxg6jNPz1HLfd; Thu, 31 Oct 2024 14:44:39 +0800 (CST) Received: from dggpemf500017.china.huawei.com (unknown [7.185.36.126]) by mail.maildlp.com (Postfix) with ESMTPS id 612E61401F3; Thu, 31 Oct 2024 14:49:09 +0800 (CST) Received: from huawei.com (10.175.104.67) by dggpemf500017.china.huawei.com (7.185.36.126) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Thu, 31 Oct 2024 14:49:08 +0800 To: , Date: Thu, 31 Oct 2024 14:45:53 +0800 Message-ID: <20241031064553.55283-2-leo.lilong@huawei.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20241031064553.55283-1-leo.lilong@huawei.com> References: <20241031064553.55283-1-leo.lilong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.67] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemf500017.china.huawei.com (7.185.36.126) X-Headers-End: 1t6Ozh-0006Ay-Lm Subject: [f2fs-dev] [PATCH 2/2] Revert "f2fs: fix to avoid use-after-free in f2fs_stop_gc_thread()" X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Long Li via Linux-f2fs-devel From: Long Li Reply-To: Long Li Cc: yi.zhang@huawei.com, lonuxli.64@gmail.com, yangerkun@huawei.com, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, leo.lilong@huawei.com Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net This reverts commit c7f114d864ac91515bb07ac271e9824a20f5ed95. The race conditions between concurrent f2fs_stop_gc_thread() calls are now protected by a dedicated lock, making the additional s_umount lock protection unnecessary. Therefore, revert this patch. Signed-off-by: Long Li --- fs/f2fs/f2fs.h | 2 +- fs/f2fs/file.c | 11 ++--------- fs/f2fs/super.c | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 7ae1e2a4789f..2143604ce416 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -3522,7 +3522,7 @@ int f2fs_setattr(struct mnt_idmap *idmap, struct dentry *dentry, int f2fs_truncate_hole(struct inode *inode, pgoff_t pg_start, pgoff_t pg_end); void f2fs_truncate_data_blocks_range(struct dnode_of_data *dn, int count); int f2fs_do_shutdown(struct f2fs_sb_info *sbi, unsigned int flag, - bool readonly, bool need_lock); + bool readonly); int f2fs_precache_extents(struct inode *inode); int f2fs_fileattr_get(struct dentry *dentry, struct fileattr *fa); int f2fs_fileattr_set(struct mnt_idmap *idmap, diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 75a8b22da664..5d7b4fdae9c4 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -2318,7 +2318,7 @@ static int f2fs_ioc_abort_atomic_write(struct file *filp) } int f2fs_do_shutdown(struct f2fs_sb_info *sbi, unsigned int flag, - bool readonly, bool need_lock) + bool readonly) { struct super_block *sb = sbi->sb; int ret = 0; @@ -2365,19 +2365,12 @@ int f2fs_do_shutdown(struct f2fs_sb_info *sbi, unsigned int flag, if (readonly) goto out; - /* grab sb->s_umount to avoid racing w/ remount() */ - if (need_lock) - down_read(&sbi->sb->s_umount); - f2fs_stop_gc_thread(sbi); f2fs_stop_discard_thread(sbi); f2fs_drop_discard_cmd(sbi); clear_opt(sbi, DISCARD); - if (need_lock) - up_read(&sbi->sb->s_umount); - f2fs_update_time(sbi, REQ_TIME); out: @@ -2414,7 +2407,7 @@ static int f2fs_ioc_shutdown(struct file *filp, unsigned long arg) } } - ret = f2fs_do_shutdown(sbi, in, readonly, true); + ret = f2fs_do_shutdown(sbi, in, readonly); if (need_drop) mnt_drop_write_file(filp); diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 47a15050ea9c..a720fb9ef196 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2569,7 +2569,7 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data) static void f2fs_shutdown(struct super_block *sb) { - f2fs_do_shutdown(F2FS_SB(sb), F2FS_GOING_DOWN_NOSYNC, false, false); + f2fs_do_shutdown(F2FS_SB(sb), F2FS_GOING_DOWN_NOSYNC, false); } #ifdef CONFIG_QUOTA