bcachefs: Add missing barriers before wake_up_bit()

wake_up() doesn't require a barrier - but wake_up_bit() does.

This only affected non x86, and primarily lead to lost wakeups after
btree node reads.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/btree_io.c b/fs/bcachefs/btree_io.c
index 5fd4a58d2ad27d79875e7dcab695d31f0c6a5f92..60782f3e5aec84e46b2c6f4dd006c1f8532106ca 100644 (file)
--- a/fs/bcachefs/btree_io.c
+++ b/fs/bcachefs/btree_io.c
@@ -41,6 +41,7 @@ void bch2_btree_node_io_unlock(struct btree *b)
 
        clear_btree_node_write_in_flight_inner(b);
        clear_btree_node_write_in_flight(b);
+       smp_mb__after_atomic();
        wake_up_bit(&b->flags, BTREE_NODE_write_in_flight);
 }
 
@@ -1400,6 +1401,7 @@ start:
 
        printbuf_exit(&buf);
        clear_btree_node_read_in_flight(b);
+       smp_mb__after_atomic();
        wake_up_bit(&b->flags, BTREE_NODE_read_in_flight);
 }
 
@@ -1595,6 +1597,7 @@ fsck_err:
        printbuf_exit(&buf);
 
        clear_btree_node_read_in_flight(b);
+       smp_mb__after_atomic();
        wake_up_bit(&b->flags, BTREE_NODE_read_in_flight);
 }
 
@@ -1721,6 +1724,7 @@ void bch2_btree_node_read(struct btree_trans *trans, struct btree *b,
                set_btree_node_read_error(b);
                bch2_btree_lost_data(c, b->c.btree_id);
                clear_btree_node_read_in_flight(b);
+               smp_mb__after_atomic();
                wake_up_bit(&b->flags, BTREE_NODE_read_in_flight);
                printbuf_exit(&buf);
                return;
@@ -2061,8 +2065,10 @@ static void __btree_node_write_done(struct bch_fs *c, struct btree *b, u64 start
 
        if (new & (1U << BTREE_NODE_write_in_flight))
                __bch2_btree_node_write(c, b, BTREE_WRITE_ALREADY_STARTED|type);
-       else
+       else {
+               smp_mb__after_atomic();
                wake_up_bit(&b->flags, BTREE_NODE_write_in_flight);
+       }
 }
 
 static void btree_node_write_done(struct bch_fs *c, struct btree *b, u64 start_time)
@@ -2175,6 +2181,7 @@ static void btree_node_write_endio(struct bio *bio)
        }
 
        clear_btree_node_write_in_flight_inner(b);
+       smp_mb__after_atomic();
        wake_up_bit(&b->flags, BTREE_NODE_write_in_flight_inner);
        INIT_WORK(&wb->work, btree_node_write_work);
        queue_work(c->btree_io_complete_wq, &wb->work);

diff --git a/fs/bcachefs/buckets.h b/fs/bcachefs/buckets.h
index 8d75b27a141885fcc07493b93637c267f53e709a..af1532de4a3747bb9dc075d85d064b06b6f66b99 100644 (file)
--- a/fs/bcachefs/buckets.h
+++ b/fs/bcachefs/buckets.h
@@ -44,6 +44,7 @@ static inline void bucket_unlock(struct bucket *b)
        BUILD_BUG_ON(!((union ulong_byte_assert) { .ulong = 1UL << BUCKET_LOCK_BITNR }).byte);
 
        clear_bit_unlock(BUCKET_LOCK_BITNR, (void *) &b->lock);
+       smp_mb__after_atomic();
        wake_up_bit((void *) &b->lock, BUCKET_LOCK_BITNR);
 }
 

diff --git a/fs/bcachefs/ec.h b/fs/bcachefs/ec.h
index 62d27e04d763f53b851aa972938bb913fffc94a6..51893e1ee874f0a21b5d04100e32696e34db6313 100644 (file)
--- a/fs/bcachefs/ec.h
+++ b/fs/bcachefs/ec.h
@@ -160,6 +160,7 @@ static inline void gc_stripe_unlock(struct gc_stripe *s)
        BUILD_BUG_ON(!((union ulong_byte_assert) { .ulong = 1UL << BUCKET_LOCK_BITNR }).byte);
 
        clear_bit_unlock(BUCKET_LOCK_BITNR, (void *) &s->lock);
+       smp_mb__after_atomic();
        wake_up_bit((void *) &s->lock, BUCKET_LOCK_BITNR);
 }