Commit cbfce4c7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

btrfs: optimize the logical to physical mapping for zoned writes 



The current code to store the final logical to physical mapping for a
zone append write in the extent tree is rather inefficient.  It first has
to split the ordered extent so that there is one ordered extent per bio,
so that it can look up the ordered extent on I/O completion in
btrfs_record_physical_zoned and store the physical LBA returned by the
block driver in the ordered extent.

btrfs_rewrite_logical_zoned then has to do a lookup in the chunk tree to
see what physical address the logical address for this bio / ordered
extent is mapped to, and then rewrite it in the extent tree.

To optimize this process, we can store the physical address assigned in
the chunk tree to the original logical address and a pointer to
btrfs_ordered_sum structure the in the btrfs_bio structure, and then use
this information to rewrite the logical address in the btrfs_ordered_sum
structure directly at I/O completion time in btrfs_record_physical_zoned.
btrfs_rewrite_logical_zoned then simply updates the logical address in
the extent tree and the ordered_extent itself.

The code in btrfs_rewrite_logical_zoned now runs for all data I/O
completions in zoned file systems, which is fine as there is no remapping
to do for non-append writes to conventional zones or for relocation, and
the overhead for quickly breaking out of the loop is very low.

Because zoned file systems now need the ordered_sums structure to
record the actual write location returned by zone append, allocate dummy
structures without the csum array for them when the I/O doesn't use
checksums, and free them when completing the ordered_extent.

Note that the btrfs_bio doesn't grow as the new field are places into
a union that is so far not used for data writes and has plenty of space
left in it.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 5cfe76f8

fs/btrfs/bio.c

+5 −0
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ static void btrfs_submit_dev_bio(struct btrfs_device *dev, struct bio *bio) 
		u64 zone_start = round_down(physical, dev->fs_info->zone_size);



		ASSERT(btrfs_dev_is_sequential(dev, physical));

		btrfs_bio(bio)->orig_physical = physical;

		bio->bi_iter.bi_sector = zone_start >> SECTOR_SHIFT;

	}

	btrfs_debug_in_rcu(dev->fs_info,
@@ -685,6 +686,10 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num) 
			ret = btrfs_bio_csum(bbio);

			if (ret)

				goto fail_put_bio;

		} else if (use_append) {

			ret = btrfs_alloc_dummy_sum(bbio);

			if (ret)

				goto fail_put_bio;

		}

	}

fs/btrfs/bio.h

+14 −3
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ struct btrfs_bio { 


	union {

		/*

		 * Data checksumming and original I/O information for internal

		 * use in the btrfs_submit_bio machinery.

		 * For data reads: checksumming and original I/O information.

		 * (for internal use in the btrfs_submit_bio machinery only)

		 */

		struct {

			u8 *csum;
@@ -48,7 +48,18 @@ struct btrfs_bio { 
			struct bvec_iter saved_iter;

		};



		/* For metadata parentness verification. */

		/*

		 * For data writes:

		 * - pointer to the checksums for this bio

		 * - original physical address from the allocator

		 *   (for zone append only)

		 */

		struct {

			struct btrfs_ordered_sum *sums;

			u64 orig_physical;

		};



		/* For metadata reads: parentness verification. */

		struct btrfs_tree_parent_check parent_check;

	};

fs/btrfs/file-item.c

+30 −0
Original line number Diff line number Diff line
@@ -818,11 +818,41 @@ blk_status_t btrfs_csum_one_bio(struct btrfs_bio *bbio) 


	}

	this_sum_bytes = 0;



	/*

	 * The ->sums assignment is for zoned writes, where a bio never spans

	 * ordered extents and is only done unconditionally because that's cheaper

	 * than a branch.

	 */

	bbio->sums = sums;

	btrfs_add_ordered_sum(ordered, sums);

	btrfs_put_ordered_extent(ordered);

	return 0;

}



/*

 * Nodatasum I/O on zoned file systems still requires an btrfs_ordered_sum to

 * record the updated logical address on Zone Append completion.

 * Allocate just the structure with an empty sums array here for that case.

 */

blk_status_t btrfs_alloc_dummy_sum(struct btrfs_bio *bbio)

{

	struct btrfs_ordered_extent *ordered =

		btrfs_lookup_ordered_extent(bbio->inode, bbio->file_offset);



	if (WARN_ON_ONCE(!ordered))

		return BLK_STS_IOERR;



	bbio->sums = kmalloc(sizeof(*bbio->sums), GFP_NOFS);

	if (!bbio->sums)

		return BLK_STS_RESOURCE;

	bbio->sums->len = bbio->bio.bi_iter.bi_size;

	bbio->sums->logical = bbio->bio.bi_iter.bi_sector << SECTOR_SHIFT;

	btrfs_add_ordered_sum(ordered, bbio->sums);

	btrfs_put_ordered_extent(ordered);

	return 0;

}



/*

 * Remove one checksum overlapping a range.

 *

fs/btrfs/file-item.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans, 
			   struct btrfs_root *root,

			   struct btrfs_ordered_sum *sums);

blk_status_t btrfs_csum_one_bio(struct btrfs_bio *bbio);

blk_status_t btrfs_alloc_dummy_sum(struct btrfs_bio *bbio);

int btrfs_lookup_csums_range(struct btrfs_root *root, u64 start, u64 end,

			     struct list_head *list, int search_commit,

			     bool nowait);

fs/btrfs/inode.c

+1 −5
Original line number Diff line number Diff line
@@ -3301,14 +3301,10 @@ int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) 
		goto out;

	}



	/* A valid ->physical implies a write on a sequential zone. */

	if (ordered_extent->physical != (u64)-1) {

	if (btrfs_is_zoned(fs_info)) {

		btrfs_rewrite_logical_zoned(ordered_extent);

		btrfs_zone_finish_endio(fs_info, ordered_extent->disk_bytenr,

					ordered_extent->disk_num_bytes);

	} else if (btrfs_is_data_reloc_root(inode->root)) {

		btrfs_zone_finish_endio(fs_info, ordered_extent->disk_bytenr,

					ordered_extent->disk_num_bytes);

	}



	if (test_bit(BTRFS_ORDERED_TRUNCATED, &ordered_extent->flags)) {