f2fs: ensure node page reads complete before f2fs_put_super() finishes

commit 297baa4aa263ff8f5b3d246ee16a660d76aa82c4 upstream.

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: 20872584b8c0b ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 9085b4a511a4806f228bf3f264b69122441d015f..256cb567b072444c443d2c0fde2de7a82e1789da 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1988,14 +1988,6 @@ static void f2fs_put_super(struct super_block *sb)
                truncate_inode_pages_final(META_MAPPING(sbi));
        }
 
-       for (i = 0; i < NR_COUNT_TYPE; i++) {
-               if (!get_pages(sbi, i))
-                       continue;
-               f2fs_err(sbi, "detect filesystem reference count leak during "
-                       "umount, type: %d, count: %lld", i, get_pages(sbi, i));
-               f2fs_bug_on(sbi, 1);
-       }
-
        f2fs_bug_on(sbi, sbi->fsync_node_num);
 
        f2fs_destroy_compress_inode(sbi);
@@ -2006,6 +1998,15 @@ static void f2fs_put_super(struct super_block *sb)
        iput(sbi->meta_inode);
        sbi->meta_inode = NULL;
 
+       /* Should check the page counts after dropping all node/meta pages */
+       for (i = 0; i < NR_COUNT_TYPE; i++) {
+               if (!get_pages(sbi, i))
+                       continue;
+               f2fs_err(sbi, "detect filesystem reference count leak during "
+                       "umount, type: %d, count: %lld", i, get_pages(sbi, i));
+               f2fs_bug_on(sbi, 1);
+       }
+
        /*
         * iput() can update stat information, if f2fs_write_checkpoint()
         * above failed with error.