lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: Throttle tuning

Browse Source 
This avoids waiting for transactions with pages locked by breaking out
the code to wait for the current transaction to close into a function
called by btrfs_throttle.

It also lowers the limits for where we start throttling.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason
2008-07-31 10:48:37 -04:00
parent 47ac14fa0f
commit 37d1aeee39
3 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/btrfs/extent-tree.c
View File

@@ -2526,6 +2526,9 @@ static int noinline walk_down_tree(struct btrfs_trans_handle *trans,
*level = 0; *level = 0;
break; break;
} }
if (printk_ratelimit())
printk("leaf ref miss for bytenr %llu\n",
(unsigned long long)bytenr);
} }
next = btrfs_find_tree_block(root, bytenr, blocksize); next = btrfs_find_tree_block(root, bytenr, blocksize);
if (!next || !btrfs_buffer_uptodate(next, ptr_gen)) { if (!next || !btrfs_buffer_uptodate(next, ptr_gen)) {

2
fs/btrfs/file.c
View File

@@ -253,7 +253,7 @@ static int noinline dirty_and_release_pages(struct btrfs_trans_handle *trans,
end_of_last_block = start_pos + num_bytes - 1; end_of_last_block = start_pos + num_bytes - 1;
lock_extent(io_tree, start_pos, end_of_last_block, GFP_NOFS); lock_extent(io_tree, start_pos, end_of_last_block, GFP_NOFS);
trans = btrfs_start_transaction(root, 1); trans = btrfs_join_transaction(root, 1);
if (!trans) { if (!trans) {
err = -ENOMEM; err = -ENOMEM;
goto out_unlock; goto out_unlock;

38
fs/btrfs/transaction.c
View File

@@ -124,17 +124,12 @@ static noinline int record_root_in_trans(struct btrfs_root *root)
return 0; return 0;
} }
struct btrfs_trans_handle *start_transaction(struct btrfs_root *root, static void wait_current_trans(struct btrfs_root *root)
int num_blocks, int join)
{ {
struct btrfs_trans_handle *h =
kmem_cache_alloc(btrfs_trans_handle_cachep, GFP_NOFS);
struct btrfs_transaction *cur_trans; struct btrfs_transaction *cur_trans;
int ret;
mutex_lock(&root->fs_info->trans_mutex);
cur_trans = root->fs_info->running_transaction; cur_trans = root->fs_info->running_transaction;
if (cur_trans && cur_trans->blocked && !join) { if (cur_trans && cur_trans->blocked) {
DEFINE_WAIT(wait); DEFINE_WAIT(wait);
cur_trans->use_count++; cur_trans->use_count++;
while(1) { while(1) {
@@ -154,6 +149,18 @@ struct btrfs_trans_handle *start_transaction(struct btrfs_root *root,
} }
put_transaction(cur_trans); put_transaction(cur_trans);
} }
}
struct btrfs_trans_handle *start_transaction(struct btrfs_root *root,
int num_blocks, int join)
{
struct btrfs_trans_handle *h =
kmem_cache_alloc(btrfs_trans_handle_cachep, GFP_NOFS);
int ret;
mutex_lock(&root->fs_info->trans_mutex);
if (!join)
wait_current_trans(root);
ret = join_transaction(root); ret = join_transaction(root);
BUG_ON(ret); BUG_ON(ret);
@@ -200,7 +207,7 @@ static noinline int wait_for_commit(struct btrfs_root *root,
return 0; return 0;
} }
void btrfs_throttle(struct btrfs_root *root) static void throttle_on_drops(struct btrfs_root *root)
{ {
struct btrfs_fs_info *info = root->fs_info; struct btrfs_fs_info *info = root->fs_info;
@@ -223,19 +230,28 @@ harder:
} while (thr == atomic_read(&info->throttle_gen)); } while (thr == atomic_read(&info->throttle_gen));
if (harder_count < 5 && if (harder_count < 5 &&
info->total_ref_cache_size > 5 * 1024 * 1024) { info->total_ref_cache_size > 1 * 1024 * 1024) {
harder_count++; harder_count++;
goto harder; goto harder;
} }
if (harder_count < 10 && if (harder_count < 10 &&
info->total_ref_cache_size > 10 * 1024 * 1024) { info->total_ref_cache_size > 5 * 1024 * 1024) {
harder_count++; harder_count++;
goto harder; goto harder;
} }
} }
} }
void btrfs_throttle(struct btrfs_root *root)
{
mutex_lock(&root->fs_info->trans_mutex);
wait_current_trans(root);
mutex_unlock(&root->fs_info->trans_mutex);
throttle_on_drops(root);
}
static int __btrfs_end_transaction(struct btrfs_trans_handle *trans, static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
struct btrfs_root *root, int throttle) struct btrfs_root *root, int throttle)
{ {
@@ -256,7 +272,7 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
kmem_cache_free(btrfs_trans_handle_cachep, trans); kmem_cache_free(btrfs_trans_handle_cachep, trans);
if (throttle) if (throttle)
btrfs_throttle(root); throttle_on_drops(root);
return 0; return 0;
} }