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

btrfs: handle recording of zoned writes in the storage layer 



Move the code that splits the ordered extents and records the physical
location for them to the storage layer so that the higher level consumers
don't have to care about physical block numbers at all.  This will also
allow to eventually remove accounting for the zone append write sizes in
the upper layer with a little bit more block layer work.

Reviewed-by: default avatarNaohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f8a53bb5

fs/btrfs/bio.c

+8 −0
Original line number Diff line number Diff line
@@ -281,6 +281,8 @@ static void btrfs_simple_end_io(struct bio *bio) 
		INIT_WORK(&bbio->end_io_work, btrfs_end_bio_work);

		queue_work(btrfs_end_io_wq(fs_info, bio), &bbio->end_io_work);

	} else {

		if (bio_op(bio) == REQ_OP_ZONE_APPEND)

			btrfs_record_physical_zoned(bbio);

		bbio->end_io(bbio);

	}

}
@@ -599,6 +601,12 @@ void btrfs_submit_bio(struct btrfs_fs_info *fs_info, struct bio *bio, int mirror 
	}



	if (btrfs_op(bio) == BTRFS_MAP_WRITE) {

		if (bio_op(bio) == REQ_OP_ZONE_APPEND) {

			ret = btrfs_extract_ordered_extent(btrfs_bio(bio));

			if (ret)

				goto fail;

		}



		/*

		 * Csum items for reloc roots have already been cloned at this

		 * point, so they are handled as part of the no-checksum case.

fs/btrfs/btrfs_inode.h

+1 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ void btrfs_submit_data_read_bio(struct btrfs_inode *inode, struct bio *bio, 
			int mirror_num, enum btrfs_compression_type compress_type);

int btrfs_check_sector_csum(struct btrfs_fs_info *fs_info, struct page *page,

			    u32 pgoff, u8 *csum, const u8 * const csum_expected);

blk_status_t btrfs_extract_ordered_extent(struct btrfs_bio *bbio);

bool btrfs_data_csum_ok(struct btrfs_bio *bbio, struct btrfs_device *dev,

			u32 bio_offset, struct bio_vec *bv);

noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len,

fs/btrfs/compression.c

+0 −1
Original line number Diff line number Diff line
@@ -273,7 +273,6 @@ static void end_compressed_bio_write(struct btrfs_bio *bbio) 
	if (refcount_dec_and_test(&cb->pending_ios)) {

		struct btrfs_fs_info *fs_info = btrfs_sb(cb->inode->i_sb);



		btrfs_record_physical_zoned(cb->inode, cb->start, &bbio->bio);

		queue_work(fs_info->compressed_write_workers, &cb->write_end_work);

	}

	bio_put(&bbio->bio);

fs/btrfs/extent_io.c

+0 −6
Original line number Diff line number Diff line
@@ -586,7 +586,6 @@ static void end_bio_extent_writepage(struct btrfs_bio *bbio) 
	u64 start;

	u64 end;

	struct bvec_iter_all iter_all;

	bool first_bvec = true;



	ASSERT(!bio_flagged(bio, BIO_CLONED));

	bio_for_each_segment_all(bvec, bio, iter_all) {
@@ -608,11 +607,6 @@ static void end_bio_extent_writepage(struct btrfs_bio *bbio) 
		start = page_offset(page) + bvec->bv_offset;

		end = start + bvec->bv_len - 1;



		if (first_bvec) {

			btrfs_record_physical_zoned(inode, start, bio);

			first_bvec = false;

		}



		end_extent_writepage(page, error, start, end);



		btrfs_page_clear_writeback(fs_info, page, start, bvec->bv_len);

fs/btrfs/inode.c

+7 −30
Original line number Diff line number Diff line
@@ -2647,19 +2647,19 @@ static int split_zoned_em(struct btrfs_inode *inode, u64 start, u64 len, 
	return ret;

}



static blk_status_t extract_ordered_extent(struct btrfs_inode *inode,

					   struct bio *bio, loff_t file_offset)

blk_status_t btrfs_extract_ordered_extent(struct btrfs_bio *bbio)

{

	u64 start = (u64)bbio->bio.bi_iter.bi_sector << SECTOR_SHIFT;

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

	struct btrfs_inode *inode = bbio->inode;

	struct btrfs_ordered_extent *ordered;

	u64 start = (u64)bio->bi_iter.bi_sector << SECTOR_SHIFT;

	u64 file_len;

	u64 len = bio->bi_iter.bi_size;

	u64 end = start + len;

	u64 ordered_end;

	u64 pre, post;

	int ret = 0;



	ordered = btrfs_lookup_ordered_extent(inode, file_offset);

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

	if (WARN_ON_ONCE(!ordered))

		return BLK_STS_IOERR;
@@ -2699,7 +2699,7 @@ static blk_status_t extract_ordered_extent(struct btrfs_inode *inode, 
	ret = btrfs_split_ordered_extent(ordered, pre, post);

	if (ret)

		goto out;

	ret = split_zoned_em(inode, file_offset, file_len, pre, post);

	ret = split_zoned_em(inode, bbio->file_offset, file_len, pre, post);



out:

	btrfs_put_ordered_extent(ordered);
@@ -2709,19 +2709,7 @@ static blk_status_t extract_ordered_extent(struct btrfs_inode *inode, 


void btrfs_submit_data_write_bio(struct btrfs_inode *inode, struct bio *bio, int mirror_num)

{

	struct btrfs_fs_info *fs_info = inode->root->fs_info;

	blk_status_t ret;



	if (bio_op(bio) == REQ_OP_ZONE_APPEND) {

		ret = extract_ordered_extent(inode, bio,

				page_offset(bio_first_bvec_all(bio)->bv_page));

		if (ret) {

			btrfs_bio_end_io(btrfs_bio(bio), ret);

			return;

		}

	}



	btrfs_submit_bio(fs_info, bio, mirror_num);

	btrfs_submit_bio(inode->root->fs_info, bio, mirror_num);

}



void btrfs_submit_data_read_bio(struct btrfs_inode *inode, struct bio *bio,
@@ -7816,8 +7804,6 @@ static void btrfs_end_dio_bio(struct btrfs_bio *bbio) 
		dip->bio.bi_status = err;

	}



	btrfs_record_physical_zoned(&dip->inode->vfs_inode, bbio->file_offset, bio);



	bio_put(bio);

	btrfs_dio_private_put(dip);

}
@@ -7876,15 +7862,6 @@ static void btrfs_submit_direct(const struct iomap_iter *iter, 
					      dip);

		btrfs_bio(bio)->file_offset = file_offset;



		if (bio_op(bio) == REQ_OP_ZONE_APPEND) {

			status = extract_ordered_extent(BTRFS_I(inode), bio,

							file_offset);

			if (status) {

				bio_put(bio);

				goto out_err;

			}

		}



		ASSERT(submit_len >= clone_len);

		submit_len -= clone_len;