Commit 528b18e6 authored by Kent Overstreet's avatar Kent Overstreet Committed by Kent Overstreet
Browse files

bcachefs: bch2_journal_entry_to_text() 



This adds a _to_text() pretty printer for journal entries - including
every subtype - which will shortly be used by the 'bcachefs
list_journal' subcommand.

Signed-off-by: default avatarKent Overstreet <kent.overstreet@gmail.com>
parent fb64f3fd

fs/bcachefs/bcachefs_format.h

+16 −4
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
#include <asm/byteorder.h>

#include <linux/kernel.h>

#include <linux/uuid.h>

#include "vstructs.h"



#ifdef __KERNEL__

typedef uuid_t __uuid_t;
@@ -1699,11 +1700,16 @@ struct jset_entry_blacklist_v2 { 
	__le64			end;

};



#define BCH_FS_USAGE_TYPES()			\

	x(reserved,		0)		\

	x(inodes,		1)		\

	x(key_version,		2)



enum {

	FS_USAGE_RESERVED		= 0,

	FS_USAGE_INODES			= 1,

	FS_USAGE_KEY_VERSION		= 2,

	FS_USAGE_NR			= 3

#define x(f, nr)	BCH_FS_USAGE_##f	= nr,

	BCH_FS_USAGE_TYPES()

#undef x

	BCH_FS_USAGE_NR

};



struct jset_entry_usage {
@@ -1741,6 +1747,12 @@ struct jset_entry_dev_usage { 
	struct jset_entry_dev_usage_type d[];

} __attribute__((packed));



static inline unsigned jset_entry_dev_usage_nr_types(struct jset_entry_dev_usage *u)

{

	return (vstruct_bytes(&u->entry) - sizeof(struct jset_entry_dev_usage)) /

		sizeof(struct jset_entry_dev_usage_type);

}



struct jset_entry_log {

	struct jset_entry	entry;

	u8			d[];

fs/bcachefs/journal_io.c

+130 −11
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static int journal_validate_key(struct bch_fs *c, const char *where, 
	return ret;

}



static int journal_entry_validate_btree_keys(struct bch_fs *c,

static int journal_entry_btree_keys_validate(struct bch_fs *c,

					     const char *where,

					     struct jset_entry *entry,

					     unsigned version, int big_endian, int write)
@@ -294,7 +294,18 @@ static int journal_entry_validate_btree_keys(struct bch_fs *c, 
	return 0;

}



static int journal_entry_validate_btree_root(struct bch_fs *c,

static void journal_entry_btree_keys_to_text(struct printbuf *out, struct bch_fs *c,

					     struct jset_entry *entry)

{

	struct bkey_i *k;



	pr_buf(out, "btree=%s l=%u ", bch2_btree_ids[entry->btree_id], entry->level);



	vstruct_for_each(entry, k)

		bch2_bkey_val_to_text(out, c, bkey_i_to_s_c(k));

}



static int journal_entry_btree_root_validate(struct bch_fs *c,

					     const char *where,

					     struct jset_entry *entry,

					     unsigned version, int big_endian, int write)
@@ -322,7 +333,13 @@ static int journal_entry_validate_btree_root(struct bch_fs *c, 
	return ret;

}



static int journal_entry_validate_prio_ptrs(struct bch_fs *c,

static void journal_entry_btree_root_to_text(struct printbuf *out, struct bch_fs *c,

					     struct jset_entry *entry)

{

	journal_entry_btree_keys_to_text(out, c, entry);

}



static int journal_entry_prio_ptrs_validate(struct bch_fs *c,

					    const char *where,

					    struct jset_entry *entry,

					    unsigned version, int big_endian, int write)
@@ -331,7 +348,12 @@ static int journal_entry_validate_prio_ptrs(struct bch_fs *c, 
	return 0;

}



static int journal_entry_validate_blacklist(struct bch_fs *c,

static void journal_entry_prio_ptrs_to_text(struct printbuf *out, struct bch_fs *c,

					    struct jset_entry *entry)

{

}



static int journal_entry_blacklist_validate(struct bch_fs *c,

					    const char *where,

					    struct jset_entry *entry,

					    unsigned version, int big_endian, int write)
@@ -346,7 +368,16 @@ static int journal_entry_validate_blacklist(struct bch_fs *c, 
	return ret;

}



static int journal_entry_validate_blacklist_v2(struct bch_fs *c,

static void journal_entry_blacklist_to_text(struct printbuf *out, struct bch_fs *c,

					    struct jset_entry *entry)

{

	struct jset_entry_blacklist *bl =

		container_of(entry, struct jset_entry_blacklist, entry);



	pr_buf(out, "seq=%llu", le64_to_cpu(bl->seq));

}



static int journal_entry_blacklist_v2_validate(struct bch_fs *c,

					       const char *where,

					       struct jset_entry *entry,

					       unsigned version, int big_endian, int write)
@@ -372,7 +403,18 @@ static int journal_entry_validate_blacklist_v2(struct bch_fs *c, 
	return ret;

}



static int journal_entry_validate_usage(struct bch_fs *c,

static void journal_entry_blacklist_v2_to_text(struct printbuf *out, struct bch_fs *c,

					       struct jset_entry *entry)

{

	struct jset_entry_blacklist_v2 *bl =

		container_of(entry, struct jset_entry_blacklist_v2, entry);



	pr_buf(out, "start=%llu end=%llu",

	       le64_to_cpu(bl->start),

	       le64_to_cpu(bl->end));

}



static int journal_entry_usage_validate(struct bch_fs *c,

					const char *where,

					struct jset_entry *entry,

					unsigned version, int big_endian, int write)
@@ -393,7 +435,18 @@ static int journal_entry_validate_usage(struct bch_fs *c, 
	return ret;

}



static int journal_entry_validate_data_usage(struct bch_fs *c,

static void journal_entry_usage_to_text(struct printbuf *out, struct bch_fs *c,

					struct jset_entry *entry)

{

	struct jset_entry_usage *u =

		container_of(entry, struct jset_entry_usage, entry);



	pr_buf(out, "type=%s v=%llu",

	       bch2_fs_usage_types[u->entry.btree_id],

	       le64_to_cpu(u->v));

}



static int journal_entry_data_usage_validate(struct bch_fs *c,

					const char *where,

					struct jset_entry *entry,

					unsigned version, int big_endian, int write)
@@ -415,7 +468,17 @@ static int journal_entry_validate_data_usage(struct bch_fs *c, 
	return ret;

}



static int journal_entry_validate_clock(struct bch_fs *c,

static void journal_entry_data_usage_to_text(struct printbuf *out, struct bch_fs *c,

					     struct jset_entry *entry)

{

	struct jset_entry_data_usage *u =

		container_of(entry, struct jset_entry_data_usage, entry);



	bch2_replicas_entry_to_text(out, &u->r);

	pr_buf(out, "=%llu", le64_to_cpu(u->v));

}



static int journal_entry_clock_validate(struct bch_fs *c,

					const char *where,

					struct jset_entry *entry,

					unsigned version, int big_endian, int write)
@@ -441,7 +504,16 @@ static int journal_entry_validate_clock(struct bch_fs *c, 
	return ret;

}



static int journal_entry_validate_dev_usage(struct bch_fs *c,

static void journal_entry_clock_to_text(struct printbuf *out, struct bch_fs *c,

					struct jset_entry *entry)

{

	struct jset_entry_clock *clock =

		container_of(entry, struct jset_entry_clock, entry);



	pr_buf(out, "%s=%llu", clock->rw ? "write" : "read", le64_to_cpu(clock->time));

}



static int journal_entry_dev_usage_validate(struct bch_fs *c,

					    const char *where,

					    struct jset_entry *entry,

					    unsigned version, int big_endian, int write)
@@ -478,7 +550,32 @@ static int journal_entry_validate_dev_usage(struct bch_fs *c, 
	return ret;

}



static int journal_entry_validate_log(struct bch_fs *c,

static void journal_entry_dev_usage_to_text(struct printbuf *out, struct bch_fs *c,

					    struct jset_entry *entry)

{

	struct jset_entry_dev_usage *u =

		container_of(entry, struct jset_entry_dev_usage, entry);

	unsigned i, nr_types = jset_entry_dev_usage_nr_types(u);



	pr_buf(out, "dev=%u", le32_to_cpu(u->dev));



	for (i = 0; i < nr_types; i++) {

		if (i < BCH_DATA_NR)

			pr_buf(out, " %s", bch2_data_types[i]);

		else

			pr_buf(out, " (unknown data type %u)", i);

		pr_buf(out, ": buckets=%llu sectors=%llu fragmented=%llu",

		       le64_to_cpu(u->d[i].buckets),

		       le64_to_cpu(u->d[i].sectors),

		       le64_to_cpu(u->d[i].fragmented));

	}



	pr_buf(out, " buckets_ec: %llu buckets_unavailable: %llu",

	       le64_to_cpu(u->buckets_ec),

	       le64_to_cpu(u->buckets_unavailable));

}



static int journal_entry_log_validate(struct bch_fs *c,

				      const char *where,

				      struct jset_entry *entry,

				      unsigned version, int big_endian, int write)
@@ -486,15 +583,26 @@ static int journal_entry_validate_log(struct bch_fs *c, 
	return 0;

}



static void journal_entry_log_to_text(struct printbuf *out, struct bch_fs *c,

				      struct jset_entry *entry)

{

	struct jset_entry_log *l = container_of(entry, struct jset_entry_log, entry);

	unsigned bytes = vstruct_bytes(entry) - offsetof(struct jset_entry_log, d);



	bch_scnmemcpy(out, l->d, strnlen(l->d, bytes));

}



struct jset_entry_ops {

	int (*validate)(struct bch_fs *, const char *,

			struct jset_entry *, unsigned, int, int);

	void (*to_text)(struct printbuf *, struct bch_fs *, struct jset_entry *);

};



static const struct jset_entry_ops bch2_jset_entry_ops[] = {

#define x(f, nr)						\

	[BCH_JSET_ENTRY_##f]	= (struct jset_entry_ops) {	\

		.validate	= journal_entry_validate_##f,	\

		.validate	= journal_entry_##f##_validate,	\

		.to_text	= journal_entry_##f##_to_text,	\

	},

	BCH_JSET_ENTRY_TYPES()

#undef x
@@ -510,6 +618,17 @@ int bch2_journal_entry_validate(struct bch_fs *c, const char *where, 
		: 0;

}



void bch2_journal_entry_to_text(struct printbuf *out, struct bch_fs *c,

				struct jset_entry *entry)

{

	if (entry->type < BCH_JSET_ENTRY_NR) {

		pr_buf(out, "%s: ", bch2_jset_entry_types[entry->type]);

		bch2_jset_entry_ops[entry->type].to_text(out, c, entry);

	} else {

		pr_buf(out, "(unknown type %u)", entry->type);

	}

}



static int jset_validate_entries(struct bch_fs *c, struct jset *jset,

				 int write)

{

fs/bcachefs/journal_io.h

+4 −2
Original line number Diff line number Diff line
@@ -40,8 +40,10 @@ static inline struct jset_entry *__jset_entry_type_next(struct jset *jset, 
	for_each_jset_entry_type(entry, jset, BCH_JSET_ENTRY_btree_keys)	\

		vstruct_for_each_safe(entry, k, _n)



int bch2_journal_entry_validate(struct bch_fs *, const char *, struct jset_entry *,

				unsigned, int, int);

int bch2_journal_entry_validate(struct bch_fs *, const char *,

				struct jset_entry *, unsigned, int, int);

void bch2_journal_entry_to_text(struct printbuf *, struct bch_fs *,

				struct jset_entry *);



int bch2_journal_read(struct bch_fs *, struct list_head *, u64 *, u64 *);

fs/bcachefs/opts.c

+10 −0
Original line number Diff line number Diff line
@@ -71,6 +71,16 @@ const char * const bch2_member_states[] = { 
	NULL

};



const char * const bch2_jset_entry_types[] = {

	BCH_JSET_ENTRY_TYPES()

	NULL

};



const char * const bch2_fs_usage_types[] = {

	BCH_FS_USAGE_TYPES()

	NULL

};



#undef x



const char * const bch2_d_types[BCH_DT_MAX] = {

fs/bcachefs/opts.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ extern const char * const bch2_str_hash_types[]; 
extern const char * const bch2_str_hash_opts[];

extern const char * const bch2_data_types[];

extern const char * const bch2_member_states[];

extern const char * const bch2_jset_entry_types[];

extern const char * const bch2_fs_usage_types[];

extern const char * const bch2_d_types[];



static inline const char *bch2_d_type_str(unsigned d_type)