Skip to contentSkip to conversation

bcachefs: create debugfs dir for each btree

PATCH In review Thomas Bertschinger 2 participants 4 messages Mar 14, 2024 – Mar 15, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bcachefs: create debugfs dir for each btree

This creates a subdirectory for each individual btree under the btrees/ debugfs directory.

Directory structure, before:

/sys/kernel/debug/bcachefs/$FS_ID/btrees/

├── alloc
├── alloc-bfloat-failed
├── alloc-formats
├── backpointers
├── backpointers-bfloat-failed
├── backpointers-formats

...

Directory structure, after:

/sys/kernel/debug/bcachefs/$FS_ID/btrees/

├── alloc
│   ├── bfloat-failed
│   ├── formats
│   └── nodes
├── backpointers
│   ├── bfloat-failed
│   ├── formats
│   └── nodes

...

---
 fs/bcachefs/debug.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)
fs/bcachefs/debug.c +15 -15
index b1f147e6be4d..491ad699d558 100644
@@ -866,6 +866,20 @@ void bch2_fs_debug_exit(struct bch_fs *c)
 		debugfs_remove_recursive(c->fs_debug_dir);
 }
 
+static void bch2_fs_debug_btree_init(struct bch_fs *c, struct btree_debug *bd)
+{
+	struct dentry *d;
+
+	d = debugfs_create_dir(bch2_btree_id_str(bd->id), c->btree_debug_dir);
+
+	debugfs_create_file("nodes", 0400, d, bd, &btree_debug_ops);
+
+	debugfs_create_file("formats", 0400, d, bd, &btree_format_debug_ops);
+
+	debugfs_create_file("bfloat-failed", 0400, d, bd,
+			    &bfloat_failed_debug_ops);
+}
+
 void bch2_fs_debug_init(struct bch_fs *c)
 {
 	struct btree_debug *bd;
@@ -902,21 +916,7 @@ void bch2_fs_debug_init(struct bch_fs *c)
 	     bd < c->btree_debug + ARRAY_SIZE(c->btree_debug);
 	     bd++) {
 		bd->id = bd - c->btree_debug;
-		debugfs_create_file(bch2_btree_id_str(bd->id),
-				    0400, c->btree_debug_dir, bd,
-				    &btree_debug_ops);
-
-		snprintf(name, sizeof(name), "%s-formats",
-			 bch2_btree_id_str(bd->id));
-
-		debugfs_create_file(name, 0400, c->btree_debug_dir, bd,
-				    &btree_format_debug_ops);
-
-		snprintf(name, sizeof(name), "%s-bfloat-failed",
-			 bch2_btree_id_str(bd->id));
-
-		debugfs_create_file(name, 0400, c->btree_debug_dir, bd,
-				    &bfloat_failed_debug_ops);
+		bch2_fs_debug_btree_init(c, bd);
 	}
 }
 
Signature · 1 line
2.43.2
#1 lore raw
Quoted 17 lines · Thomas Bertschinger

This creates a subdirectory for each individual btree under the btrees/ debugfs directory.

Directory structure, before:

/sys/kernel/debug/bcachefs/$FS_ID/btrees/

├── alloc
├── alloc-bfloat-failed
├── alloc-formats
├── backpointers
├── backpointers-bfloat-failed
├── backpointers-formats

...

Directory structure, after:

/sys/kernel/debug/bcachefs/$FS_ID/btrees/

Quoted 8 lines
├── alloc
│   ├── bfloat-failed
│   ├── formats
│   └── nodes
├── backpointers
│   ├── bfloat-failed
│   ├── formats
│   └── nodes

nodes should actually be keys - nodes would be showing the node structure, only cmd_list.rs currently does that (but -formats covers it)

Quoted 58 lines

...

---
 fs/bcachefs/debug.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)
fs/bcachefs/debug.c +15 -15
index b1f147e6be4d..491ad699d558 100644
@@ -866,6 +866,20 @@ void bch2_fs_debug_exit(struct bch_fs *c)
 		debugfs_remove_recursive(c->fs_debug_dir);
 }
 
+static void bch2_fs_debug_btree_init(struct bch_fs *c, struct btree_debug *bd)
+{
+	struct dentry *d;
+
+	d = debugfs_create_dir(bch2_btree_id_str(bd->id), c->btree_debug_dir);
+
+	debugfs_create_file("nodes", 0400, d, bd, &btree_debug_ops);
+
+	debugfs_create_file("formats", 0400, d, bd, &btree_format_debug_ops);
+
+	debugfs_create_file("bfloat-failed", 0400, d, bd,
+			    &bfloat_failed_debug_ops);
+}
+
 void bch2_fs_debug_init(struct bch_fs *c)
 {
 	struct btree_debug *bd;
@@ -902,21 +916,7 @@ void bch2_fs_debug_init(struct bch_fs *c)
 	     bd < c->btree_debug + ARRAY_SIZE(c->btree_debug);
 	     bd++) {
 		bd->id = bd - c->btree_debug;
-		debugfs_create_file(bch2_btree_id_str(bd->id),
-				    0400, c->btree_debug_dir, bd,
-				    &btree_debug_ops);
-
-		snprintf(name, sizeof(name), "%s-formats",
-			 bch2_btree_id_str(bd->id));
-
-		debugfs_create_file(name, 0400, c->btree_debug_dir, bd,
-				    &btree_format_debug_ops);
-
-		snprintf(name, sizeof(name), "%s-bfloat-failed",
-			 bch2_btree_id_str(bd->id));
-
-		debugfs_create_file(name, 0400, c->btree_debug_dir, bd,
-				    &bfloat_failed_debug_ops);
+		bch2_fs_debug_btree_init(c, bd);
 	}
 }
 
Signature · 1 line
2.43.2
#2 lore raw
Quoted 3 lines · Kent Overstreet

nodes should actually be keys - nodes would be showing the node structure, only cmd_list.rs currently does that (but -formats covers it)

Ah, yup. Should I send a v2, or is that a small enough fix that you can just amend it?

#3 lore raw
Quoted 7 lines · Thomas Bertschinger
Quoted 3 lines · Kent Overstreet

nodes should actually be keys - nodes would be showing the node structure, only cmd_list.rs currently does that (but -formats covers it)

Ah, yup. Should I send a v2, or is that a small enough fix that you can just amend it?

yeah I can do it