1 files changed, 58 insertions, 82 deletions

diff --git a/drivers/md/bcache/alloc.c b/drivers/md/bcache/alloc.c
index a59ef6147fc7..443d03fbac47 100644
--- a/drivers/md/bcache/alloc.c
+++ b/drivers/md/bcache/alloc.c
@@ -78,12 +78,6 @@ uint8_t bch_inc_gen(struct cache *ca, struct bucket *b)
         ca->set->need_gc = max(ca->set->need_gc, bucket_gc_gen(b));
         WARN_ON_ONCE(ca->set->need_gc > BUCKET_GC_GEN_MAX);
 
-        if (CACHE_SYNC(&ca->set->sb)) {
-                ca->need_save_prio = max(ca->need_save_prio,
-                                         bucket_disk_gen(b));
-                WARN_ON_ONCE(ca->need_save_prio > BUCKET_DISK_GEN_MAX);
-        }
-
         return ret;
 }
 
@@ -120,58 +114,46 @@ void bch_rescale_priorities(struct cache_set *c, int sectors)
         mutex_unlock(&c->bucket_lock);
 }
 
-/* Allocation */
+/*
+ * Background allocation thread: scans for buckets to be invalidated,
+ * invalidates them, rewrites prios/gens (marking them as invalidated on disk),
+ * then optionally issues discard commands to the newly free buckets, then puts
+ * them on the various freelists.
+ */
 
 static inline bool can_inc_bucket_gen(struct bucket *b)
 {
-        return bucket_gc_gen(b) < BUCKET_GC_GEN_MAX &&
-                bucket_disk_gen(b) < BUCKET_DISK_GEN_MAX;
+        return bucket_gc_gen(b) < BUCKET_GC_GEN_MAX;
 }
 
-bool bch_bucket_add_unused(struct cache *ca, struct bucket *b)
+bool bch_can_invalidate_bucket(struct cache *ca, struct bucket *b)
 {
-        BUG_ON(GC_MARK(b) || GC_SECTORS_USED(b));
+        BUG_ON(!ca->set->gc_mark_valid);
 
-        if (CACHE_REPLACEMENT(&ca->sb) == CACHE_REPLACEMENT_FIFO) {
-                unsigned i;
-
-                for (i = 0; i < RESERVE_NONE; i++)
-                        if (!fifo_full(&ca->free[i]))
-                                goto add;
-
-                return false;
-        }
-add:
-        b->prio = 0;
-
-        if (can_inc_bucket_gen(b) &&
-            fifo_push(&ca->unused, b - ca->buckets)) {
-                atomic_inc(&b->pin);
-                return true;
-        }
-
-        return false;
-}
-
-static bool can_invalidate_bucket(struct cache *ca, struct bucket *b)
-{
         return (!GC_MARK(b) ||
                 GC_MARK(b) == GC_MARK_RECLAIMABLE) &&
                 !atomic_read(&b->pin) &&
                 can_inc_bucket_gen(b);
 }
 
-static void invalidate_one_bucket(struct cache *ca, struct bucket *b)
+void __bch_invalidate_one_bucket(struct cache *ca, struct bucket *b)
 {
-        size_t bucket = b - ca->buckets;
+        lockdep_assert_held(&ca->set->bucket_lock);
+        BUG_ON(GC_MARK(b) && GC_MARK(b) != GC_MARK_RECLAIMABLE);
 
         if (GC_SECTORS_USED(b))
-                trace_bcache_invalidate(ca, bucket);
+                trace_bcache_invalidate(ca, b - ca->buckets);
 
         bch_inc_gen(ca, b);
         b->prio = INITIAL_PRIO;
         atomic_inc(&b->pin);
-        fifo_push(&ca->free_inc, bucket);
+}
+
+static void bch_invalidate_one_bucket(struct cache *ca, struct bucket *b)
+{
+        __bch_invalidate_one_bucket(ca, b);
+
+        fifo_push(&ca->free_inc, b - ca->buckets);
 }
 
 /*
@@ -201,20 +183,7 @@ static void invalidate_buckets_lru(struct cache *ca)
         ca->heap.used = 0;
 
         for_each_bucket(b, ca) {
-                /*
-                 * If we fill up the unused list, if we then return before
-                 * adding anything to the free_inc list we'll skip writing
-                 * prios/gens and just go back to allocating from the unused
-                 * list:
-                 */
-                if (fifo_full(&ca->unused))
-                        return;
-
-                if (!can_invalidate_bucket(ca, b))
-                        continue;
-
-                if (!GC_SECTORS_USED(b) &&
-                    bch_bucket_add_unused(ca, b))
+                if (!bch_can_invalidate_bucket(ca, b))
                         continue;
 
                 if (!heap_full(&ca->heap))
@@ -239,7 +208,7 @@ static void invalidate_buckets_lru(struct cache *ca)
                         return;
                 }
 
-                invalidate_one_bucket(ca, b);
+                bch_invalidate_one_bucket(ca, b);
         }
 }
 
@@ -255,8 +224,8 @@ static void invalidate_buckets_fifo(struct cache *ca)
 
                 b = ca->buckets + ca->fifo_last_bucket++;
 
-                if (can_invalidate_bucket(ca, b))
-                        invalidate_one_bucket(ca, b);
+                if (bch_can_invalidate_bucket(ca, b))
+                        bch_invalidate_one_bucket(ca, b);
 
                 if (++checked >= ca->sb.nbuckets) {
                         ca->invalidate_needs_gc = 1;
@@ -280,8 +249,8 @@ static void invalidate_buckets_random(struct cache *ca)
 
                 b = ca->buckets + n;
 
-                if (can_invalidate_bucket(ca, b))
-                        invalidate_one_bucket(ca, b);
+                if (bch_can_invalidate_bucket(ca, b))
+                        bch_invalidate_one_bucket(ca, b);
 
                 if (++checked >= ca->sb.nbuckets / 2) {
                         ca->invalidate_needs_gc = 1;
@@ -293,8 +262,7 @@ static void invalidate_buckets_random(struct cache *ca)
 
 static void invalidate_buckets(struct cache *ca)
 {
-        if (ca->invalidate_needs_gc)
-                return;
+        BUG_ON(ca->invalidate_needs_gc);
 
         switch (CACHE_REPLACEMENT(&ca->sb)) {
         case CACHE_REPLACEMENT_LRU:
@@ -354,17 +322,10 @@ static int bch_allocator_thread(void *arg)
                  * possibly issue discards to them, then we add the bucket to
                  * the free list:
                  */
-                while (1) {
+                while (!fifo_empty(&ca->free_inc)) {
                         long bucket;
 
-                        if ((!atomic_read(&ca->set->prio_blocked) ||
-                             !CACHE_SYNC(&ca->set->sb)) &&
-                            !fifo_empty(&ca->unused))
-                                fifo_pop(&ca->unused, bucket);
-                        else if (!fifo_empty(&ca->free_inc))
-                                fifo_pop(&ca->free_inc, bucket);
-                        else
-                                break;
+                        fifo_pop(&ca->free_inc, bucket);
 
                         if (ca->discard) {
                                 mutex_unlock(&ca->set->bucket_lock);
@@ -385,9 +346,9 @@ static int bch_allocator_thread(void *arg)
                  * them to the free_inc list:
                  */
 
+retry_invalidate:
                 allocator_wait(ca, ca->set->gc_mark_valid &&
-                               (ca->need_save_prio > 64 ||
-                                !ca->invalidate_needs_gc));
+                               !ca->invalidate_needs_gc);
                 invalidate_buckets(ca);
 
                 /*
@@ -395,13 +356,28 @@ static int bch_allocator_thread(void *arg)
                  * new stuff to them:
                  */
                 allocator_wait(ca, !atomic_read(&ca->set->prio_blocked));
-                if (CACHE_SYNC(&ca->set->sb) &&
-                    (!fifo_empty(&ca->free_inc) ||
-                     ca->need_save_prio > 64))
+                if (CACHE_SYNC(&ca->set->sb)) {
+                        /*
+                         * This could deadlock if an allocation with a btree
+                         * node locked ever blocked - having the btree node
+                         * locked would block garbage collection, but here we're
+                         * waiting on garbage collection before we invalidate
+                         * and free anything.
+                         *
+                         * But this should be safe since the btree code always
+                         * uses btree_check_reserve() before allocating now, and
+                         * if it fails it blocks without btree nodes locked.
+                         */
+                        if (!fifo_full(&ca->free_inc))
+                                goto retry_invalidate;
+
                         bch_prio_write(ca);
+                }
         }
 }
 
+/* Allocation */
+
 long bch_bucket_alloc(struct cache *ca, unsigned reserve, bool wait)
 {
         DEFINE_WAIT(w);
@@ -447,8 +423,6 @@ out:
                                 BUG_ON(i == r);
                 fifo_for_each(i, &ca->free_inc, iter)
                         BUG_ON(i == r);
-                fifo_for_each(i, &ca->unused, iter)
-                        BUG_ON(i == r);
         }
 
         b = ca->buckets + r;
@@ -470,17 +444,19 @@ out:
         return r;
 }
 
+void __bch_bucket_free(struct cache *ca, struct bucket *b)
+{
+        SET_GC_MARK(b, 0);
+        SET_GC_SECTORS_USED(b, 0);
+}
+
 void bch_bucket_free(struct cache_set *c, struct bkey *k)
 {
         unsigned i;
 
-        for (i = 0; i < KEY_PTRS(k); i++) {
-                struct bucket *b = PTR_BUCKET(c, k, i);
-
-                SET_GC_MARK(b, 0);
-                SET_GC_SECTORS_USED(b, 0);
-                bch_bucket_add_unused(PTR_CACHE(c, k, i), b);
-        }
+        for (i = 0; i < KEY_PTRS(k); i++)
+                __bch_bucket_free(PTR_CACHE(c, k, i),
+                                  PTR_BUCKET(c, k, i));
 }
 
 int __bch_bucket_alloc_set(struct cache_set *c, unsigned reserve,