Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc278601 authored by Damien Le Moal's avatar Damien Le Moal Committed by Greg Kroah-Hartman
Browse files

f2fs: Fix use of number of devices 



commit 0916878da355650d7e77104a7ac0fa1784eca852 upstream.

For a single device mount using a zoned block device, the zone
information for the device is stored in the sbi->devs single entry
array and sbi->s_ndevs is set to 1. This differs from a single device
mount using a regular block device which does not allocate sbi->devs
and sets sbi->s_ndevs to 0.

However, sbi->s_devs == 0 condition is used throughout the code to
differentiate a single device mount from a multi-device mount where
sbi->s_ndevs is always larger than 1. This results in problems with
single zoned block device volumes as these are treated as multi-device
mounts but do not have the start_blk and end_blk information set. One
of the problem observed is skipping of zone discard issuing resulting in
write commands being issued to full zones or unaligned to a zone write
pointer.

Fix this problem by simply treating the cases sbi->s_ndevs == 0 (single
regular block device mount) and sbi->s_ndevs == 1 (single zoned block
device mount) in the same manner. This is done by introducing the
helper function f2fs_is_multi_device() and using this helper in place
of direct tests of sbi->s_ndevs value, improving code readability.

Fixes: 7bb3a371 ("f2fs: Fix zoned block device support")
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db30e95d

fs/f2fs/data.c

+11 −6
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ struct block_device *f2fs_target_device(struct f2fs_sb_info *sbi, 
	struct block_device *bdev = sbi->sb->s_bdev;

	int i;



	if (f2fs_is_multi_device(sbi)) {

		for (i = 0; i < sbi->s_ndevs; i++) {

			if (FDEV(i).start_blk <= blk_addr &&

			    FDEV(i).end_blk >= blk_addr) {
@@ -141,6 +142,7 @@ struct block_device *f2fs_target_device(struct f2fs_sb_info *sbi, 
				break;

			}

		}

	}

	if (bio) {

		bio_set_dev(bio, bdev);

		bio->bi_iter.bi_sector = SECTOR_FROM_BLOCK(blk_addr);
@@ -152,6 +154,9 @@ int f2fs_target_device_index(struct f2fs_sb_info *sbi, block_t blkaddr) 
{

	int i;



	if (!f2fs_is_multi_device(sbi))

		return 0;



	for (i = 0; i < sbi->s_ndevs; i++)

		if (FDEV(i).start_blk <= blkaddr && FDEV(i).end_blk >= blkaddr)

			return i;

fs/f2fs/f2fs.h

+11 −0
Original line number Diff line number Diff line
@@ -1167,6 +1167,17 @@ static inline bool time_to_inject(struct f2fs_sb_info *sbi, int type) 
}

#endif



/*

 * Test if the mounted volume is a multi-device volume.

 *   - For a single regular disk volume, sbi->s_ndevs is 0.

 *   - For a single zoned disk volume, sbi->s_ndevs is 1.

 *   - For a multi-device volume, sbi->s_ndevs is always 2 or more.

 */

static inline bool f2fs_is_multi_device(struct f2fs_sb_info *sbi)

{

	return sbi->s_ndevs > 1;

}



/* For write statistics. Suppose sector size is 512 bytes,

 * and the return value is in kbytes. s is of struct f2fs_sb_info.

 */

fs/f2fs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -2407,7 +2407,7 @@ static int f2fs_ioc_flush_device(struct file *filp, unsigned long arg) 
							sizeof(range)))

		return -EFAULT;



	if (sbi->s_ndevs <= 1 || sbi->s_ndevs - 1 <= range.dev_num ||

	if (!f2fs_is_multi_device(sbi) || sbi->s_ndevs - 1 <= range.dev_num ||

			sbi->segs_per_sec != 1) {

		f2fs_msg(sbi->sb, KERN_WARNING,

			"Can't flush %u in %d for segs_per_sec %u != 1\n",

fs/f2fs/gc.c

+1 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,7 @@ void build_gc_manager(struct f2fs_sb_info *sbi) 
				BLKS_PER_SEC(sbi), (main_count - resv_count));



	/* give warm/cold data area from slower device */

	if (sbi->s_ndevs && sbi->segs_per_sec == 1)

	if (f2fs_is_multi_device(sbi) && sbi->segs_per_sec == 1)

		SIT_I(sbi)->last_victim[ALLOC_NEXT] =

				GET_SEGNO(sbi, FDEV(0).end_blk) + 1;

}

fs/f2fs/segment.c

+3 −3
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ static int submit_flush_wait(struct f2fs_sb_info *sbi) 
	int ret = __submit_flush_wait(sbi, sbi->sb->s_bdev);

	int i;



	if (!sbi->s_ndevs || ret)

	if (!f2fs_is_multi_device(sbi) || ret)

		return ret;



	for (i = 1; i < sbi->s_ndevs; i++) {
@@ -1050,7 +1050,7 @@ static int __queue_discard_cmd(struct f2fs_sb_info *sbi, 


	trace_f2fs_queue_discard(bdev, blkstart, blklen);



	if (sbi->s_ndevs) {

	if (f2fs_is_multi_device(sbi)) {

		int devi = f2fs_target_device_index(sbi, blkstart);



		blkstart -= FDEV(devi).start_blk;
@@ -1283,7 +1283,7 @@ static int __f2fs_issue_discard_zone(struct f2fs_sb_info *sbi, 
	block_t lblkstart = blkstart;

	int devi = 0;



	if (sbi->s_ndevs) {

	if (f2fs_is_multi_device(sbi)) {

		devi = f2fs_target_device_index(sbi, blkstart);

		blkstart -= FDEV(devi).start_blk;

	}