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,
Naohiro Aota <naohiro.aota@wdc.com>
Subject: [PATCH v9 24/41] btrfs: extend btrfs_rmap_block for specifying a device
Date: Fri, 30 Oct 2020 22:51:31 +0900 [thread overview]
Message-ID: <3ee4958e7ebcc06973ed2d7c84a9cf9240d6e7d7.1604065695.git.naohiro.aota@wdc.com> (raw)
In-Reply-To: <d9a0a445560db3a9eb240c6535f8dd1bbd0abd96.1604065694.git.naohiro.aota@wdc.com>
btrfs_rmap_block currently reverse-maps the physical addresses on all
devices to the corresponding logical addresses.
This commit extends the function to match to a specified device. The old
functionality of querying all devices is left intact by specifying NULL as
target device.
We pass block_device instead of btrfs_device to __btrfs_rmap_block. This
function is intended to reverse-map the result of bio, which only have
block_device.
This commit also exports the function for later use.
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
---
fs/btrfs/block-group.c | 28 ++++++++++++++++++++++------
fs/btrfs/block-group.h | 3 +++
2 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
index 82d556368c85..21e40046dce1 100644
--- a/fs/btrfs/block-group.c
+++ b/fs/btrfs/block-group.c
@@ -1644,8 +1644,11 @@ static void set_avail_alloc_bits(struct btrfs_fs_info *fs_info, u64 flags)
}
/**
- * btrfs_rmap_block - Map a physical disk address to a list of logical addresses
+ * __btrfs_rmap_block - Map a physical disk address to a list of logical
+ * addresses
* @chunk_start: logical address of block group
+ * @bdev: physical device to resolve. Can be NULL to indicate any
+ * device.
* @physical: physical address to map to logical addresses
* @logical: return array of logical addresses which map to @physical
* @naddrs: length of @logical
@@ -1655,9 +1658,9 @@ static void set_avail_alloc_bits(struct btrfs_fs_info *fs_info, u64 flags)
* Used primarily to exclude those portions of a block group that contain super
* block copies.
*/
-EXPORT_FOR_TESTS
-int btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start,
- u64 physical, u64 **logical, int *naddrs, int *stripe_len)
+int __btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start,
+ struct block_device *bdev, u64 physical, u64 **logical,
+ int *naddrs, int *stripe_len)
{
struct extent_map *em;
struct map_lookup *map;
@@ -1675,6 +1678,7 @@ int btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start,
map = em->map_lookup;
data_stripe_length = em->orig_block_len;
io_stripe_size = map->stripe_len;
+ chunk_start = em->start;
/* For RAID5/6 adjust to a full IO stripe length */
if (map->type & BTRFS_BLOCK_GROUP_RAID56_MASK)
@@ -1689,14 +1693,18 @@ int btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start,
for (i = 0; i < map->num_stripes; i++) {
bool already_inserted = false;
u64 stripe_nr;
+ u64 offset;
int j;
if (!in_range(physical, map->stripes[i].physical,
data_stripe_length))
continue;
+ if (bdev && map->stripes[i].dev->bdev != bdev)
+ continue;
+
stripe_nr = physical - map->stripes[i].physical;
- stripe_nr = div64_u64(stripe_nr, map->stripe_len);
+ stripe_nr = div64_u64_rem(stripe_nr, map->stripe_len, &offset);
if (map->type & BTRFS_BLOCK_GROUP_RAID10) {
stripe_nr = stripe_nr * map->num_stripes + i;
@@ -1710,7 +1718,7 @@ int btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start,
* instead of map->stripe_len
*/
- bytenr = chunk_start + stripe_nr * io_stripe_size;
+ bytenr = chunk_start + stripe_nr * io_stripe_size + offset;
/* Ensure we don't add duplicate addresses */
for (j = 0; j < nr; j++) {
@@ -1732,6 +1740,14 @@ int btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start,
return ret;
}
+EXPORT_FOR_TESTS
+int btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start,
+ u64 physical, u64 **logical, int *naddrs, int *stripe_len)
+{
+ return __btrfs_rmap_block(fs_info, chunk_start, NULL, physical, logical,
+ naddrs, stripe_len);
+}
+
static int exclude_super_stripes(struct btrfs_block_group *cache)
{
struct btrfs_fs_info *fs_info = cache->fs_info;
diff --git a/fs/btrfs/block-group.h b/fs/btrfs/block-group.h
index 5be47f4bfea7..401e9bcefaec 100644
--- a/fs/btrfs/block-group.h
+++ b/fs/btrfs/block-group.h
@@ -275,6 +275,9 @@ void check_system_chunk(struct btrfs_trans_handle *trans, const u64 type);
u64 btrfs_get_alloc_profile(struct btrfs_fs_info *fs_info, u64 orig_flags);
void btrfs_put_block_group_cache(struct btrfs_fs_info *info);
int btrfs_free_block_groups(struct btrfs_fs_info *info);
+int __btrfs_rmap_block(struct btrfs_fs_info *fs_info, u64 chunk_start,
+ struct block_device *bdev, u64 physical, u64 **logical,
+ int *naddrs, int *stripe_len);
static inline u64 btrfs_data_alloc_profile(struct btrfs_fs_info *fs_info)
{
--
2.27.0
next prev parent reply other threads:[~2020-10-30 13:53 UTC|newest]
Thread overview: 119+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-30 13:51 [PATCH v9 00/41] btrfs: zoned block device support Naohiro Aota
2020-10-30 13:51 ` [PATCH v9 01/41] block: add bio_add_zone_append_page Naohiro Aota
2020-10-30 13:51 ` [PATCH v9 02/41] iomap: support REQ_OP_ZONE_APPEND Naohiro Aota
2020-11-02 5:34 ` Naohiro Aota
2020-11-02 16:55 ` Darrick J. Wong
2020-11-02 17:39 ` Johannes Thumshirn
2020-10-30 13:51 ` [PATCH v9 03/41] btrfs: introduce ZONED feature flag Naohiro Aota
2020-10-30 13:51 ` [PATCH v9 04/41] btrfs: Get zone information of zoned block devices Naohiro Aota
2020-11-02 16:53 ` Josef Bacik
2020-11-02 16:58 ` Johannes Thumshirn
2020-11-02 21:07 ` Naohiro Aota
2020-11-03 12:02 ` David Sterba
2020-10-30 13:51 ` [PATCH v9 05/41] btrfs: Check and enable ZONED mode Naohiro Aota
2020-11-03 12:13 ` David Sterba
2020-11-06 9:36 ` Naohiro Aota
2020-10-30 13:51 ` [PATCH v9 06/41] btrfs: introduce max_zone_append_size Naohiro Aota
2020-11-02 16:57 ` Josef Bacik
2020-11-03 12:16 ` David Sterba
2020-10-30 13:51 ` [PATCH v9 07/41] btrfs: disallow space_cache in ZONED mode Naohiro Aota
2020-11-02 17:02 ` Josef Bacik
2020-11-02 17:37 ` Johannes Thumshirn
2020-11-03 12:48 ` David Sterba
2020-11-10 10:14 ` Naohiro Aota
2020-10-30 13:51 ` [PATCH v9 08/41] btrfs: disallow NODATACOW " Naohiro Aota
2020-11-02 17:05 ` Josef Bacik
2020-11-03 12:57 ` David Sterba
2020-10-30 13:51 ` [PATCH v9 09/41] btrfs: disable fallocate " Naohiro Aota
2020-11-03 13:00 ` David Sterba
2020-10-30 13:51 ` [PATCH v9 10/41] btrfs: disallow mixed-bg " Naohiro Aota
2020-11-03 13:01 ` David Sterba
2020-10-30 13:51 ` [PATCH v9 11/41] btrfs: implement log-structured superblock for " Naohiro Aota
2020-11-02 18:22 ` Josef Bacik
2020-11-02 18:53 ` Johannes Thumshirn
2020-11-02 19:01 ` Josef Bacik
2020-11-02 19:31 ` Johannes Thumshirn
2020-11-03 8:21 ` Naohiro Aota
2020-11-02 18:54 ` Josef Bacik
2020-11-03 3:31 ` Naohiro Aota
2020-11-03 13:15 ` David Sterba
2020-11-03 14:10 ` David Sterba
2020-11-06 10:37 ` Naohiro Aota
2020-10-30 13:51 ` [PATCH v9 12/41] btrfs: implement zoned chunk allocator Naohiro Aota
2020-11-02 20:09 ` Josef Bacik
2020-11-02 22:21 ` Naohiro Aota
2020-11-03 13:23 ` David Sterba
2020-10-30 13:51 ` [PATCH v9 13/41] btrfs: verify device extent is aligned to zone Naohiro Aota
2020-11-02 20:14 ` Josef Bacik
2020-10-30 13:51 ` [PATCH v9 14/41] btrfs: load zone's alloction offset Naohiro Aota
2020-11-02 20:25 ` Josef Bacik
2020-11-02 20:29 ` Josef Bacik
2020-11-02 22:43 ` Naohiro Aota
2020-11-02 22:40 ` Naohiro Aota
2020-11-03 13:28 ` David Sterba
2020-10-30 13:51 ` [PATCH v9 15/41] btrfs: emulate write pointer for conventional zones Naohiro Aota
2020-11-02 20:37 ` Josef Bacik
2020-11-03 1:25 ` Naohiro Aota
2020-11-03 13:32 ` David Sterba
2020-10-30 13:51 ` [PATCH v9 16/41] btrfs: track unusable bytes for zones Naohiro Aota
2020-11-03 14:25 ` Josef Bacik
2020-10-30 13:51 ` [PATCH v9 17/41] btrfs: do sequential extent allocation in ZONED mode Naohiro Aota
2020-11-03 14:28 ` Josef Bacik
2020-10-30 13:51 ` [PATCH v9 18/41] btrfs: reset zones of unused block groups Naohiro Aota
2020-11-03 14:34 ` Josef Bacik
2020-11-10 10:40 ` Naohiro Aota
2020-10-30 13:51 ` [PATCH v9 19/41] btrfs: redirty released extent buffers in ZONED mode Naohiro Aota
2020-11-03 14:41 ` Josef Bacik
2020-11-06 9:11 ` Johannes Thumshirn
2020-11-06 15:01 ` Josef Bacik
2020-10-30 13:51 ` [PATCH v9 20/41] btrfs: extract page adding function Naohiro Aota
2020-11-03 14:45 ` Josef Bacik
2020-10-30 13:51 ` [PATCH v9 21/41] btrfs: use bio_add_zone_append_page for zoned btrfs Naohiro Aota
2020-11-03 14:55 ` Josef Bacik
2020-11-10 10:42 ` Naohiro Aota
2020-10-30 13:51 ` [PATCH v9 22/41] btrfs: handle REQ_OP_ZONE_APPEND as writing Naohiro Aota
2020-11-03 14:57 ` Josef Bacik
2020-10-30 13:51 ` [PATCH v9 23/41] btrfs: split ordered extent when bio is sent Naohiro Aota
2020-11-03 15:29 ` Josef Bacik
2020-10-30 13:51 ` Naohiro Aota [this message]
2020-11-03 15:32 ` [PATCH v9 24/41] btrfs: extend btrfs_rmap_block for specifying a device Josef Bacik
2020-11-06 10:52 ` Johannes Thumshirn
2020-10-30 13:51 ` [PATCH v9 25/41] btrfs: use ZONE_APPEND write for ZONED btrfs Naohiro Aota
2020-11-03 15:55 ` Josef Bacik
2020-10-30 13:51 ` [PATCH v9 26/41] btrfs: enable zone append writing for direct IO Naohiro Aota
2020-11-03 15:56 ` Josef Bacik
2020-10-30 13:51 ` [PATCH v9 27/41] btrfs: introduce dedicated data write path for ZONED mode Naohiro Aota
2020-11-03 15:57 ` Josef Bacik
2020-10-30 13:51 ` [PATCH v9 28/41] btrfs: serialize meta IOs on " Naohiro Aota
2020-11-03 16:04 ` Josef Bacik
2020-10-30 13:51 ` [PATCH v9 29/41] btrfs: wait existing extents before truncating Naohiro Aota
2020-10-30 13:51 ` [PATCH v9 30/41] btrfs: avoid async metadata checksum on ZONED mode Naohiro Aota
2020-11-03 16:05 ` Josef Bacik
2020-10-30 13:51 ` [PATCH v9 31/41] btrfs: mark block groups to copy for device-replace Naohiro Aota
2020-11-03 17:09 ` Josef Bacik
2020-10-30 13:51 ` [PATCH v9 32/41] btrfs: implement cloning for ZONED device-replace Naohiro Aota
2020-11-03 17:15 ` Josef Bacik
2020-10-30 13:51 ` [PATCH v9 33/41] btrfs: implement copying " Naohiro Aota
2020-11-03 17:19 ` Josef Bacik
2020-11-10 11:09 ` Naohiro Aota
2020-10-30 13:51 ` [PATCH v9 34/41] btrfs: support dev-replace in ZONED mode Naohiro Aota
2020-11-03 20:34 ` Josef Bacik
2020-10-30 13:51 ` [PATCH v9 35/41] btrfs: enable relocation " Naohiro Aota
2020-11-03 20:39 ` Josef Bacik
2020-10-30 13:51 ` [PATCH v9 36/41] btrfs: relocate block group to repair IO failure in ZONED Naohiro Aota
2020-10-30 13:51 ` [PATCH v9 37/41] btrfs: split alloc_log_tree() Naohiro Aota
2020-11-03 20:42 ` Josef Bacik
2020-11-03 22:10 ` Amy Parker
2020-11-10 11:12 ` Naohiro Aota
2020-10-30 13:51 ` [PATCH v9 38/41] btrfs: extend zoned allocator to use dedicated tree-log block group Naohiro Aota
2020-11-03 20:47 ` Josef Bacik
2020-11-10 6:37 ` Naohiro Aota
2020-10-30 13:51 ` [PATCH v9 39/41] btrfs: serialize log transaction on ZONED mode Naohiro Aota
2020-11-03 20:49 ` Josef Bacik
2020-10-30 13:51 ` [PATCH v9 40/41] btrfs: reorder log node allocation Naohiro Aota
2020-11-03 20:49 ` Josef Bacik
2020-10-30 13:51 ` [PATCH v9 41/41] btrfs: enable to mount ZONED incompat flag Naohiro Aota
2020-10-31 3:40 ` [PATCH v9 01/41] block: add bio_add_zone_append_page Jens Axboe
2020-11-02 5:15 ` Naohiro Aota
2020-11-02 8:24 ` Johannes Thumshirn
2020-11-03 11:54 ` [PATCH v9 00/41] btrfs: zoned block device support David Sterba
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=3ee4958e7ebcc06973ed2d7c84a9cf9240d6e7d7.1604065695.git.naohiro.aota@wdc.com \
--to=naohiro.aota@wdc.com \
--cc=dsterba@suse.com \
--cc=hare@suse.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).