Skip to content

Commit 1378752

Browse files
chaseyuJaegeuk Kim
authored andcommitted
f2fs: fix to flush all dirty inodes recovered in readonly fs
generic/417 reported as blow: ------------[ cut here ]------------ kernel BUG at /home/yuchao/git/devf2fs/inode.c:695! invalid opcode: 0000 [#1] PREEMPT SMP CPU: 1 PID: 21697 Comm: umount Tainted: G W O 4.18.0-rc2+ #39 Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 EIP: f2fs_evict_inode+0x556/0x580 [f2fs] Call Trace: ? _raw_spin_unlock+0x2c/0x50 evict+0xa8/0x170 dispose_list+0x34/0x40 evict_inodes+0x118/0x120 generic_shutdown_super+0x41/0x100 ? rcu_read_lock_sched_held+0x97/0xa0 kill_block_super+0x22/0x50 kill_f2fs_super+0x6f/0x80 [f2fs] deactivate_locked_super+0x3d/0x70 deactivate_super+0x40/0x60 cleanup_mnt+0x39/0x70 __cleanup_mnt+0x10/0x20 task_work_run+0x81/0xa0 exit_to_usermode_loop+0x59/0xa7 do_fast_syscall_32+0x1f5/0x22c entry_SYSENTER_32+0x53/0x86 EIP: f2fs_evict_inode+0x556/0x580 [f2fs] It can simply reproduced with scripts: Enable quota feature during mkfs. Testcase1: 1. mkfs.f2fs /dev/zram0 2. mount -t f2fs /dev/zram0 /mnt/f2fs 3. xfs_io -f /mnt/f2fs/file -c "pwrite 0 4k" -c "fsync" 4. godown /mnt/f2fs 5. umount /mnt/f2fs 6. mount -t f2fs -o ro /dev/zram0 /mnt/f2fs 7. umount /mnt/f2fs Testcase2: 1. mkfs.f2fs /dev/zram0 2. mount -t f2fs /dev/zram0 /mnt/f2fs 3. touch /mnt/f2fs/file 4. create process[pid = x] do: a) open /mnt/f2fs/file; b) unlink /mnt/f2fs/file 5. godown -f /mnt/f2fs 6. kill process[pid = x] 7. umount /mnt/f2fs 8. mount -t f2fs -o ro /dev/zram0 /mnt/f2fs 9. umount /mnt/f2fs The reason is: during recovery, i_{c,m}time of inode will be updated, then the inode can be set dirty w/o being tracked in sbi->inode_list[DIRTY_META] global list, so later write_checkpoint will not flush such dirty inode into node page. Once umount is called, sync_filesystem() in generic_shutdown_super() will skip syncng dirty inodes due to sb_rdonly check, leaving dirty inodes there. To solve this issue, during umount, add remove SB_RDONLY flag in sb->s_flags, to make sure sync_filesystem() will not be skipped. Signed-off-by: Chao Yu <[email protected]> Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent cda9cc5 commit 1378752

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

fs/f2fs/checkpoint.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,8 @@ int f2fs_recover_orphan_inodes(struct f2fs_sb_info *sbi)
696696
/* clear Orphan Flag */
697697
clear_ckpt_flags(sbi, CP_ORPHAN_PRESENT_FLAG);
698698
out:
699+
set_sbi_flag(sbi, SBI_IS_RECOVERED);
700+
699701
#ifdef CONFIG_QUOTA
700702
/* Turn quotas off */
701703
if (quota_enabled)

fs/f2fs/f2fs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,6 +1088,7 @@ enum {
10881088
SBI_NEED_SB_WRITE, /* need to recover superblock */
10891089
SBI_NEED_CP, /* need to checkpoint */
10901090
SBI_IS_SHUTDOWN, /* shutdown by ioctl */
1091+
SBI_IS_RECOVERED, /* recovered orphan/data */
10911092
};
10921093

10931094
enum {

fs/f2fs/recovery.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -697,11 +697,15 @@ int f2fs_recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only)
697697
/* let's drop all the directory inodes for clean checkpoint */
698698
destroy_fsync_dnodes(&dir_list);
699699

700-
if (!err && need_writecp) {
701-
struct cp_control cpc = {
702-
.reason = CP_RECOVERY,
703-
};
704-
err = f2fs_write_checkpoint(sbi, &cpc);
700+
if (need_writecp) {
701+
set_sbi_flag(sbi, SBI_IS_RECOVERED);
702+
703+
if (!err) {
704+
struct cp_control cpc = {
705+
.reason = CP_RECOVERY,
706+
};
707+
err = f2fs_write_checkpoint(sbi, &cpc);
708+
}
705709
}
706710

707711
kmem_cache_destroy(fsync_entry_slab);

fs/f2fs/super.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3180,6 +3180,9 @@ static void kill_f2fs_super(struct super_block *sb)
31803180
};
31813181
f2fs_write_checkpoint(sbi, &cpc);
31823182
}
3183+
3184+
if (is_sbi_flag_set(sbi, SBI_IS_RECOVERED) && f2fs_readonly(sb))
3185+
sb->s_flags &= ~SB_RDONLY;
31833186
}
31843187
kill_block_super(sb);
31853188
}

0 commit comments

Comments
 (0)