Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 925baedd authored by Chris Mason's avatar Chris Mason
Browse files

Btrfs: Start btree concurrency work. 



The allocation trees and the chunk trees are serialized via their own
dedicated mutexes.  This means allocation location is still not very
fine grained.

The main FS btree is protected by locks on each block in the btree.  Locks
are taken top / down, and as processing finishes on a given level of the
tree, the lock is released after locking the lower level.

The end result of a search is now a path where only the lowest level
is locked.  Releasing or freeing the path drops any locks held.

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 1cc127b5

fs/btrfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ btrfs-y := super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ 
	   hash.o file-item.o inode-item.o inode-map.o disk-io.o \

	   transaction.o bit-radix.o inode.o file.o tree-defrag.o \

	   extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \

	   extent_io.o volumes.o async-thread.o ioctl.o

	   extent_io.o volumes.o async-thread.o ioctl.o locking.o



btrfs-$(CONFIG_FS_POSIX_ACL)	+= acl.o

else

fs/btrfs/ctree.c

+288 −98

File changed.

Preview size limit exceeded, changes collapsed.

fs/btrfs/ctree.h

+15 −8
Original line number Diff line number Diff line
@@ -330,8 +330,13 @@ struct btrfs_node { 
struct btrfs_path {

	struct extent_buffer *nodes[BTRFS_MAX_LEVEL];

	int slots[BTRFS_MAX_LEVEL];

	/* if there is real range locking, this locks field will change */

	int locks[BTRFS_MAX_LEVEL];

	int reada;

	/* keep some upper locks as we walk down */

	int keep_locks;

	int lowest_level;

	int skip_locking;

};



/*
@@ -515,6 +520,8 @@ struct btrfs_fs_info { 
	spinlock_t hash_lock;

	struct mutex trans_mutex;

	struct mutex fs_mutex;

	struct mutex alloc_mutex;

	struct mutex chunk_mutex;

	struct list_head trans_list;

	struct list_head hashers;

	struct list_head dead_roots;
@@ -576,6 +583,10 @@ struct btrfs_fs_info { 
 */

struct btrfs_root {

	struct extent_buffer *node;



	/* the node lock is held while changing the node pointer */

	spinlock_t node_lock;



	struct extent_buffer *commit_root;

	struct btrfs_root_item root_item;

	struct btrfs_key root_key;
@@ -1353,13 +1364,7 @@ struct btrfs_block_group_cache *btrfs_find_block_group(struct btrfs_root *root, 
						 struct btrfs_block_group_cache

						 *hint, u64 search_start,

						 int data, int owner);

int btrfs_inc_root_ref(struct btrfs_trans_handle *trans,

		       struct btrfs_root *root, u64 owner_objectid);

struct extent_buffer *btrfs_alloc_free_block(struct btrfs_trans_handle *trans,

					    struct btrfs_root *root, u32 size,

					    u64 root_objectid,

					    u64 hint, u64 empty_size);

struct extent_buffer *__btrfs_alloc_free_block(struct btrfs_trans_handle *trans,

					     struct btrfs_root *root,

					     u32 blocksize,

					     u64 root_objectid,
@@ -1368,8 +1373,6 @@ struct extent_buffer *__btrfs_alloc_free_block(struct btrfs_trans_handle *trans, 
					     int level,

					     u64 hint,

					     u64 empty_size);

int btrfs_grow_extent_tree(struct btrfs_trans_handle *trans,

			   struct btrfs_root *root, u64 new_size);

int btrfs_shrink_extent_tree(struct btrfs_root *root, u64 new_size);

int btrfs_insert_extent_backref(struct btrfs_trans_handle *trans,

				 struct btrfs_root *root,
@@ -1409,6 +1412,10 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans, 
int btrfs_previous_item(struct btrfs_root *root,

			struct btrfs_path *path, u64 min_objectid,

			int type);



struct extent_buffer *btrfs_root_node(struct btrfs_root *root);

struct extent_buffer *btrfs_lock_root_node(struct btrfs_root *root);



int btrfs_cow_block(struct btrfs_trans_handle *trans,

		    struct btrfs_root *root, struct extent_buffer *buf,

		    struct extent_buffer *parent, int parent_slot,

fs/btrfs/disk-io.c

+12 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "volumes.h"

#include "print-tree.h"

#include "async-thread.h"

#include "locking.h"



#if 0

static int check_tree_block(struct btrfs_root *root, struct extent_buffer *buf)
@@ -681,9 +682,11 @@ int clean_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root, 
{

	struct inode *btree_inode = root->fs_info->btree_inode;

	if (btrfs_header_generation(buf) ==

	    root->fs_info->running_transaction->transid)

	    root->fs_info->running_transaction->transid) {

		WARN_ON(!btrfs_tree_locked(buf));

		clear_extent_buffer_dirty(&BTRFS_I(btree_inode)->io_tree,

					  buf);

	}

	return 0;

}
@@ -720,6 +723,7 @@ static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize, 
	root->in_sysfs = 0;



	INIT_LIST_HEAD(&root->dirty_list);

	spin_lock_init(&root->node_lock);

	memset(&root->root_key, 0, sizeof(root->root_key));

	memset(&root->root_item, 0, sizeof(root->root_item));

	memset(&root->defrag_progress, 0, sizeof(root->defrag_progress));
@@ -1196,6 +1200,8 @@ struct btrfs_root *open_ctree(struct super_block *sb, 


	mutex_init(&fs_info->trans_mutex);

	mutex_init(&fs_info->fs_mutex);

	mutex_init(&fs_info->alloc_mutex);

	mutex_init(&fs_info->chunk_mutex);



#if 0

	ret = add_hasher(fs_info, "crc32c");
@@ -1274,7 +1280,9 @@ struct btrfs_root *open_ctree(struct super_block *sb, 


	mutex_lock(&fs_info->fs_mutex);



	mutex_lock(&fs_info->chunk_mutex);

	ret = btrfs_read_sys_array(tree_root);

	mutex_unlock(&fs_info->chunk_mutex);

	if (ret) {

		printk("btrfs: failed to read the system array on %s\n",

		       sb->s_id);
@@ -1296,7 +1304,9 @@ struct btrfs_root *open_ctree(struct super_block *sb, 
	         (unsigned long)btrfs_header_chunk_tree_uuid(chunk_root->node),

		 BTRFS_UUID_SIZE);



	mutex_lock(&fs_info->chunk_mutex);

	ret = btrfs_read_chunk_tree(chunk_root);

	mutex_unlock(&fs_info->chunk_mutex);

	BUG_ON(ret);



	btrfs_close_extra_devices(fs_devices);
@@ -1654,6 +1664,7 @@ void btrfs_mark_buffer_dirty(struct extent_buffer *buf) 
	u64 transid = btrfs_header_generation(buf);

	struct inode *btree_inode = root->fs_info->btree_inode;



	WARN_ON(!btrfs_tree_locked(buf));

	if (transid != root->fs_info->generation) {

		printk(KERN_CRIT "transid mismatch buffer %llu, found %Lu running %Lu\n",

			(unsigned long long)buf->start,

fs/btrfs/extent-tree.c

+164 −88

File changed.

Preview size limit exceeded, changes collapsed.