All of lore.kernel.org
 help / color / mirror / Atom feed
From: Josef Bacik <josef@toxicpanda.com>
To: linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH 07/42] btrfs: check if free bgs for commit
Date: Fri, 12 Oct 2018 15:32:21 -0400	[thread overview]
Message-ID: <20181012193256.13735-8-josef@toxicpanda.com> (raw)
In-Reply-To: <20181012193256.13735-1-josef@toxicpanda.com>

may_commit_transaction will skip committing the transaction if we don't
have enough pinned space or if we're trying to find space for a SYSTEM
chunk.  However if we have pending free block groups in this transaction
we still want to commit as we may be able to allocate a chunk to make
our reservation.  So instead of just returning ENOSPC, check if we have
free block groups pending, and if so commit the transaction to allow us
to use that free space.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Omar Sandoval <osandov@fb.com>
---
 fs/btrfs/extent-tree.c | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 1213f573eea2..4aab49debfc3 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4830,10 +4830,18 @@ static int may_commit_transaction(struct btrfs_fs_info *fs_info,
 	if (!bytes)
 		return 0;
 
-	/* See if there is enough pinned space to make this reservation */
-	if (__percpu_counter_compare(&space_info->total_bytes_pinned,
-				   bytes,
-				   BTRFS_TOTAL_BYTES_PINNED_BATCH) >= 0)
+	trans = btrfs_join_transaction(fs_info->extent_root);
+	if (IS_ERR(trans))
+		return PTR_ERR(trans);
+
+	/*
+	 * See if there is enough pinned space to make this reservation, or if
+	 * we have bg's that are going to be freed, allowing us to possibly do a
+	 * chunk allocation the next loop through.
+	 */
+	if (test_bit(BTRFS_TRANS_HAVE_FREE_BGS, &trans->transaction->flags) ||
+	    __percpu_counter_compare(&space_info->total_bytes_pinned, bytes,
+				     BTRFS_TOTAL_BYTES_PINNED_BATCH) >= 0)
 		goto commit;
 
 	/*
@@ -4841,7 +4849,7 @@ static int may_commit_transaction(struct btrfs_fs_info *fs_info,
 	 * this reservation.
 	 */
 	if (space_info != delayed_rsv->space_info)
-		return -ENOSPC;
+		goto enospc;
 
 	spin_lock(&delayed_rsv->lock);
 	reclaim_bytes += delayed_rsv->reserved;
@@ -4855,17 +4863,14 @@ static int may_commit_transaction(struct btrfs_fs_info *fs_info,
 	bytes -= reclaim_bytes;
 
 	if (__percpu_counter_compare(&space_info->total_bytes_pinned,
-				   bytes,
-				   BTRFS_TOTAL_BYTES_PINNED_BATCH) < 0) {
-		return -ENOSPC;
-	}
-
+				     bytes,
+				     BTRFS_TOTAL_BYTES_PINNED_BATCH) < 0)
+		goto enospc;
 commit:
-	trans = btrfs_join_transaction(fs_info->extent_root);
-	if (IS_ERR(trans))
-		return -ENOSPC;
-
 	return btrfs_commit_transaction(trans);
+enospc:
+	btrfs_end_transaction(trans);
+	return -ENOSPC;
 }
 
 /*
-- 
2.14.3


  parent reply	other threads:[~2018-10-12 19:33 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-12 19:32 [PATCH 00/42][v5] My current patch queue Josef Bacik
2018-10-12 19:32 ` [PATCH 01/42] btrfs: add btrfs_delete_ref_head helper Josef Bacik
2018-10-12 19:32 ` [PATCH 02/42] btrfs: add cleanup_ref_head_accounting helper Josef Bacik
2018-10-12 19:32 ` [PATCH 03/42] btrfs: cleanup extent_op handling Josef Bacik
2018-10-12 19:32 ` [PATCH 04/42] btrfs: only track ref_heads in delayed_ref_updates Josef Bacik
2018-10-12 19:32 ` [PATCH 05/42] btrfs: only count ref heads run in __btrfs_run_delayed_refs Josef Bacik
2018-10-12 19:32 ` [PATCH 06/42] btrfs: introduce delayed_refs_rsv Josef Bacik
2018-10-12 19:32 ` Josef Bacik [this message]
2018-10-12 19:32 ` [PATCH 08/42] btrfs: dump block_rsv whe dumping space info Josef Bacik
2018-10-12 19:32 ` [PATCH 09/42] btrfs: release metadata before running delayed refs Josef Bacik
2018-10-12 19:32 ` [PATCH 10/42] btrfs: protect space cache inode alloc with nofs Josef Bacik
2018-10-12 19:32 ` [PATCH 11/42] btrfs: fix truncate throttling Josef Bacik
2018-10-12 19:32 ` [PATCH 12/42] btrfs: don't use global rsv for chunk allocation Josef Bacik
2018-10-12 19:32 ` [PATCH 13/42] btrfs: add ALLOC_CHUNK_FORCE to the flushing code Josef Bacik
2018-10-12 19:32 ` [PATCH 14/42] btrfs: reset max_extent_size properly Josef Bacik
2018-10-12 19:32 ` [PATCH 15/42] btrfs: don't enospc all tickets on flush failure Josef Bacik
2018-10-12 19:32 ` [PATCH 16/42] btrfs: loop in inode_rsv_refill Josef Bacik
2018-10-12 19:32 ` [PATCH 17/42] btrfs: run delayed iputs before committing Josef Bacik
2018-10-12 19:32 ` [PATCH 18/42] btrfs: move the dio_sem higher up the callchain Josef Bacik
2018-10-18 16:46   ` David Sterba
2018-10-12 19:32 ` [PATCH 19/42] btrfs: set max_extent_size properly Josef Bacik
2018-10-17 11:16   ` David Sterba
2018-10-12 19:32 ` [PATCH 20/42] btrfs: don't use ctl->free_space for max_extent_size Josef Bacik
2018-10-12 19:32 ` [PATCH 21/42] btrfs: reset max_extent_size on clear in a bitmap Josef Bacik
2018-10-12 19:32 ` [PATCH 22/42] btrfs: only run delayed refs if we're committing Josef Bacik
2018-10-12 19:32 ` [PATCH 23/42] btrfs: make sure we create all new bgs Josef Bacik
2018-10-12 19:32 ` [PATCH 24/42] btrfs: assert on non-empty delayed iputs Josef Bacik
2018-10-12 19:32 ` [PATCH 25/42] btrfs: pass delayed_refs_root to btrfs_delayed_ref_lock Josef Bacik
2018-10-12 19:32 ` [PATCH 26/42] btrfs: make btrfs_destroy_delayed_refs use btrfs_delayed_ref_lock Josef Bacik
2018-10-12 19:32 ` [PATCH 27/42] btrfs: make btrfs_destroy_delayed_refs use btrfs_delete_ref_head Josef Bacik
2018-10-12 19:32 ` [PATCH 28/42] btrfs: handle delayed ref head accounting cleanup in abort Josef Bacik
2018-10-12 19:32 ` [PATCH 29/42] btrfs: call btrfs_create_pending_block_groups unconditionally Josef Bacik
2018-10-12 19:32 ` [PATCH 30/42] btrfs: just delete pending bgs if we are aborted Josef Bacik
2018-10-12 19:32 ` [PATCH 31/42] btrfs: cleanup pending bgs on transaction abort Josef Bacik
2018-10-12 19:32 ` [PATCH 32/42] btrfs: only free reserved extent if we didn't insert it Josef Bacik
2018-10-12 19:32 ` [PATCH 33/42] btrfs: fix insert_reserved error handling Josef Bacik
2018-10-12 19:32 ` [PATCH 34/42] btrfs: wait on ordered extents on abort cleanup Josef Bacik
2018-10-12 19:32 ` [PATCH 35/42] MAINTAINERS: update my email address for btrfs Josef Bacik
2018-10-12 19:32 ` [PATCH 36/42] btrfs: wait on caching when putting the bg cache Josef Bacik
2018-10-12 19:32 ` [PATCH 37/42] btrfs: wakeup cleaner thread when adding delayed iput Josef Bacik
2018-10-12 19:32 ` [PATCH 38/42] btrfs: be more explicit about allowed flush states Josef Bacik
2018-10-12 19:32 ` [PATCH 39/42] btrfs: replace cleaner_delayed_iput_mutex with a waitqueue Josef Bacik
2018-10-12 19:32 ` [PATCH 40/42] btrfs: drop min_size from evict_refill_and_join Josef Bacik
2018-10-12 19:32 ` [PATCH 41/42] btrfs: reserve extra space during evict() Josef Bacik
2018-10-12 19:32 ` [PATCH 42/42] btrfs: don't run delayed_iputs in commit Josef Bacik
2018-10-12 20:45   ` Filipe Manana
2018-10-17 11:45   ` David Sterba
  -- strict thread matches above, loose matches on Subject: below --
2018-10-11 19:53 [PATCH 00/42][v4] My current patch queue Josef Bacik
2018-10-11 19:53 ` [PATCH 07/42] btrfs: check if free bgs for commit Josef Bacik
2018-09-28 11:17 [PATCH 00/42][v3] My current patch queue Josef Bacik
2018-09-28 11:17 ` [PATCH 07/42] btrfs: check if free bgs for commit Josef Bacik
2018-10-04 11:24   ` David Sterba
2018-10-11 18:33     ` Josef Bacik
2018-10-12 16:50       ` David Sterba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181012193256.13735-8-josef@toxicpanda.com \
    --to=josef@toxicpanda.com \
    --cc=kernel-team@fb.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.