Commit 96493031 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Chris Mason

btrfs: free delayed node outside of root->inode_lock

On heavy workloads, we're seeing soft lockup warnings on
root->inode_lock in __btrfs_release_delayed_node. The low hanging fruit
is to reduce the size of the critical section.
Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.cz>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 902c68a4
...@@ -149,8 +149,8 @@ static struct btrfs_delayed_node *btrfs_get_or_create_delayed_node( ...@@ -149,8 +149,8 @@ static struct btrfs_delayed_node *btrfs_get_or_create_delayed_node(
spin_lock(&root->inode_lock); spin_lock(&root->inode_lock);
ret = radix_tree_insert(&root->delayed_nodes_tree, ino, node); ret = radix_tree_insert(&root->delayed_nodes_tree, ino, node);
if (ret == -EEXIST) { if (ret == -EEXIST) {
kmem_cache_free(delayed_node_cache, node);
spin_unlock(&root->inode_lock); spin_unlock(&root->inode_lock);
kmem_cache_free(delayed_node_cache, node);
radix_tree_preload_end(); radix_tree_preload_end();
goto again; goto again;
} }
...@@ -267,14 +267,17 @@ static void __btrfs_release_delayed_node( ...@@ -267,14 +267,17 @@ static void __btrfs_release_delayed_node(
mutex_unlock(&delayed_node->mutex); mutex_unlock(&delayed_node->mutex);
if (atomic_dec_and_test(&delayed_node->refs)) { if (atomic_dec_and_test(&delayed_node->refs)) {
bool free = false;
struct btrfs_root *root = delayed_node->root; struct btrfs_root *root = delayed_node->root;
spin_lock(&root->inode_lock); spin_lock(&root->inode_lock);
if (atomic_read(&delayed_node->refs) == 0) { if (atomic_read(&delayed_node->refs) == 0) {
radix_tree_delete(&root->delayed_nodes_tree, radix_tree_delete(&root->delayed_nodes_tree,
delayed_node->inode_id); delayed_node->inode_id);
kmem_cache_free(delayed_node_cache, delayed_node); free = true;
} }
spin_unlock(&root->inode_lock); spin_unlock(&root->inode_lock);
if (free)
kmem_cache_free(delayed_node_cache, delayed_node);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment