alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-12-10 00:00:24 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Update bcachefs sources to 1e5c304db79f bcachefs: Fix btree write buffer flush tracepoint

Browse Source
This commit is contained in:
Kent Overstreet 2025-10-04 05:21:54 -04:00
parent 95a7909891
commit 9fe65066ab
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bcachefs_revision
View File

@ -1 +1 @@
69b80f5793ed25306a0725d891161f74d5adc650 1e5c304db79f79a055385da061d161fcc9747f67

3
libbcachefs/btree_write_buffer.c
View File

@ -300,6 +300,7 @@ static int bch2_btree_write_buffer_flush_locked(struct btree_trans *trans)
return 0; return 0;
u64 start_time = local_clock(); u64 start_time = local_clock();
u64 nr_flushing = wb->flushing.keys.nr;
for (size_t i = 0; i < wb->flushing.keys.nr; i++) { for (size_t i = 0; i < wb->flushing.keys.nr; i++) {
wb->sorted.data[i].idx = i; wb->sorted.data[i].idx = i;
@ -495,7 +496,7 @@ err:
bch2_time_stats_update(&c->times[BCH_TIME_btree_write_buffer_flush], start_time); bch2_time_stats_update(&c->times[BCH_TIME_btree_write_buffer_flush], start_time);
bch2_fs_fatal_err_on(ret, c, "%s", bch2_err_str(ret)); bch2_fs_fatal_err_on(ret, c, "%s", bch2_err_str(ret));
trace_write_buffer_flush(trans, wb->flushing.keys.nr, overwritten, fast, 0); trace_write_buffer_flush(trans, nr_flushing, overwritten, fast);
return ret; return ret;
} }

10
libbcachefs/trace.h
View File

@ -1246,25 +1246,23 @@ TRACE_EVENT(key_cache_fill,
); );
TRACE_EVENT(write_buffer_flush, TRACE_EVENT(write_buffer_flush,
TP_PROTO(struct btree_trans *trans, size_t nr, size_t skipped, size_t fast, size_t size), TP_PROTO(struct btree_trans *trans, size_t nr, size_t skipped, size_t fast),
TP_ARGS(trans, nr, skipped, fast, size), TP_ARGS(trans, nr, skipped, fast),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(size_t, nr ) __field(size_t, nr )
__field(size_t, skipped ) __field(size_t, skipped )
__field(size_t, fast ) __field(size_t, fast )
__field(size_t, size )
), ),
TP_fast_assign( TP_fast_assign(
__entry->nr = nr; __entry->nr = nr;
__entry->skipped = skipped; __entry->skipped = skipped;
__entry->fast = fast; __entry->fast = fast;
__entry->size = size;
), ),
TP_printk("%zu/%zu skipped %zu fast %zu", TP_printk("flushed %zu skipped %zu fast %zu",
__entry->nr, __entry->size, __entry->skipped, __entry->fast) __entry->nr, __entry->skipped, __entry->fast)
); );
TRACE_EVENT(write_buffer_flush_sync, TRACE_EVENT(write_buffer_flush_sync,