Commit 5b14ce35 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: bch2_trans_account_disk_usage_change() 



The disk space accounting rewrite is splitting out accounting for each
replicas set - those are moving to btree keys, instead of percpu
counters.

This breaks bch2_trans_fs_usage_apply() up, splitting out the part we
will still need.

Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent 8e7834a8

fs/bcachefs/btree_trans_commit.c

+5 −0
Original line number Diff line number Diff line
@@ -675,6 +675,9 @@ bch2_trans_commit_write_locked(struct btree_trans *trans, unsigned flags, 
	    bch2_trans_fs_usage_apply(trans, trans->fs_usage_deltas))

		return -BCH_ERR_btree_insert_need_mark_replicas;



	/* XXX: we only want to run this if deltas are nonzero */

	bch2_trans_account_disk_usage_change(trans);



	h = trans->hooks;

	while (h) {

		ret = h->fn(trans, h);
@@ -989,6 +992,8 @@ int __bch2_trans_commit(struct btree_trans *trans, unsigned flags) 
	    !trans->journal_entries_u64s)

		goto out_reset;



	memset(&trans->fs_usage_delta, 0, sizeof(trans->fs_usage_delta));



	ret = bch2_trans_commit_run_triggers(trans);

	if (ret)

		goto out_reset;

fs/bcachefs/buckets.c

+41 −29
Original line number Diff line number Diff line
@@ -694,48 +694,25 @@ void bch2_trans_fs_usage_revert(struct btree_trans *trans, 
	percpu_up_read(&c->mark_lock);

}



int bch2_trans_fs_usage_apply(struct btree_trans *trans,

			      struct replicas_delta_list *deltas)

void bch2_trans_account_disk_usage_change(struct btree_trans *trans)

{

	struct bch_fs *c = trans->c;

	u64 disk_res_sectors = trans->disk_res ? trans->disk_res->sectors : 0;

	static int warned_disk_usage = 0;

	bool warn = false;

	u64 disk_res_sectors = trans->disk_res ? trans->disk_res->sectors : 0;

	struct replicas_delta *d, *d2;

	struct replicas_delta *top = (void *) deltas->d + deltas->used;

	struct bch_fs_usage *dst;

	s64 added = 0, should_not_have_added;

	unsigned i;



	percpu_down_read(&c->mark_lock);

	preempt_disable();

	dst = fs_usage_ptr(c, trans->journal_res.seq, false);



	for (d = deltas->d; d != top; d = replicas_delta_next(d)) {

		switch (d->r.data_type) {

		case BCH_DATA_btree:

		case BCH_DATA_user:

		case BCH_DATA_parity:

			added += d->delta;

		}



		if (__update_replicas(c, dst, &d->r, d->delta))

			goto need_mark;

	}

	struct bch_fs_usage_base *dst = &fs_usage_ptr(c, trans->journal_res.seq, false)->b;

	struct bch_fs_usage_base *src = &trans->fs_usage_delta;



	dst->b.nr_inodes += deltas->nr_inodes;



	for (i = 0; i < BCH_REPLICAS_MAX; i++) {

		added				+= deltas->persistent_reserved[i];

		dst->b.reserved			+= deltas->persistent_reserved[i];

		dst->persistent_reserved[i]	+= deltas->persistent_reserved[i];

	}

	s64 added = src->btree + src->data + src->reserved;



	/*

	 * Not allowed to reduce sectors_available except by getting a

	 * reservation:

	 */

	should_not_have_added = added - (s64) disk_res_sectors;

	s64 should_not_have_added = added - (s64) disk_res_sectors;

	if (unlikely(should_not_have_added > 0)) {

		u64 old, new, v = atomic64_read(&c->sectors_available);
@@ -754,6 +731,13 @@ int bch2_trans_fs_usage_apply(struct btree_trans *trans, 
		this_cpu_sub(*c->online_reserved, added);

	}



	dst->hidden	+= src->hidden;

	dst->btree	+= src->btree;

	dst->data	+= src->data;

	dst->cached	+= src->cached;

	dst->reserved	+= src->reserved;

	dst->nr_inodes	+= src->nr_inodes;



	preempt_enable();

	percpu_up_read(&c->mark_lock);
@@ -761,6 +745,34 @@ int bch2_trans_fs_usage_apply(struct btree_trans *trans, 
		bch2_trans_inconsistent(trans,

					"disk usage increased %lli more than %llu sectors reserved)",

					should_not_have_added, disk_res_sectors);

}



int bch2_trans_fs_usage_apply(struct btree_trans *trans,

			      struct replicas_delta_list *deltas)

{

	struct bch_fs *c = trans->c;

	struct replicas_delta *d, *d2;

	struct replicas_delta *top = (void *) deltas->d + deltas->used;

	struct bch_fs_usage *dst;

	unsigned i;



	percpu_down_read(&c->mark_lock);

	preempt_disable();

	dst = fs_usage_ptr(c, trans->journal_res.seq, false);



	for (d = deltas->d; d != top; d = replicas_delta_next(d))

		if (__update_replicas(c, dst, &d->r, d->delta))

			goto need_mark;



	dst->b.nr_inodes += deltas->nr_inodes;



	for (i = 0; i < BCH_REPLICAS_MAX; i++) {

		dst->b.reserved			+= deltas->persistent_reserved[i];

		dst->persistent_reserved[i]	+= deltas->persistent_reserved[i];

	}



	preempt_enable();

	percpu_up_read(&c->mark_lock);

	return 0;

need_mark:

	/* revert changes: */

fs/bcachefs/buckets.h

+2 −0
Original line number Diff line number Diff line
@@ -356,6 +356,8 @@ int bch2_trigger_reservation(struct btree_trans *, enum btree_id, unsigned, 
	ret;											\

})



void bch2_trans_account_disk_usage_change(struct btree_trans *);



void bch2_trans_fs_usage_revert(struct btree_trans *, struct replicas_delta_list *);

int bch2_trans_fs_usage_apply(struct btree_trans *, struct replicas_delta_list *);