All of lore.kernel.org
 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 33/41] btrfs: implement cloning for ZONED device-replace
Date: Fri, 15 Jan 2021 15:53:37 +0900	[thread overview]
Message-ID: <cc6e7035d0a0851b90749a26d0e6c5da7a1f0b8e.1610693037.git.naohiro.aota@wdc.com> (raw)
In-Reply-To: <cover.1610693036.git.naohiro.aota@wdc.com>

This is 2/4 patch to implement device-replace for ZONED mode.

On zoned mode, a block group must be either copied (from the source device
to the destination device) or cloned (to the both device).

This commit implements the cloning part. If a block group targeted by an IO
is marked to copy, we should not clone the IO to the destination device,
because the block group is eventually copied by the replace process.

This commit also handles cloning of device reset.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
---
 fs/btrfs/extent-tree.c | 57 +++++++++++++++++++++++++++++++-----------
 fs/btrfs/volumes.c     | 33 ++++++++++++++++++++++--
 fs/btrfs/zoned.c       | 11 ++++++++
 3 files changed, 84 insertions(+), 17 deletions(-)

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index ac24a79ce32a..23d77e3196ca 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -35,6 +35,7 @@
 #include "discard.h"
 #include "rcu-string.h"
 #include "zoned.h"
+#include "dev-replace.h"
 
 #undef SCRAMBLE_DELAYED_REFS
 
@@ -1300,6 +1301,46 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len,
 	return ret;
 }
 
+static int do_discard_extent(struct btrfs_bio_stripe *stripe, u64 *bytes)
+{
+	struct btrfs_device *dev = stripe->dev;
+	struct btrfs_fs_info *fs_info = dev->fs_info;
+	struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace;
+	u64 phys = stripe->physical;
+	u64 len = stripe->length;
+	u64 discarded = 0;
+	int ret = 0;
+
+	/* Zone reset in ZONED mode */
+	if (btrfs_can_zone_reset(dev, phys, len)) {
+		u64 src_disc;
+
+		ret = btrfs_reset_device_zone(dev, phys, len, &discarded);
+		if (ret)
+			goto out;
+
+		if (!btrfs_dev_replace_is_ongoing(dev_replace) ||
+		    dev != dev_replace->srcdev)
+			goto out;
+
+		src_disc = discarded;
+
+		/* send to replace target as well */
+		ret = btrfs_reset_device_zone(dev_replace->tgtdev, phys, len,
+					      &discarded);
+		discarded += src_disc;
+	} else if (blk_queue_discard(bdev_get_queue(stripe->dev->bdev))) {
+		ret = btrfs_issue_discard(dev->bdev, phys, len, &discarded);
+	} else {
+		ret = 0;
+		*bytes = 0;
+	}
+
+out:
+	*bytes = discarded;
+	return ret;
+}
+
 int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr,
 			 u64 num_bytes, u64 *actual_bytes)
 {
@@ -1333,28 +1374,14 @@ int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr,
 
 		stripe = bbio->stripes;
 		for (i = 0; i < bbio->num_stripes; i++, stripe++) {
-			struct btrfs_device *dev = stripe->dev;
-			u64 physical = stripe->physical;
-			u64 length = stripe->length;
 			u64 bytes;
-			struct request_queue *req_q;
 
 			if (!stripe->dev->bdev) {
 				ASSERT(btrfs_test_opt(fs_info, DEGRADED));
 				continue;
 			}
 
-			req_q = bdev_get_queue(stripe->dev->bdev);
-			/* Zone reset in ZONED mode */
-			if (btrfs_can_zone_reset(dev, physical, length))
-				ret = btrfs_reset_device_zone(dev, physical,
-							      length, &bytes);
-			else if (blk_queue_discard(req_q))
-				ret = btrfs_issue_discard(dev->bdev, physical,
-							  length, &bytes);
-			else
-				continue;
-
+			ret = do_discard_extent(stripe, &bytes);
 			if (!ret) {
 				discarded_bytes += bytes;
 			} else if (ret != -EOPNOTSUPP) {
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index c8c94e5081eb..f3ab7ff0769f 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -5973,9 +5973,29 @@ static int get_extra_mirror_from_replace(struct btrfs_fs_info *fs_info,
 	return ret;
 }
 
+static bool is_block_group_to_copy(struct btrfs_fs_info *fs_info, u64 logical)
+{
+	struct btrfs_block_group *cache;
+	bool ret;
+
+	/* non-ZONED mode does not use "to_copy" flag */
+	if (!btrfs_is_zoned(fs_info))
+		return false;
+
+	cache = btrfs_lookup_block_group(fs_info, logical);
+
+	spin_lock(&cache->lock);
+	ret = cache->to_copy;
+	spin_unlock(&cache->lock);
+
+	btrfs_put_block_group(cache);
+	return ret;
+}
+
 static void handle_ops_on_dev_replace(enum btrfs_map_op op,
 				      struct btrfs_bio **bbio_ret,
 				      struct btrfs_dev_replace *dev_replace,
+				      u64 logical,
 				      int *num_stripes_ret, int *max_errors_ret)
 {
 	struct btrfs_bio *bbio = *bbio_ret;
@@ -5988,6 +6008,15 @@ static void handle_ops_on_dev_replace(enum btrfs_map_op op,
 	if (op == BTRFS_MAP_WRITE) {
 		int index_where_to_add;
 
+		/*
+		 * a block group which have "to_copy" set will
+		 * eventually copied by dev-replace process. We can
+		 * avoid cloning IO here.
+		 */
+		if (is_block_group_to_copy(dev_replace->srcdev->fs_info,
+					   logical))
+			return;
+
 		/*
 		 * duplicate the write operations while the dev replace
 		 * procedure is running. Since the copying of the old disk to
@@ -6383,8 +6412,8 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info,
 
 	if (dev_replace_is_ongoing && dev_replace->tgtdev != NULL &&
 	    need_full_stripe(op)) {
-		handle_ops_on_dev_replace(op, &bbio, dev_replace, &num_stripes,
-					  &max_errors);
+		handle_ops_on_dev_replace(op, &bbio, dev_replace, logical,
+					  &num_stripes, &max_errors);
 	}
 
 	*bbio_ret = bbio;
diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
index d4edcc5edcfc..a50c441115ab 100644
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
@@ -11,6 +11,7 @@
 #include "disk-io.h"
 #include "block-group.h"
 #include "transaction.h"
+#include "dev-replace.h"
 
 /* Maximum number of zones to report per blkdev_report_zones() call */
 #define BTRFS_REPORT_NR_ZONES   4096
@@ -1039,6 +1040,8 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)
 	for (i = 0; i < map->num_stripes; i++) {
 		bool is_sequential;
 		struct blk_zone zone;
+		struct btrfs_dev_replace *dev_replace = &fs_info->dev_replace;
+		int dev_replace_is_ongoing = 0;
 
 		device = map->stripes[i].dev;
 		physical = map->stripes[i].physical;
@@ -1065,6 +1068,14 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)
 		 */
 		btrfs_dev_clear_zone_empty(device, physical);
 
+		down_read(&dev_replace->rwsem);
+		dev_replace_is_ongoing =
+			btrfs_dev_replace_is_ongoing(dev_replace);
+		if (dev_replace_is_ongoing && dev_replace->tgtdev != NULL)
+			btrfs_dev_clear_zone_empty(dev_replace->tgtdev,
+						   physical);
+		up_read(&dev_replace->rwsem);
+
 		/*
 		 * The group is mapped to a sequential zone. Get the zone write
 		 * pointer to determine the allocation offset within the zone.
-- 
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 ` Naohiro Aota [this message]
2021-01-15  6:53 ` [PATCH v12 34/41] btrfs: implement copying for ZONED device-replace 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=cc6e7035d0a0851b90749a26d0e6c5da7a1f0b8e.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.