Commit 273960b8 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Kent Overstreet
Browse files

bcachefs: time_stats: split stats-with-quantiles into a separate structure 



Currently, struct time_stats has the optional ability to quantize the
information that it collects.  This is /probably/ useful for callers who
want to see quantized information, but it more than doubles the size of
the structure from 224 bytes to 464.  For users who don't care about
that (e.g. upcoming xfs patches) and want to avoid wasting 240 bytes per
counter, split the two into separate pieces.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 4b4f0876

fs/bcachefs/bcachefs.h

+1 −1
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ struct bch_dev { 


	/* The rest of this all shows up in sysfs */

	atomic64_t		cur_latency[2];

	struct bch2_time_stats	io_latency[2];

	struct bch2_time_stats_quantiles io_latency[2];



#define CONGESTED_MAX		1024

	atomic_t		congested;

fs/bcachefs/io_write.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ void bch2_latency_acct(struct bch_dev *ca, u64 submit_time, int rw) 


	bch2_congested_acct(ca, io_latency, now, rw);



	__bch2_time_stats_update(&ca->io_latency[rw], submit_time, now);

	__bch2_time_stats_update(&ca->io_latency[rw].stats, submit_time, now);

}



#endif

fs/bcachefs/super.c

+4 −4
Original line number Diff line number Diff line
@@ -1189,8 +1189,8 @@ static void bch2_dev_free(struct bch_dev *ca) 
	bch2_dev_buckets_free(ca);

	free_page((unsigned long) ca->sb_read_scratch);



	bch2_time_stats_exit(&ca->io_latency[WRITE]);

	bch2_time_stats_exit(&ca->io_latency[READ]);

	bch2_time_stats_quantiles_exit(&ca->io_latency[WRITE]);

	bch2_time_stats_quantiles_exit(&ca->io_latency[READ]);



	percpu_ref_exit(&ca->io_ref);

	percpu_ref_exit(&ca->ref);
@@ -1281,8 +1281,8 @@ static struct bch_dev *__bch2_dev_alloc(struct bch_fs *c, 


	INIT_WORK(&ca->io_error_work, bch2_io_error_work);



	bch2_time_stats_init(&ca->io_latency[READ]);

	bch2_time_stats_init(&ca->io_latency[WRITE]);

	bch2_time_stats_quantiles_init(&ca->io_latency[READ]);

	bch2_time_stats_quantiles_init(&ca->io_latency[WRITE]);



	ca->mi = bch2_mi_to_cpu(member);

fs/bcachefs/sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -930,10 +930,10 @@ SHOW(bch2_dev) 
	sysfs_print(io_latency_write,		atomic64_read(&ca->cur_latency[WRITE]));



	if (attr == &sysfs_io_latency_stats_read)

		bch2_time_stats_to_text(out, &ca->io_latency[READ]);

		bch2_time_stats_to_text(out, &ca->io_latency[READ].stats);



	if (attr == &sysfs_io_latency_stats_write)

		bch2_time_stats_to_text(out, &ca->io_latency[WRITE]);

		bch2_time_stats_to_text(out, &ca->io_latency[WRITE].stats);



	sysfs_printf(congested,			"%u%%",

		     clamp(atomic_read(&ca->congested), 0, CONGESTED_MAX)

fs/bcachefs/time_stats.c

+4 −2
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ static inline void time_stats_update_one(struct bch2_time_stats *stats, 
	bool initted = stats->last_event != 0;



	if (time_after64(end, start)) {

		struct quantiles *quantiles = time_stats_to_quantiles(stats);



		duration = end - start;

		mean_and_variance_update(&stats->duration_stats, duration);

		mean_and_variance_weighted_update(&stats->duration_stats_weighted,
@@ -81,8 +83,8 @@ static inline void time_stats_update_one(struct bch2_time_stats *stats, 
		stats->min_duration = min(stats->min_duration, duration);

		stats->total_duration += duration;



		if (stats->quantiles_enabled)

			quantiles_update(&stats->quantiles, duration);

		if (quantiles)

			quantiles_update(quantiles, duration);

	}



	if (stats->last_event && time_after64(end, stats->last_event)) {