Skip to content

Commit 297baa4

Browse files
Jan PrusakowskiJaegeuk Kim
authored andcommitted
f2fs: ensure node page reads complete before f2fs_put_super() finishes
Xfstests generic/335, generic/336 sometimes crash with the following message: F2FS-fs (dm-0): detect filesystem reference count leak during umount, type: 9, count: 1 ------------[ cut here ]------------ kernel BUG at fs/f2fs/super.c:1939! Oops: invalid opcode: 0000 [#1] SMP NOPTI CPU: 1 UID: 0 PID: 609351 Comm: umount Tainted: G W 6.17.0-rc5-xfstests-g9dd1835ecda5 #1 PREEMPT(none) Tainted: [W]=WARN Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 RIP: 0010:f2fs_put_super+0x3b3/0x3c0 Call Trace: <TASK> generic_shutdown_super+0x7e/0x190 kill_block_super+0x1a/0x40 kill_f2fs_super+0x9d/0x190 deactivate_locked_super+0x30/0xb0 cleanup_mnt+0xba/0x150 task_work_run+0x5c/0xa0 exit_to_user_mode_loop+0xb7/0xc0 do_syscall_64+0x1ae/0x1c0 entry_SYSCALL_64_after_hwframe+0x76/0x7e </TASK> ---[ end trace 0000000000000000 ]--- It appears that sometimes it is possible that f2fs_put_super() is called before all node page reads are completed. Adding a call to f2fs_wait_on_all_pages() for F2FS_RD_NODE fixes the problem. Cc: stable@kernel.org Fixes: 2087258 ("f2fs: fix to drop all dirty meta/node pages during umount()") Signed-off-by: Jan Prusakowski <jprusakowski@google.com> Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 196c81f commit 297baa4

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

fs/f2fs/super.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1989,14 +1989,6 @@ static void f2fs_put_super(struct super_block *sb)
19891989
truncate_inode_pages_final(META_MAPPING(sbi));
19901990
}
19911991

1992-
for (i = 0; i < NR_COUNT_TYPE; i++) {
1993-
if (!get_pages(sbi, i))
1994-
continue;
1995-
f2fs_err(sbi, "detect filesystem reference count leak during "
1996-
"umount, type: %d, count: %lld", i, get_pages(sbi, i));
1997-
f2fs_bug_on(sbi, 1);
1998-
}
1999-
20001992
f2fs_bug_on(sbi, sbi->fsync_node_num);
20011993

20021994
f2fs_destroy_compress_inode(sbi);
@@ -2007,6 +1999,15 @@ static void f2fs_put_super(struct super_block *sb)
20071999
iput(sbi->meta_inode);
20082000
sbi->meta_inode = NULL;
20092001

2002+
/* Should check the page counts after dropping all node/meta pages */
2003+
for (i = 0; i < NR_COUNT_TYPE; i++) {
2004+
if (!get_pages(sbi, i))
2005+
continue;
2006+
f2fs_err(sbi, "detect filesystem reference count leak during "
2007+
"umount, type: %d, count: %lld", i, get_pages(sbi, i));
2008+
f2fs_bug_on(sbi, 1);
2009+
}
2010+
20102011
/*
20112012
* iput() can update stat information, if f2fs_write_checkpoint()
20122013
* above failed with error.

0 commit comments

Comments
 (0)