From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
To: David Sterba <dsterba@suse.com>
Cc: linux-btrfs@vger.kernel.org,
Johannes Thumshirn <johannes.thumshirn@wdc.com>
Subject: [PATCH v4 3/6] btrfs-progs: add dump tree support for the raid stripe tree
Date: Thu, 14 Sep 2023 09:05:34 -0700 [thread overview]
Message-ID: <20230914-raid-stripe-tree-v4-3-c921c15ec052@wdc.com> (raw)
In-Reply-To: <20230914-raid-stripe-tree-v4-0-c921c15ec052@wdc.com>
Add support for the RAID stripe tree to btrfs inspect-internal dump-tree.
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
cmds/inspect-dump-tree.c | 5 +++++
kernel-shared/ctree.h | 5 +++++
kernel-shared/print-tree.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 62 insertions(+)
diff --git a/cmds/inspect-dump-tree.c b/cmds/inspect-dump-tree.c
index bfc0fff148dd..328ecd76c8a0 100644
--- a/cmds/inspect-dump-tree.c
+++ b/cmds/inspect-dump-tree.c
@@ -170,6 +170,7 @@ static u64 treeid_from_string(const char *str, const char **end)
{ "TREE_RELOC", BTRFS_TREE_RELOC_OBJECTID },
{ "DATA_RELOC", BTRFS_DATA_RELOC_TREE_OBJECTID },
{ "BLOCK_GROUP_TREE", BTRFS_BLOCK_GROUP_TREE_OBJECTID },
+ { "RAID_STRIPE", BTRFS_RAID_STRIPE_TREE_OBJECTID },
};
if (strncasecmp("BTRFS_", str, strlen("BTRFS_")) == 0)
@@ -729,6 +730,10 @@ again:
if (!skip)
pr_verbose(LOG_DEFAULT, "block group");
break;
+ case BTRFS_RAID_STRIPE_TREE_OBJECTID:
+ if (!skip)
+ printf("raid stripe");
+ break;
default:
if (!skip) {
pr_verbose(LOG_DEFAULT, "file");
diff --git a/kernel-shared/ctree.h b/kernel-shared/ctree.h
index 035358436d8f..de09c15ca0eb 100644
--- a/kernel-shared/ctree.h
+++ b/kernel-shared/ctree.h
@@ -556,6 +556,7 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info)
*/
#define BTRFS_EXTENT_DATA_KEY 108
+
/*
* csum items have the checksums for data in the extents
*/
@@ -640,6 +641,8 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info)
#define BTRFS_DEV_ITEM_KEY 216
#define BTRFS_CHUNK_ITEM_KEY 228
+#define BTRFS_RAID_STRIPE_KEY 230
+
#define BTRFS_BALANCE_ITEM_KEY 248
/*
@@ -650,6 +653,8 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info)
#define BTRFS_QGROUP_LIMIT_KEY 244
#define BTRFS_QGROUP_RELATION_KEY 246
+
+
/*
* Obsolete name, see BTRFS_TEMPORARY_ITEM_KEY.
*/
diff --git a/kernel-shared/print-tree.c b/kernel-shared/print-tree.c
index 3eff82b364ef..d719ebaebb40 100644
--- a/kernel-shared/print-tree.c
+++ b/kernel-shared/print-tree.c
@@ -637,6 +637,51 @@ static void print_free_space_header(struct extent_buffer *leaf, int slot)
(unsigned long long)btrfs_free_space_bitmaps(leaf, header));
}
+struct raid_encoding_map {
+ u8 encoding;
+ char name[16];
+};
+
+static const struct raid_encoding_map raid_map[] = {
+ { BTRFS_STRIPE_DUP, "DUP" },
+ { BTRFS_STRIPE_RAID0, "RAID0" },
+ { BTRFS_STRIPE_RAID1, "RAID1" },
+ { BTRFS_STRIPE_RAID1C3, "RAID1C3" },
+ { BTRFS_STRIPE_RAID1C4, "RAID1C4" },
+ { BTRFS_STRIPE_RAID5, "RAID5" },
+ { BTRFS_STRIPE_RAID6, "RAID6" },
+ { BTRFS_STRIPE_RAID10, "RAID10" }
+};
+
+static const char *stripe_encoding_name(u8 encoding)
+{
+ for (int i = 0; i < ARRAY_SIZE(raid_map); i++) {
+ if (raid_map[i].encoding == encoding)
+ return raid_map[i].name;
+ }
+
+ return "UNKNOWN";
+}
+
+static void print_raid_stripe_key(struct extent_buffer *eb,
+ u32 item_size,
+ struct btrfs_stripe_extent *stripe)
+{
+ int num_stripes;
+ u8 encoding = btrfs_stripe_extent_encoding(eb, stripe);
+ int i;
+
+ num_stripes = (item_size - offsetof(struct btrfs_stripe_extent, strides)) /
+ sizeof(struct btrfs_raid_stride);
+
+ printf("\t\t\tencoding: %s\n", stripe_encoding_name(encoding));
+ for (i = 0; i < num_stripes; i++)
+ printf("\t\t\tstripe %d devid %llu physical %llu length %llu\n", i,
+ (unsigned long long)btrfs_raid_stride_devid_nr(eb, stripe, i),
+ (unsigned long long)btrfs_raid_stride_offset_nr(eb, stripe, i),
+ (unsigned long long)btrfs_raid_stride_length_nr(eb, stripe, i));
+}
+
void print_key_type(FILE *stream, u64 objectid, u8 type)
{
static const char* key_to_str[256] = {
@@ -681,6 +726,7 @@ void print_key_type(FILE *stream, u64 objectid, u8 type)
[BTRFS_PERSISTENT_ITEM_KEY] = "PERSISTENT_ITEM",
[BTRFS_UUID_KEY_SUBVOL] = "UUID_KEY_SUBVOL",
[BTRFS_UUID_KEY_RECEIVED_SUBVOL] = "UUID_KEY_RECEIVED_SUBVOL",
+ [BTRFS_RAID_STRIPE_KEY] = "RAID_STRIPE_KEY",
};
if (type == 0 && objectid == BTRFS_FREE_SPACE_OBJECTID) {
@@ -793,6 +839,9 @@ void print_objectid(FILE *stream, u64 objectid, u8 type)
case BTRFS_CSUM_CHANGE_OBJECTID:
fprintf(stream, "CSUM_CHANGE");
break;
+ case BTRFS_RAID_STRIPE_TREE_OBJECTID:
+ fprintf(stream, "RAID_STRIPE_TREE");
+ break;
case (u64)-1:
fprintf(stream, "-1");
break;
@@ -1469,6 +1518,9 @@ void btrfs_print_leaf(struct extent_buffer *eb, unsigned int mode)
case BTRFS_TEMPORARY_ITEM_KEY:
print_temporary_item(eb, ptr, objectid, offset);
break;
+ case BTRFS_RAID_STRIPE_KEY:
+ print_raid_stripe_key(eb, item_size, ptr);
+ break;
};
fflush(stdout);
}
--
2.41.0
next prev parent reply other threads:[~2023-09-14 16:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-14 16:05 [PATCH v4 0/6] btrfs-progs: add support for RAID stripe tree Johannes Thumshirn
2023-09-14 16:05 ` [PATCH v4 1/6] btrfs-progs: add raid-stripe-tree definitions Johannes Thumshirn
2023-09-14 16:05 ` [PATCH v4 2/6] btrfs-progs: read fs with stripe tree from disk Johannes Thumshirn
2023-09-14 16:05 ` Johannes Thumshirn [this message]
2023-09-14 16:05 ` [PATCH v4 4/6] btrfs-progs: allow zoned RAID Johannes Thumshirn
2023-09-14 16:05 ` [PATCH v4 5/6] btrfs-progs: load zone info for all zoned devices Johannes Thumshirn
2023-09-14 16:05 ` [PATCH v4 6/6] btrfs-progs: read stripe tree when mapping blocks Johannes Thumshirn
2023-09-14 18:43 ` [PATCH v4 0/6] btrfs-progs: add support for RAID stripe tree 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=20230914-raid-stripe-tree-v4-3-c921c15ec052@wdc.com \
--to=johannes.thumshirn@wdc.com \
--cc=dsterba@suse.com \
--cc=linux-btrfs@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).