linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Naohiro Aota <naohiro.aota@wdc.com>
To: linux-btrfs@vger.kernel.org, dsterba@suse.com
Cc: hare@suse.com, linux-fsdevel@vger.kernel.org,
	Jens Axboe <axboe@kernel.dk>,
	Christoph Hellwig <hch@infradead.org>,
	"Darrick J. Wong" <darrick.wong@oracle.com>,
	Naohiro Aota <naohiro.aota@wdc.com>,
	kernel test robot <lkp@intel.com>
Subject: [PATCH v12 22/41] btrfs: split ordered extent when bio is sent
Date: Fri, 15 Jan 2021 15:53:26 +0900	[thread overview]
Message-ID: <cb83b82d8a837a4293435157844606307227a128.1610693037.git.naohiro.aota@wdc.com> (raw)
In-Reply-To: <cover.1610693036.git.naohiro.aota@wdc.com>

For a zone append write, the device decides the location the data is
written to. Therefore we cannot ensure that two bios are written
consecutively on the device. In order to ensure that a ordered extent maps
to a contiguous region on disk, we need to maintain a "one bio == one
ordered extent" rule.

This commit implements the splitting of an ordered extent and extent map
on bio submission to adhere to the rule.

[testbot] made extract_ordered_extent static
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
---
 fs/btrfs/inode.c        | 91 +++++++++++++++++++++++++++++++++++++++++
 fs/btrfs/ordered-data.c | 85 ++++++++++++++++++++++++++++++++++++++
 fs/btrfs/ordered-data.h |  2 +
 3 files changed, 178 insertions(+)

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 37782b4cfd28..4df5900dd197 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2217,6 +2217,88 @@ static blk_status_t btrfs_submit_bio_start(struct inode *inode, struct bio *bio,
 	return btrfs_csum_one_bio(BTRFS_I(inode), bio, 0, 0);
 }
 
+static int extract_ordered_extent(struct inode *inode, struct bio *bio,
+				  loff_t file_offset)
+{
+	struct btrfs_ordered_extent *ordered;
+	struct extent_map *em = NULL, *em_new = NULL;
+	struct extent_map_tree *em_tree = &BTRFS_I(inode)->extent_tree;
+	u64 start = (u64)bio->bi_iter.bi_sector << SECTOR_SHIFT;
+	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(BTRFS_I(inode), file_offset);
+	if (WARN_ON_ONCE(!ordered))
+		return -EIO;
+
+	/* No need to split */
+	if (ordered->disk_num_bytes == len)
+		goto out;
+
+	/* We cannot split once end_bio'd ordered extent */
+	if (WARN_ON_ONCE(ordered->bytes_left != ordered->disk_num_bytes)) {
+		ret = -EINVAL;
+		goto out;
+	}
+
+	/* We cannot split a compressed ordered extent */
+	if (WARN_ON_ONCE(ordered->disk_num_bytes != ordered->num_bytes)) {
+		ret = -EINVAL;
+		goto out;
+	}
+
+	/* We cannot split a waited ordered extent */
+	if (WARN_ON_ONCE(wq_has_sleeper(&ordered->wait))) {
+		ret = -EINVAL;
+		goto out;
+	}
+
+	ordered_end = ordered->disk_bytenr + ordered->disk_num_bytes;
+	/* bio must be in one ordered extent */
+	if (WARN_ON_ONCE(start < ordered->disk_bytenr || end > ordered_end)) {
+		ret = -EINVAL;
+		goto out;
+	}
+
+	/* Checksum list should be empty */
+	if (WARN_ON_ONCE(!list_empty(&ordered->list))) {
+		ret = -EINVAL;
+		goto out;
+	}
+
+	pre = start - ordered->disk_bytenr;
+	post = ordered_end - end;
+
+	ret = btrfs_split_ordered_extent(ordered, pre, post);
+	if (ret)
+		goto out;
+
+	read_lock(&em_tree->lock);
+	em = lookup_extent_mapping(em_tree, ordered->file_offset, len);
+	if (!em) {
+		read_unlock(&em_tree->lock);
+		ret = -EIO;
+		goto out;
+	}
+	read_unlock(&em_tree->lock);
+
+	ASSERT(!test_bit(EXTENT_FLAG_COMPRESSED, &em->flags));
+	em_new = create_io_em(BTRFS_I(inode), em->start + pre, len,
+			      em->start + pre, em->block_start + pre, len,
+			      len, len, BTRFS_COMPRESS_NONE,
+			      BTRFS_ORDERED_REGULAR);
+	free_extent_map(em_new);
+
+out:
+	free_extent_map(em);
+	btrfs_put_ordered_extent(ordered);
+
+	return ret;
+}
+
 /*
  * extent_io.c submission hook. This does the right thing for csum calculation
  * on write, or reading the csums from the tree before a read.
@@ -2252,6 +2334,15 @@ blk_status_t btrfs_submit_data_bio(struct inode *inode, struct bio *bio,
 	if (btrfs_is_free_space_inode(BTRFS_I(inode)))
 		metadata = BTRFS_WQ_ENDIO_FREE_SPACE;
 
+	if (bio_op(bio) == REQ_OP_ZONE_APPEND) {
+		struct page *page = bio_first_bvec_all(bio)->bv_page;
+		loff_t file_offset = page_offset(page);
+
+		ret = extract_ordered_extent(inode, bio, file_offset);
+		if (ret)
+			goto out;
+	}
+
 	if (btrfs_op(bio) != BTRFS_MAP_WRITE) {
 		ret = btrfs_bio_wq_end_io(fs_info, bio, metadata);
 		if (ret)
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 79d366a36223..6e4ffb3861e7 100644
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -898,6 +898,91 @@ void btrfs_lock_and_flush_ordered_range(struct btrfs_inode *inode, u64 start,
 	}
 }
 
+static int clone_ordered_extent(struct btrfs_ordered_extent *ordered, u64 pos,
+				u64 len)
+{
+	struct inode *inode = ordered->inode;
+	u64 file_offset = ordered->file_offset + pos;
+	u64 disk_bytenr = ordered->disk_bytenr + pos;
+	u64 num_bytes = len;
+	u64 disk_num_bytes = len;
+	int type;
+	unsigned long flags_masked =
+		ordered->flags & ~(1 << BTRFS_ORDERED_DIRECT);
+	int compress_type = ordered->compress_type;
+	unsigned long weight;
+	int ret;
+
+	weight = hweight_long(flags_masked);
+	WARN_ON_ONCE(weight > 1);
+	if (!weight)
+		type = 0;
+	else
+		type = __ffs(flags_masked);
+
+	if (test_bit(BTRFS_ORDERED_COMPRESSED, &ordered->flags)) {
+		WARN_ON_ONCE(1);
+		ret = btrfs_add_ordered_extent_compress(BTRFS_I(inode),
+							file_offset,
+							disk_bytenr, num_bytes,
+							disk_num_bytes, type,
+							compress_type);
+	} else if (test_bit(BTRFS_ORDERED_DIRECT, &ordered->flags)) {
+		ret = btrfs_add_ordered_extent_dio(BTRFS_I(inode), file_offset,
+						   disk_bytenr, num_bytes,
+						   disk_num_bytes, type);
+	} else {
+		ret = btrfs_add_ordered_extent(BTRFS_I(inode), file_offset,
+					       disk_bytenr, num_bytes,
+					       disk_num_bytes, type);
+	}
+
+	return ret;
+}
+
+int btrfs_split_ordered_extent(struct btrfs_ordered_extent *ordered, u64 pre,
+				u64 post)
+{
+	struct inode *inode = ordered->inode;
+	struct btrfs_ordered_inode_tree *tree = &BTRFS_I(inode)->ordered_tree;
+	struct rb_node *node;
+	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
+	int ret = 0;
+
+	spin_lock_irq(&tree->lock);
+	/* Remove from tree once */
+	node = &ordered->rb_node;
+	rb_erase(node, &tree->tree);
+	RB_CLEAR_NODE(node);
+	if (tree->last == node)
+		tree->last = NULL;
+
+	ordered->file_offset += pre;
+	ordered->disk_bytenr += pre;
+	ordered->num_bytes -= (pre + post);
+	ordered->disk_num_bytes -= (pre + post);
+	ordered->bytes_left -= (pre + post);
+
+	/* Re-insert the node */
+	node = tree_insert(&tree->tree, ordered->file_offset,
+			   &ordered->rb_node);
+	if (node)
+		btrfs_panic(fs_info, -EEXIST,
+				"zoned: inconsistency in ordered tree at offset %llu",
+				ordered->file_offset);
+
+	spin_unlock_irq(&tree->lock);
+
+	if (pre)
+		ret = clone_ordered_extent(ordered, 0, pre);
+	if (post)
+		ret = clone_ordered_extent(ordered,
+					   pre + ordered->disk_num_bytes,
+					   post);
+
+	return ret;
+}
+
 int __init ordered_data_init(void)
 {
 	btrfs_ordered_extent_cache = kmem_cache_create("btrfs_ordered_extent",
diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h
index 0bfa82b58e23..2ff238b78eda 100644
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
@@ -190,6 +190,8 @@ void btrfs_wait_ordered_roots(struct btrfs_fs_info *fs_info, u64 nr,
 void btrfs_lock_and_flush_ordered_range(struct btrfs_inode *inode, u64 start,
 					u64 end,
 					struct extent_state **cached_state);
+int btrfs_split_ordered_extent(struct btrfs_ordered_extent *ordered, u64 pre,
+			       u64 post);
 int __init ordered_data_init(void);
 void __cold ordered_data_exit(void);
 
-- 
2.27.0


  parent reply	other threads:[~2021-01-15  6:59 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-15  6:53 [PATCH v12 00/41] btrfs: zoned block device support Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 01/41] block: add bio_add_zone_append_page Naohiro Aota
2021-01-15 22:03   ` Josef Bacik
2021-01-20 13:34   ` Johannes Thumshirn
2021-01-15  6:53 ` [PATCH v12 02/41] iomap: support REQ_OP_ZONE_APPEND Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 03/41] btrfs: defer loading zone info after opening trees Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 04/41] btrfs: use regular SB location on emulated zoned mode Naohiro Aota
2021-01-15 22:20   ` Josef Bacik
2021-01-15  6:53 ` [PATCH v12 05/41] btrfs: release path before calling into btrfs_load_block_group_zone_info Naohiro Aota
2021-01-15 22:22   ` Josef Bacik
2021-01-18  8:55     ` Johannes Thumshirn
2021-01-15  6:53 ` [PATCH v12 06/41] btrfs: do not load fs_info->zoned from incompat flag Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 07/41] btrfs: disallow fitrim in ZONED mode Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 08/41] btrfs: allow zoned mode on non-zoned block devices Naohiro Aota
2021-01-15 22:07   ` Josef Bacik
2021-01-18 14:15     ` Naohiro Aota
2021-01-19  0:28       ` Anand Jain
2021-01-15  6:53 ` [PATCH v12 08/41] btrfs: emulated zoned mode on non-zoned devices Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 09/41] btrfs: implement zoned chunk allocator Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 10/41] btrfs: verify device extent is aligned to zone Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 11/41] btrfs: load zone's allocation offset Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 12/41] btrfs: calculate allocation offset for conventional zones Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 13/41] btrfs: track unusable bytes for zones Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 14/41] btrfs: do sequential extent allocation in ZONED mode Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 15/41] btrfs: redirty released extent buffers " Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 16/41] btrfs: advance allocation pointer after tree log node Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 17/41] btrfs: enable to mount ZONED incompat flag Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 18/41] btrfs: reset zones of unused block groups Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 19/41] btrfs: extract page adding function Naohiro Aota
2021-01-15 22:14   ` Josef Bacik
2021-01-15  6:53 ` [PATCH v12 20/41] btrfs: use bio_add_zone_append_page for zoned btrfs Naohiro Aota
2021-01-15 22:16   ` Josef Bacik
2021-01-15  6:53 ` [PATCH v12 21/41] btrfs: handle REQ_OP_ZONE_APPEND as writing Naohiro Aota
2021-01-15  6:53 ` Naohiro Aota [this message]
2021-01-15  6:53 ` [PATCH v12 23/41] btrfs: extend btrfs_rmap_block for specifying a device Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 24/41] btrfs: cache if block-group is on a sequential zone Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 25/41] btrfs: save irq flags when looking up an ordered extent Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 26/41] btrfs: use ZONE_APPEND write for ZONED btrfs Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 27/41] btrfs: enable zone append writing for direct IO Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 28/41] btrfs: introduce dedicated data write path for ZONED mode Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 29/41] btrfs: serialize meta IOs on " Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 30/41] btrfs: wait existing extents before truncating Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 31/41] btrfs: avoid async metadata checksum on ZONED mode Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 32/41] btrfs: mark block groups to copy for device-replace Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 33/41] btrfs: implement cloning for ZONED device-replace Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 34/41] btrfs: implement copying " Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 35/41] btrfs: support dev-replace in ZONED mode Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 36/41] btrfs: enable relocation " Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 37/41] btrfs: relocate block group to repair IO failure in ZONED Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 38/41] btrfs: split alloc_log_tree() Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 39/41] btrfs: extend zoned allocator to use dedicated tree-log block group Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 40/41] btrfs: serialize log transaction on ZONED mode Naohiro Aota
2021-01-15  6:53 ` [PATCH v12 41/41] btrfs: reorder log node allocation Naohiro Aota

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cb83b82d8a837a4293435157844606307227a128.1610693037.git.naohiro.aota@wdc.com \
    --to=naohiro.aota@wdc.com \
    --cc=axboe@kernel.dk \
    --cc=darrick.wong@oracle.com \
    --cc=dsterba@suse.com \
    --cc=hare@suse.com \
    --cc=hch@infradead.org \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=lkp@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).