Commit a2c63a3f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bcachefs-2024-04-22' of https://evilpiepirate.org/git/bcachefs 

Pull bcachefs fixes from Kent Overstreet:
 "Nothing too crazy in this one, and it looks like (fingers crossed) the
  recovery and repair issues are settling down - although there's going
  to be a long tail there, as we've still yet to really ramp up on error
  injection or syzbot.

   - fix a few more deadlocks in recovery

   - fix u32/u64 issues in mi_btree_bitmap

   - btree key cache shrinker now actually frees, with more
     instrumentation coming so we can verify that it's working
     correctly more easily in the future"

* tag 'bcachefs-2024-04-22' of https://evilpiepirate.org/git/bcachefs:
  bcachefs: If we run merges at a lower watermark, they must be nonblocking
  bcachefs: Fix inode early destruction path
  bcachefs: Fix deadlock in journal write path
  bcachefs: Tweak btree key cache shrinker so it actually frees
  bcachefs: bkey_cached.btree_trans_barrier_seq needs to be a ulong
  bcachefs: Fix missing call to bch2_fs_allocator_background_exit()
  bcachefs: Check for journal entries overruning end of sb clean section
  bcachefs: Fix bio alloc in check_extent_checksum()
  bcachefs: fix leak in bch2_gc_write_reflink_key
  bcachefs: KEY_TYPE_error is allowed for reflink
  bcachefs: Fix bch2_dev_btree_bitmap_marked_sectors() shift
  bcachefs: make sure to release last journal pin in replay
  bcachefs: node scan: ignore multiple nodes with same seq if interior
  bcachefs: Fix format specifier in validate_bset_keys()
  bcachefs: Fix null ptr deref in twf from BCH_IOCTL_FSCK_OFFLINE
parents 1c582ec1 e858beed

fs/bcachefs/backpointers.c

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static int check_extent_checksum(struct btree_trans *trans, 
		goto err;

	}



	bio = bio_alloc(ca->disk_sb.bdev, 1, REQ_OP_READ, GFP_KERNEL);

	bio = bio_alloc(ca->disk_sb.bdev, buf_pages(data_buf, bytes), REQ_OP_READ, GFP_KERNEL);

	bio->bi_iter.bi_sector = p.ptr.offset;

	bch2_bio_map(bio, data_buf, bytes);

	ret = submit_bio_wait(bio);

fs/bcachefs/bcachefs_format.h

+2 −1
Original line number Diff line number Diff line
@@ -1504,7 +1504,8 @@ enum btree_id_flags { 
	  BIT_ULL(KEY_TYPE_stripe))						\

	x(reflink,		7,	BTREE_ID_EXTENTS|BTREE_ID_DATA,		\

	  BIT_ULL(KEY_TYPE_reflink_v)|						\

	  BIT_ULL(KEY_TYPE_indirect_inline_data))				\

	  BIT_ULL(KEY_TYPE_indirect_inline_data)|				\

	  BIT_ULL(KEY_TYPE_error))						\

	x(subvolumes,		8,	0,					\

	  BIT_ULL(KEY_TYPE_subvolume))						\

	x(snapshots,		9,	0,					\

fs/bcachefs/btree_gc.c

+2 −1
Original line number Diff line number Diff line
@@ -1587,7 +1587,7 @@ static int bch2_gc_write_reflink_key(struct btree_trans *trans, 
		struct bkey_i *new = bch2_bkey_make_mut_noupdate(trans, k);

		ret = PTR_ERR_OR_ZERO(new);

		if (ret)

			return ret;

			goto out;



		if (!r->refcount)

			new->k.type = KEY_TYPE_deleted;
@@ -1595,6 +1595,7 @@ static int bch2_gc_write_reflink_key(struct btree_trans *trans, 
			*bkey_refcount(bkey_i_to_s(new)) = cpu_to_le64(r->refcount);

		ret = bch2_trans_update(trans, iter, new, 0);

	}

out:

fsck_err:

	printbuf_exit(&buf);

	return ret;

fs/bcachefs/btree_io.c

+1 −1
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ static int validate_bset_keys(struct bch_fs *c, struct btree *b, 
				 -BCH_ERR_btree_node_read_err_fixable,

				 c, NULL, b, i,

				 btree_node_bkey_bad_u64s,

				 "bad k->u64s %u (min %u max %lu)", k->u64s,

				 "bad k->u64s %u (min %u max %zu)", k->u64s,

				 bkeyp_key_u64s(&b->format, k),

				 U8_MAX - BKEY_U64s + bkeyp_key_u64s(&b->format, k)))

			goto drop_this_key;

fs/bcachefs/btree_key_cache.c

+4 −15
Original line number Diff line number Diff line
@@ -842,8 +842,6 @@ static unsigned long bch2_btree_key_cache_scan(struct shrinker *shrink, 
	 * Newest freed entries are at the end of the list - once we hit one

	 * that's too new to be freed, we can bail out:

	 */

	scanned += bc->nr_freed_nonpcpu;



	list_for_each_entry_safe(ck, t, &bc->freed_nonpcpu, list) {

		if (!poll_state_synchronize_srcu(&c->btree_trans_barrier,

						 ck->btree_trans_barrier_seq))
@@ -857,11 +855,6 @@ static unsigned long bch2_btree_key_cache_scan(struct shrinker *shrink, 
		bc->nr_freed_nonpcpu--;

	}



	if (scanned >= nr)

		goto out;



	scanned += bc->nr_freed_pcpu;



	list_for_each_entry_safe(ck, t, &bc->freed_pcpu, list) {

		if (!poll_state_synchronize_srcu(&c->btree_trans_barrier,

						 ck->btree_trans_barrier_seq))
@@ -875,9 +868,6 @@ static unsigned long bch2_btree_key_cache_scan(struct shrinker *shrink, 
		bc->nr_freed_pcpu--;

	}



	if (scanned >= nr)

		goto out;



	rcu_read_lock();

	tbl = rht_dereference_rcu(bc->table.tbl, &bc->table);

	if (bc->shrink_iter >= tbl->size)
@@ -893,12 +883,12 @@ static unsigned long bch2_btree_key_cache_scan(struct shrinker *shrink, 
			next = rht_dereference_bucket_rcu(pos->next, tbl, bc->shrink_iter);

			ck = container_of(pos, struct bkey_cached, hash);



			if (test_bit(BKEY_CACHED_DIRTY, &ck->flags))

			if (test_bit(BKEY_CACHED_DIRTY, &ck->flags)) {

				goto next;



			if (test_bit(BKEY_CACHED_ACCESSED, &ck->flags))

			} else if (test_bit(BKEY_CACHED_ACCESSED, &ck->flags)) {

				clear_bit(BKEY_CACHED_ACCESSED, &ck->flags);

			else if (bkey_cached_lock_for_evict(ck)) {

				goto next;

			} else if (bkey_cached_lock_for_evict(ck)) {

				bkey_cached_evict(bc, ck);

				bkey_cached_free(bc, ck);

			}
@@ -916,7 +906,6 @@ static unsigned long bch2_btree_key_cache_scan(struct shrinker *shrink, 
	} while (scanned < nr && bc->shrink_iter != start);



	rcu_read_unlock();

out:

	memalloc_nofs_restore(flags);

	srcu_read_unlock(&c->btree_trans_barrier, srcu_idx);

	mutex_unlock(&bc->lock);