mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-06 07:34:03 -04:00
bcachefs: Btree key cache optimization
This helps with lock contention in the journalling code: instead of updating our journal pin on every write, only get a journal pin if we don't have one. This means we can avoid hammering on journal locks nearly so much, at the cost of carrying around a journal pin for an older entry than the one we actually need. To handle that, if needed we update our journal pin to the correct one when flushed by journal reclaim. Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
@@ -487,6 +487,13 @@ int bch2_btree_key_cache_journal_flush(struct journal *j,
|
||||
six_unlock_read(&ck->c.lock);
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
if (ck->seq != seq) {
|
||||
bch2_journal_pin_update(&c->journal, ck->seq, &ck->journal,
|
||||
bch2_btree_key_cache_journal_flush);
|
||||
six_unlock_read(&ck->c.lock);
|
||||
goto unlock;
|
||||
}
|
||||
six_unlock_read(&ck->c.lock);
|
||||
|
||||
ret = bch2_trans_do(c, NULL, NULL, 0,
|
||||
@@ -547,8 +554,9 @@ bool bch2_btree_insert_key_cached(struct btree_trans *trans,
|
||||
kick_reclaim = true;
|
||||
}
|
||||
|
||||
bch2_journal_pin_update(&c->journal, trans->journal_res.seq,
|
||||
&ck->journal, bch2_btree_key_cache_journal_flush);
|
||||
bch2_journal_pin_add(&c->journal, trans->journal_res.seq,
|
||||
&ck->journal, bch2_btree_key_cache_journal_flush);
|
||||
ck->seq = trans->journal_res.seq;
|
||||
|
||||
if (kick_reclaim)
|
||||
journal_reclaim_kick(&c->journal);
|
||||
|
||||
@@ -332,6 +332,7 @@ struct bkey_cached {
|
||||
|
||||
struct journal_preres res;
|
||||
struct journal_entry_pin journal;
|
||||
u64 seq;
|
||||
|
||||
struct bkey_i *k;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user