Commit 5b316468 authored by Naohiro Aota's avatar Naohiro Aota Committed by David Sterba
Browse files

btrfs: get zone information of zoned block devices 



If a zoned block device is found, get its zone information (number of
zones and zone size).  To avoid costly run-time zone report
commands to test the device zones type during block allocation, attach
the seq_zones bitmap to the device structure to indicate if a zone is
sequential or accept random writes. Also it attaches the empty_zones
bitmap to indicate if a zone is empty or not.

This patch also introduces the helper function btrfs_dev_is_sequential()
to test if the zone storing a block is a sequential write required zone
and btrfs_dev_is_empty_zone() to test if the zone is a empty zone.

Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarNaohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 7b3d5a90

fs/btrfs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ 
btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o

btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o

btrfs-$(CONFIG_BTRFS_FS_REF_VERIFY) += ref-verify.o

btrfs-$(CONFIG_BLK_DEV_ZONED) += zoned.o



btrfs-$(CONFIG_BTRFS_FS_RUN_SANITY_TESTS) += tests/free-space-tests.o \

	tests/extent-buffer-tests.o tests/btrfs-tests.o \

fs/btrfs/dev-replace.c

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "rcu-string.h"

#include "dev-replace.h"

#include "sysfs.h"

#include "zoned.h"



/*

 * Device replace overview
@@ -313,6 +314,10 @@ static int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info, 
	set_blocksize(device->bdev, BTRFS_BDEV_BLOCKSIZE);

	device->fs_devices = fs_info->fs_devices;



	ret = btrfs_get_dev_zone_info(device);

	if (ret)

		goto error;



	mutex_lock(&fs_info->fs_devices->device_list_mutex);

	list_add(&device->dev_list, &fs_info->fs_devices->devices);

	fs_info->fs_devices->num_devices++;

fs/btrfs/super.c

+5 −0
Original line number Diff line number Diff line
@@ -2513,6 +2513,11 @@ static void __init btrfs_print_mod_info(void) 
#endif

#ifdef CONFIG_BTRFS_FS_REF_VERIFY

			", ref-verify=on"

#endif

#ifdef CONFIG_BLK_DEV_ZONED

			", zoned=yes"

#else

			", zoned=no"

#endif

			;

	pr_info("Btrfs loaded, crc32c=%s%s\n", crc32c_impl(), options);

fs/btrfs/volumes.c

+17 −3
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "space-info.h"

#include "block-group.h"

#include "discard.h"

#include "zoned.h"



const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = {

	[BTRFS_RAID_RAID10] = {
@@ -374,6 +375,7 @@ void btrfs_free_device(struct btrfs_device *device) 
	rcu_string_free(device->name);

	extent_io_tree_release(&device->alloc_state);

	bio_put(device->flush_bio);

	btrfs_destroy_dev_zone_info(device);

	kfree(device);

}
@@ -667,6 +669,10 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, 
	clear_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &device->dev_state);

	device->mode = flags;



	ret = btrfs_get_dev_zone_info(device);

	if (ret != 0)

		goto error_free_page;



	fs_devices->open_devices++;

	if (test_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state) &&

	    device->devid != BTRFS_DEV_REPLACE_DEVID) {
@@ -1137,6 +1143,7 @@ static void btrfs_close_one_device(struct btrfs_device *device) 
		device->bdev = NULL;

	}

	clear_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state);

	btrfs_destroy_dev_zone_info(device);



	device->fs_info = NULL;

	atomic_set(&device->dev_stats_ccnt, 0);
@@ -2541,10 +2548,17 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path 
	}

	rcu_assign_pointer(device->name, name);



	device->fs_info = fs_info;

	device->bdev = bdev;



	ret = btrfs_get_dev_zone_info(device);

	if (ret)

		goto error_free_device;



	trans = btrfs_start_transaction(root, 0);

	if (IS_ERR(trans)) {

		ret = PTR_ERR(trans);

		goto error_free_device;

		goto error_free_zone;

	}



	q = bdev_get_queue(bdev);
@@ -2557,8 +2571,6 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path 
					 fs_info->sectorsize);

	device->disk_total_bytes = device->total_bytes;

	device->commit_total_bytes = device->total_bytes;

	device->fs_info = fs_info;

	device->bdev = bdev;

	set_bit(BTRFS_DEV_STATE_IN_FS_METADATA, &device->dev_state);

	clear_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state);

	device->mode = FMODE_EXCL;
@@ -2705,6 +2717,8 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path 
		sb->s_flags |= SB_RDONLY;

	if (trans)

		btrfs_end_transaction(trans);

error_free_zone:

	btrfs_destroy_dev_zone_info(device);

error_free_device:

	btrfs_free_device(device);

error:

fs/btrfs/volumes.h

+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ struct btrfs_io_geometry { 
#define BTRFS_DEV_STATE_FLUSH_SENT	(4)

#define BTRFS_DEV_STATE_NO_READA	(5)



struct btrfs_zoned_device_info;



struct btrfs_device {

	struct list_head dev_list; /* device_list_mutex */

	struct list_head dev_alloc_list; /* chunk mutex */
@@ -65,6 +67,8 @@ struct btrfs_device { 


	struct block_device *bdev;



	struct btrfs_zoned_device_info *zone_info;



	/* the mode sent to blkdev_get */

	fmode_t mode;