Skip to content

Commit bc8aeb0

Browse files
chaseyuJaegeuk Kim
authored andcommitted
f2fs: fix to drop all discards after creating snapshot on lvm device
Piergiorgio reported a bug in bugzilla as below: ------------[ cut here ]------------ WARNING: CPU: 2 PID: 969 at fs/f2fs/segment.c:1330 RIP: 0010:__submit_discard_cmd+0x27d/0x400 [f2fs] Call Trace: __issue_discard_cmd+0x1ca/0x350 [f2fs] issue_discard_thread+0x191/0x480 [f2fs] kthread+0xcf/0x100 ret_from_fork+0x31/0x50 ret_from_fork_asm+0x1a/0x30 w/ below testcase, it can reproduce this bug quickly: - pvcreate /dev/vdb - vgcreate myvg1 /dev/vdb - lvcreate -L 1024m -n mylv1 myvg1 - mount /dev/myvg1/mylv1 /mnt/f2fs - dd if=/dev/zero of=/mnt/f2fs/file bs=1M count=20 - sync - rm /mnt/f2fs/file - sync - lvcreate -L 1024m -s -n mylv1-snapshot /dev/myvg1/mylv1 - umount /mnt/f2fs The root cause is: it will update discard_max_bytes of mounted lvm device to zero after creating snapshot on this lvm device, then, __submit_discard_cmd() will pass parameter @nr_sects w/ zero value to __blkdev_issue_discard(), it returns a NULL bio pointer, result in panic. This patch changes as below for fixing: 1. Let's drop all remained discards in f2fs_unfreeze() if snapshot of lvm device is created. 2. Checking discard_max_bytes before submitting discard during __submit_discard_cmd(). Cc: stable@vger.kernel.org Fixes: 35ec7d5 ("f2fs: split discard command in prior to block layer") Reported-by: Piergiorgio Sartor <piergiorgio.sartor@nexgo.de> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219484 Signed-off-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent 009a824 commit bc8aeb0

File tree

2 files changed

+21
-7
lines changed

2 files changed

+21
-7
lines changed

fs/f2fs/segment.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1290,16 +1290,18 @@ static int __submit_discard_cmd(struct f2fs_sb_info *sbi,
12901290
wait_list, issued);
12911291
return 0;
12921292
}
1293-
1294-
/*
1295-
* Issue discard for conventional zones only if the device
1296-
* supports discard.
1297-
*/
1298-
if (!bdev_max_discard_sectors(bdev))
1299-
return -EOPNOTSUPP;
13001293
}
13011294
#endif
13021295

1296+
/*
1297+
* stop issuing discard for any of below cases:
1298+
* 1. device is conventional zone, but it doesn't support discard.
1299+
* 2. device is regulare device, after snapshot it doesn't support
1300+
* discard.
1301+
*/
1302+
if (!bdev_max_discard_sectors(bdev))
1303+
return -EOPNOTSUPP;
1304+
13031305
trace_f2fs_issue_discard(bdev, dc->di.start, dc->di.len);
13041306

13051307
lstart = dc->di.lstart;

fs/f2fs/super.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1760,6 +1760,18 @@ static int f2fs_freeze(struct super_block *sb)
17601760

17611761
static int f2fs_unfreeze(struct super_block *sb)
17621762
{
1763+
struct f2fs_sb_info *sbi = F2FS_SB(sb);
1764+
1765+
/*
1766+
* It will update discard_max_bytes of mounted lvm device to zero
1767+
* after creating snapshot on this lvm device, let's drop all
1768+
* remained discards.
1769+
* We don't need to disable real-time discard because discard_max_bytes
1770+
* will recover after removal of snapshot.
1771+
*/
1772+
if (test_opt(sbi, DISCARD) && !f2fs_hw_support_discard(sbi))
1773+
f2fs_issue_discard_timeout(sbi);
1774+
17631775
clear_sbi_flag(F2FS_SB(sb), SBI_IS_FREEZING);
17641776
return 0;
17651777
}

0 commit comments

Comments
 (0)