From patchwork Fri Jan 24 01:50:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianan Huang X-Patchwork-Id: 13948816 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 A68F1C02182 for ; Fri, 24 Jan 2025 02:06:51 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1tb95t-0002j0-M3; Fri, 24 Jan 2025 02:06:49 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1tb95s-0002ir-4z for linux-f2fs-devel@lists.sourceforge.net; Fri, 24 Jan 2025 02:06:48 +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=x0txe8JhhdfBCsRW2oHIArRhcjOjL6RHpW5YQydG2pg=; b=CcZEdjlYsnolUvsyJSLt2gKmWj mWvGO8D+z2Zuyhqm5YlMJ6VM8CO2PMOj8smFMlh87riSrIQrWvFkWIU4y1qqoFhpiWPVc+j0ooS43 Zgm055/cF8AuHio46ML+y0gJH4opVAPm7LdDuNkevtdQfhv9N1iVO9OrmIIp0r+8GSL0=; 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=x0txe8JhhdfBCsRW2oHIArRhcjOjL6RHpW5YQydG2pg=; b=jD6/0sAFIpr9qZnH4oSChsswOc WQI7GWhYoQHNdEPJxO7VqQdVCZxZZIwrRmiJUp0VVjY+W6CwdRGTdQHJmAZ1PJcDNAokcLsn3KMyE s0ZUkvmY27TQghen2jTAbuwsDpKal6GZ7pk606NKy0MvZh49OloApI/6d+pUbuXYGFac=; Received: from outboundhk.mxmail.xiaomi.com ([118.143.206.90]) by sfi-mx-2.v28.lw.sourceforge.com with esmtp (Exim 4.95) id 1tb95q-0001KM-SP for linux-f2fs-devel@lists.sourceforge.net; Fri, 24 Jan 2025 02:06:48 +0000 X-CSE-ConnectionGUID: +XGi83OURX2nxzAvB4559g== X-CSE-MsgGUID: TCzjyxepQMerjUPpXHWznA== X-IronPort-AV: E=Sophos;i="6.13,230,1732550400"; d="scan'208";a="105591608" To: , , Date: Fri, 24 Jan 2025 09:50:42 +0800 Message-ID: <20250124015042.273336-1-huangjianan@xiaomi.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250123071417.253019-1-huangjianan@xiaomi.com> References: <20250123071417.253019-1-huangjianan@xiaomi.com> MIME-Version: 1.0 X-Originating-IP: [10.237.8.167] X-ClientProxiedBy: bj-mbx09.mioffice.cn (10.237.8.129) To YZ-MBX05.mioffice.cn (10.237.88.125) X-Headers-End: 1tb95q-0001KM-SP Subject: [f2fs-dev] [PATCH v2] f2fs: fix inconsistent dirty state of atomic file 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: Jianan Huang via Linux-f2fs-devel From: Jianan Huang Reply-To: Jianan Huang Cc: daehojeong@google.com, jnhuang95@gmail.com, linux-kernel@vger.kernel.org, wanghui33@xiaomi.com, yudongbin@xiaomi.com Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net When testing the atomic write fix patches, the f2fs_bug_on was triggered as below: ------------[ cut here ]------------ kernel BUG at fs/f2fs/inode.c:935! Oops: invalid opcode: 0000 [#1] PREEMPT SMP PTI CPU: 3 UID: 0 PID: 257 Comm: bash Not tainted 6.13.0-rc1-00033-gc283a70d3497 #5 RIP: 0010:f2fs_evict_inode+0x50f/0x520 Call Trace: ? __die_body+0x65/0xb0 ? die+0x9f/0xc0 ? do_trap+0xa1/0x170 ? f2fs_evict_inode+0x50f/0x520 ? f2fs_evict_inode+0x50f/0x520 ? handle_invalid_op+0x65/0x80 ? f2fs_evict_inode+0x50f/0x520 ? exc_invalid_op+0x39/0x50 ? asm_exc_invalid_op+0x1a/0x20 ? __pfx_f2fs_get_dquots+0x10/0x10 ? f2fs_evict_inode+0x50f/0x520 ? f2fs_evict_inode+0x2e5/0x520 evict+0x186/0x2f0 prune_icache_sb+0x75/0xb0 super_cache_scan+0x1a8/0x200 do_shrink_slab+0x163/0x320 shrink_slab+0x2fc/0x470 drop_slab+0x82/0xf0 drop_caches_sysctl_handler+0x4e/0xb0 proc_sys_call_handler+0x183/0x280 vfs_write+0x36d/0x450 ksys_write+0x68/0xd0 do_syscall_64+0xc8/0x1a0 ? arch_exit_to_user_mode_prepare+0x11/0x60 ? irqentry_exit_to_user_mode+0x7e/0xa0 The root cause is: f2fs uses FI_ATOMIC_DIRTIED to indicate dirty atomic files during commit. If the inode is dirtied during commit, such as by f2fs_i_pino_write, the vfs inode keeps clean and the f2fs inode is set to FI_DIRTY_INODE. The FI_DIRTY_INODE flag cann't be cleared by write_inode later due to the clean vfs inode. Finally, f2fs_bug_on is triggered due to this inconsistent state when evict. To reproduce this situation: - fd = open("/mnt/test.db", O_WRONLY) - ioctl(fd, F2FS_IOC_START_ATOMIC_WRITE) - mv /mnt/test.db /mnt/test1.db - ioctl(fd, F2FS_IOC_COMMIT_ATOMIC_WRITE) - echo 3 > /proc/sys/vm/drop_caches To fix this problem, clear FI_DIRTY_INODE after commit, then f2fs_mark_inode_dirty_sync will ensure a consistent dirty state. Fixes: fccaa81de87e ("f2fs: prevent atomic file from being dirtied before commit") Signed-off-by: Yunlei He Signed-off-by: Jianan Huang --- Changes since v1: - Add comments suggested by Chao. - Add missing stat reduction. fs/f2fs/segment.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index dc1b47f9269a..de1597110f76 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -201,6 +201,15 @@ void f2fs_abort_atomic_write(struct inode *inode, bool clean) clear_inode_flag(inode, FI_ATOMIC_FILE); if (is_inode_flag_set(inode, FI_ATOMIC_DIRTIED)) { clear_inode_flag(inode, FI_ATOMIC_DIRTIED); + /* + * The vfs inode keeps clean during commit, but the f2fs inode + * doesn't. So clear the dirty state after commit and let + * f2fs_mark_inode_dirty_sync ensure a consistent dirty state. + */ + if (is_inode_flag_set(inode, FI_DIRTY_INODE)) { + clear_inode_flag(inode, FI_DIRTY_INODE); + stat_dec_dirty_inode(F2FS_I_SB(inode), DIRTY_META); + } f2fs_mark_inode_dirty_sync(inode, true); } stat_dec_atomic_inode(inode);