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>,
	Josef Bacik <josef@toxicpanda.com>
Subject: [PATCH v12 34/41] btrfs: implement copying for ZONED device-replace
Date: Fri, 15 Jan 2021 15:53:38 +0900	[thread overview]
Message-ID: <0ef506b58789744b96b46984f252aaaaca33d820.1610693037.git.naohiro.aota@wdc.com> (raw)
In-Reply-To: <cover.1610693036.git.naohiro.aota@wdc.com>

This is 3/4 patch to implement device-replace on ZONED mode.

This commit implement copying. So, it track the write pointer during device
replace process. Device-replace's copying is smart to copy only used
extents on source device, we have to fill the gap to honor the sequential
write rule in the target device.

Device-replace process in ZONED mode must copy or clone all the extents in
the source device exactly once.  So, we need to use to ensure allocations
started just before the dev-replace process to have their corresponding
extent information in the B-trees. finish_extent_writes_for_zoned()
implements that functionality, which basically is the removed code in the
commit 042528f8d840 ("Btrfs: fix block group remaining RO forever after
error during device replace").

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
---
 fs/btrfs/scrub.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++
 fs/btrfs/zoned.c | 12 +++++++
 fs/btrfs/zoned.h |  8 +++++
 3 files changed, 106 insertions(+)

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index b57c1184f330..b03c3629fb12 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -166,6 +166,7 @@ struct scrub_ctx {
 	int			pages_per_rd_bio;
 
 	int			is_dev_replace;
+	u64			write_pointer;
 
 	struct scrub_bio        *wr_curr_bio;
 	struct mutex            wr_lock;
@@ -1619,6 +1620,25 @@ static int scrub_write_page_to_dev_replace(struct scrub_block *sblock,
 	return scrub_add_page_to_wr_bio(sblock->sctx, spage);
 }
 
+static int fill_writer_pointer_gap(struct scrub_ctx *sctx, u64 physical)
+{
+	int ret = 0;
+	u64 length;
+
+	if (!btrfs_is_zoned(sctx->fs_info))
+		return 0;
+
+	if (sctx->write_pointer < physical) {
+		length = physical - sctx->write_pointer;
+
+		ret = btrfs_zoned_issue_zeroout(sctx->wr_tgtdev,
+						sctx->write_pointer, length);
+		if (!ret)
+			sctx->write_pointer = physical;
+	}
+	return ret;
+}
+
 static int scrub_add_page_to_wr_bio(struct scrub_ctx *sctx,
 				    struct scrub_page *spage)
 {
@@ -1641,6 +1661,13 @@ static int scrub_add_page_to_wr_bio(struct scrub_ctx *sctx,
 	if (sbio->page_count == 0) {
 		struct bio *bio;
 
+		ret = fill_writer_pointer_gap(sctx,
+					      spage->physical_for_dev_replace);
+		if (ret) {
+			mutex_unlock(&sctx->wr_lock);
+			return ret;
+		}
+
 		sbio->physical = spage->physical_for_dev_replace;
 		sbio->logical = spage->logical;
 		sbio->dev = sctx->wr_tgtdev;
@@ -1705,6 +1732,10 @@ static void scrub_wr_submit(struct scrub_ctx *sctx)
 	 * doubled the write performance on spinning disks when measured
 	 * with Linux 3.5 */
 	btrfsic_submit_bio(sbio->bio);
+
+	if (btrfs_is_zoned(sctx->fs_info))
+		sctx->write_pointer = sbio->physical +
+			sbio->page_count * PAGE_SIZE;
 }
 
 static void scrub_wr_bio_end_io(struct bio *bio)
@@ -3028,6 +3059,21 @@ static noinline_for_stack int scrub_raid56_parity(struct scrub_ctx *sctx,
 	return ret < 0 ? ret : 0;
 }
 
+static void sync_replace_for_zoned(struct scrub_ctx *sctx)
+{
+	if (!btrfs_is_zoned(sctx->fs_info))
+		return;
+
+	sctx->flush_all_writes = true;
+	scrub_submit(sctx);
+	mutex_lock(&sctx->wr_lock);
+	scrub_wr_submit(sctx);
+	mutex_unlock(&sctx->wr_lock);
+
+	wait_event(sctx->list_wait,
+		   atomic_read(&sctx->bios_in_flight) == 0);
+}
+
 static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
 					   struct map_lookup *map,
 					   struct btrfs_device *scrub_dev,
@@ -3168,6 +3214,14 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
 	 */
 	blk_start_plug(&plug);
 
+	if (sctx->is_dev_replace &&
+	    btrfs_dev_is_sequential(sctx->wr_tgtdev, physical)) {
+		mutex_lock(&sctx->wr_lock);
+		sctx->write_pointer = physical;
+		mutex_unlock(&sctx->wr_lock);
+		sctx->flush_all_writes = true;
+	}
+
 	/*
 	 * now find all extents for each stripe and scrub them
 	 */
@@ -3356,6 +3410,9 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
 			if (ret)
 				goto out;
 
+			if (sctx->is_dev_replace)
+				sync_replace_for_zoned(sctx);
+
 			if (extent_logical + extent_len <
 			    key.objectid + bytes) {
 				if (map->type & BTRFS_BLOCK_GROUP_RAID56_MASK) {
@@ -3478,6 +3535,25 @@ static noinline_for_stack int scrub_chunk(struct scrub_ctx *sctx,
 	return ret;
 }
 
+static int finish_extent_writes_for_zoned(struct btrfs_root *root,
+					  struct btrfs_block_group *cache)
+{
+	struct btrfs_fs_info *fs_info = cache->fs_info;
+	struct btrfs_trans_handle *trans;
+
+	if (!btrfs_is_zoned(fs_info))
+		return 0;
+
+	btrfs_wait_block_group_reservations(cache);
+	btrfs_wait_nocow_writers(cache);
+	btrfs_wait_ordered_roots(fs_info, U64_MAX, cache->start, cache->length);
+
+	trans = btrfs_join_transaction(root);
+	if (IS_ERR(trans))
+		return PTR_ERR(trans);
+	return btrfs_commit_transaction(trans);
+}
+
 static noinline_for_stack
 int scrub_enumerate_chunks(struct scrub_ctx *sctx,
 			   struct btrfs_device *scrub_dev, u64 start, u64 end)
@@ -3633,6 +3709,16 @@ int scrub_enumerate_chunks(struct scrub_ctx *sctx,
 		 * group is not RO.
 		 */
 		ret = btrfs_inc_block_group_ro(cache, sctx->is_dev_replace);
+		if (!ret && sctx->is_dev_replace) {
+			ret = finish_extent_writes_for_zoned(root, cache);
+			if (ret) {
+				btrfs_dec_block_group_ro(cache);
+				scrub_pause_off(fs_info);
+				btrfs_put_block_group(cache);
+				break;
+			}
+		}
+
 		if (ret == 0) {
 			ro_set = 1;
 		} else if (ret == -ENOSPC && !sctx->is_dev_replace) {
diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
index a50c441115ab..9344d49f8b56 100644
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
@@ -1381,3 +1381,15 @@ void btrfs_revert_meta_write_pointer(struct btrfs_block_group *cache,
 	ASSERT(cache->meta_write_pointer == eb->start + eb->len);
 	cache->meta_write_pointer = eb->start;
 }
+
+int btrfs_zoned_issue_zeroout(struct btrfs_device *device, u64 physical,
+			      u64 length)
+{
+	if (!btrfs_dev_is_sequential(device, physical))
+		return -EOPNOTSUPP;
+
+	return blkdev_issue_zeroout(device->bdev,
+				    physical >> SECTOR_SHIFT,
+				    length >> SECTOR_SHIFT,
+				    GFP_NOFS, 0);
+}
diff --git a/fs/btrfs/zoned.h b/fs/btrfs/zoned.h
index a42e120158ab..a9698470c08e 100644
--- a/fs/btrfs/zoned.h
+++ b/fs/btrfs/zoned.h
@@ -55,6 +55,8 @@ bool btrfs_check_meta_write_pointer(struct btrfs_fs_info *fs_info,
 				    struct btrfs_block_group **cache_ret);
 void btrfs_revert_meta_write_pointer(struct btrfs_block_group *cache,
 				     struct extent_buffer *eb);
+int btrfs_zoned_issue_zeroout(struct btrfs_device *device, u64 physical,
+			      u64 length);
 #else /* CONFIG_BLK_DEV_ZONED */
 static inline int btrfs_get_dev_zone(struct btrfs_device *device, u64 pos,
 				     struct blk_zone *zone)
@@ -169,6 +171,12 @@ static inline void btrfs_revert_meta_write_pointer(
 {
 }
 
+static inline int btrfs_zoned_issue_zeroout(struct btrfs_device *device,
+					    u64 physical, u64 length)
+{
+	return -EOPNOTSUPP;
+}
+
 #endif
 
 static inline bool btrfs_dev_is_sequential(struct btrfs_device *device, u64 pos)
-- 
2.27.0


  parent reply	other threads:[~2021-01-15  7:00 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 ` [PATCH v12 22/41] btrfs: split ordered extent when bio is sent Naohiro Aota
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 ` Naohiro Aota [this message]
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=0ef506b58789744b96b46984f252aaaaca33d820.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=josef@toxicpanda.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    /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).