130 lines
3.8 KiB
Diff
130 lines
3.8 KiB
Diff
From e0e0d738ca9a0a34e7023f42abf56f570d3106d5 Mon Sep 17 00:00:00 2001
|
|
From: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Date: Fri, 6 Dec 2024 22:37:42 -0500
|
|
Subject: [PATCH 178/233] bcachefs: Minor bucket alloc optimization
|
|
Content-Type: text/plain; charset="utf-8"
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Check open buckets and buckets waiting for journal commit before doing
|
|
other expensive lookups.
|
|
|
|
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
|
|
Signed-off-by: Alexander Miroshnichenko <alex@millerson.name>
|
|
---
|
|
fs/bcachefs/alloc_foreground.c | 55 ++++++++++++++++++++--------------
|
|
1 file changed, 33 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/fs/bcachefs/alloc_foreground.c b/fs/bcachefs/alloc_foreground.c
|
|
index 49c9275465f9..57d5f14c93d0 100644
|
|
--- a/fs/bcachefs/alloc_foreground.c
|
|
+++ b/fs/bcachefs/alloc_foreground.c
|
|
@@ -200,14 +200,35 @@ static inline unsigned open_buckets_reserved(enum bch_watermark watermark)
|
|
}
|
|
}
|
|
|
|
+static inline bool may_alloc_bucket(struct bch_fs *c,
|
|
+ struct bpos bucket,
|
|
+ struct bucket_alloc_state *s)
|
|
+{
|
|
+ if (bch2_bucket_is_open(c, bucket.inode, bucket.offset)) {
|
|
+ s->skipped_open++;
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ if (bch2_bucket_needs_journal_commit(&c->buckets_waiting_for_journal,
|
|
+ c->journal.flushed_seq_ondisk, bucket.inode, bucket.offset)) {
|
|
+ s->skipped_need_journal_commit++;
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ if (bch2_bucket_nocow_is_locked(&c->nocow_locks, bucket)) {
|
|
+ s->skipped_nocow++;
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ return true;
|
|
+}
|
|
+
|
|
static struct open_bucket *__try_alloc_bucket(struct bch_fs *c, struct bch_dev *ca,
|
|
u64 bucket, u8 gen,
|
|
enum bch_watermark watermark,
|
|
struct bucket_alloc_state *s,
|
|
struct closure *cl)
|
|
{
|
|
- struct open_bucket *ob;
|
|
-
|
|
if (unlikely(is_superblock_bucket(c, ca, bucket)))
|
|
return NULL;
|
|
|
|
@@ -216,22 +237,6 @@ static struct open_bucket *__try_alloc_bucket(struct bch_fs *c, struct bch_dev *
|
|
return NULL;
|
|
}
|
|
|
|
- if (bch2_bucket_is_open(c, ca->dev_idx, bucket)) {
|
|
- s->skipped_open++;
|
|
- return NULL;
|
|
- }
|
|
-
|
|
- if (bch2_bucket_needs_journal_commit(&c->buckets_waiting_for_journal,
|
|
- c->journal.flushed_seq_ondisk, ca->dev_idx, bucket)) {
|
|
- s->skipped_need_journal_commit++;
|
|
- return NULL;
|
|
- }
|
|
-
|
|
- if (bch2_bucket_nocow_is_locked(&c->nocow_locks, POS(ca->dev_idx, bucket))) {
|
|
- s->skipped_nocow++;
|
|
- return NULL;
|
|
- }
|
|
-
|
|
spin_lock(&c->freelist_lock);
|
|
|
|
if (unlikely(c->open_buckets_nr_free <= open_buckets_reserved(watermark))) {
|
|
@@ -250,10 +255,9 @@ static struct open_bucket *__try_alloc_bucket(struct bch_fs *c, struct bch_dev *
|
|
return NULL;
|
|
}
|
|
|
|
- ob = bch2_open_bucket_alloc(c);
|
|
+ struct open_bucket *ob = bch2_open_bucket_alloc(c);
|
|
|
|
spin_lock(&ob->lock);
|
|
-
|
|
ob->valid = true;
|
|
ob->sectors_free = ca->mi.bucket_size;
|
|
ob->dev = ca->dev_idx;
|
|
@@ -279,8 +283,11 @@ static struct open_bucket *try_alloc_bucket(struct btree_trans *trans, struct bc
|
|
{
|
|
struct bch_fs *c = trans->c;
|
|
u64 b = freespace_iter->pos.offset & ~(~0ULL << 56);
|
|
- u8 gen;
|
|
|
|
+ if (!may_alloc_bucket(c, POS(ca->dev_idx, b), s))
|
|
+ return NULL;
|
|
+
|
|
+ u8 gen;
|
|
int ret = bch2_check_discard_freespace_key(trans, freespace_iter, &gen, true);
|
|
if (ret < 0)
|
|
return ERR_PTR(ret);
|
|
@@ -300,6 +307,7 @@ bch2_bucket_alloc_early(struct btree_trans *trans,
|
|
struct bucket_alloc_state *s,
|
|
struct closure *cl)
|
|
{
|
|
+ struct bch_fs *c = trans->c;
|
|
struct btree_iter iter, citer;
|
|
struct bkey_s_c k, ck;
|
|
struct open_bucket *ob = NULL;
|
|
@@ -359,7 +367,10 @@ bch2_bucket_alloc_early(struct btree_trans *trans,
|
|
|
|
s->buckets_seen++;
|
|
|
|
- ob = __try_alloc_bucket(trans->c, ca, k.k->p.offset, a->gen, watermark, s, cl);
|
|
+ ob = may_alloc_bucket(c, k.k->p, s)
|
|
+ ? __try_alloc_bucket(c, ca, k.k->p.offset, a->gen,
|
|
+ watermark, s, cl)
|
|
+ : NULL;
|
|
next:
|
|
bch2_set_btree_iter_dontneed(&citer);
|
|
bch2_trans_iter_exit(trans, &citer);
|
|
--
|
|
2.45.2
|
|
|