Btrfs: implement the free space B-tree
The free space cache has turned out to be a scalability bottleneck on large, busy filesystems. When the cache for a lot of block groups needs to be written out, we can get extremely long commit times; if this happens in the critical section, things are especially bad because we block new transactions from happening. The main problem with the free space cache is that it has to be written out in its entirety and is managed in an ad hoc fashion. Using a B-tree to store free space fixes this: updates can be done as needed and we get all of the benefits of using a B-tree: checksumming, RAID handling, well-understood behavior. With the free space tree, we get commit times that are about the same as the no cache case with load times slower than the free space cache case but still much faster than the no cache case. Free space is represented with extents until it becomes more space-efficient to use bitmaps, giving us similar space overhead to the free space cache. The operations on the free space tree are: adding and removing free space, handling the creation and deletion of block groups, and loading the free space for a block group. We can also create the free space tree by walking the extent tree and clear the free space tree. Signed-off-by: Omar Sandoval <osandov@fb.com> Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
parent
208acb8c72
commit
a5ed918285
|
@ -9,7 +9,7 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \
|
||||||
export.o tree-log.o free-space-cache.o zlib.o lzo.o \
|
export.o tree-log.o free-space-cache.o zlib.o lzo.o \
|
||||||
compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o \
|
compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o \
|
||||||
reada.o backref.o ulist.o qgroup.o send.o dev-replace.o raid56.o \
|
reada.o backref.o ulist.o qgroup.o send.o dev-replace.o raid56.o \
|
||||||
uuid-tree.o props.o hash.o
|
uuid-tree.o props.o hash.o free-space-tree.o
|
||||||
|
|
||||||
btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o
|
btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o
|
||||||
btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o
|
btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o
|
||||||
|
|
|
@ -1302,8 +1302,20 @@ struct btrfs_block_group_cache {
|
||||||
u64 delalloc_bytes;
|
u64 delalloc_bytes;
|
||||||
u64 bytes_super;
|
u64 bytes_super;
|
||||||
u64 flags;
|
u64 flags;
|
||||||
u64 sectorsize;
|
|
||||||
u64 cache_generation;
|
u64 cache_generation;
|
||||||
|
u32 sectorsize;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If the free space extent count exceeds this number, convert the block
|
||||||
|
* group to bitmaps.
|
||||||
|
*/
|
||||||
|
u32 bitmap_high_thresh;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If the free space extent count drops below this number, convert the
|
||||||
|
* block group back to extents.
|
||||||
|
*/
|
||||||
|
u32 bitmap_low_thresh;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* It is just used for the delayed data space allocation because
|
* It is just used for the delayed data space allocation because
|
||||||
|
@ -1359,6 +1371,15 @@ struct btrfs_block_group_cache {
|
||||||
struct list_head io_list;
|
struct list_head io_list;
|
||||||
|
|
||||||
struct btrfs_io_ctl io_ctl;
|
struct btrfs_io_ctl io_ctl;
|
||||||
|
|
||||||
|
/* Lock for free space tree operations. */
|
||||||
|
struct mutex free_space_lock;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Does the block group need to be added to the free space tree?
|
||||||
|
* Protected by free_space_lock.
|
||||||
|
*/
|
||||||
|
int needs_free_space;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* delayed seq elem */
|
/* delayed seq elem */
|
||||||
|
@ -1410,6 +1431,7 @@ struct btrfs_fs_info {
|
||||||
struct btrfs_root *csum_root;
|
struct btrfs_root *csum_root;
|
||||||
struct btrfs_root *quota_root;
|
struct btrfs_root *quota_root;
|
||||||
struct btrfs_root *uuid_root;
|
struct btrfs_root *uuid_root;
|
||||||
|
struct btrfs_root *free_space_root;
|
||||||
|
|
||||||
/* the log root tree is a directory of all the other log roots */
|
/* the log root tree is a directory of all the other log roots */
|
||||||
struct btrfs_root *log_root_tree;
|
struct btrfs_root *log_root_tree;
|
||||||
|
@ -3555,6 +3577,9 @@ void btrfs_end_write_no_snapshoting(struct btrfs_root *root);
|
||||||
void check_system_chunk(struct btrfs_trans_handle *trans,
|
void check_system_chunk(struct btrfs_trans_handle *trans,
|
||||||
struct btrfs_root *root,
|
struct btrfs_root *root,
|
||||||
const u64 type);
|
const u64 type);
|
||||||
|
u64 add_new_free_space(struct btrfs_block_group_cache *block_group,
|
||||||
|
struct btrfs_fs_info *info, u64 start, u64 end);
|
||||||
|
|
||||||
/* ctree.c */
|
/* ctree.c */
|
||||||
int btrfs_bin_search(struct extent_buffer *eb, struct btrfs_key *key,
|
int btrfs_bin_search(struct extent_buffer *eb, struct btrfs_key *key,
|
||||||
int level, int *slot);
|
int level, int *slot);
|
||||||
|
|
|
@ -337,8 +337,8 @@ static void put_caching_control(struct btrfs_caching_control *ctl)
|
||||||
* we need to check the pinned_extents for any extents that can't be used yet
|
* we need to check the pinned_extents for any extents that can't be used yet
|
||||||
* since their free space will be released as soon as the transaction commits.
|
* since their free space will be released as soon as the transaction commits.
|
||||||
*/
|
*/
|
||||||
static u64 add_new_free_space(struct btrfs_block_group_cache *block_group,
|
u64 add_new_free_space(struct btrfs_block_group_cache *block_group,
|
||||||
struct btrfs_fs_info *info, u64 start, u64 end)
|
struct btrfs_fs_info *info, u64 start, u64 end)
|
||||||
{
|
{
|
||||||
u64 extent_start, extent_end, size, total_added = 0;
|
u64 extent_start, extent_end, size, total_added = 0;
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -9381,6 +9381,7 @@ btrfs_create_block_group_cache(struct btrfs_root *root, u64 start, u64 size)
|
||||||
INIT_LIST_HEAD(&cache->io_list);
|
INIT_LIST_HEAD(&cache->io_list);
|
||||||
btrfs_init_free_space_ctl(cache);
|
btrfs_init_free_space_ctl(cache);
|
||||||
atomic_set(&cache->trimming, 0);
|
atomic_set(&cache->trimming, 0);
|
||||||
|
mutex_init(&cache->free_space_lock);
|
||||||
|
|
||||||
return cache;
|
return cache;
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,72 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2015 Facebook. All rights reserved.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public
|
||||||
|
* License v2 as published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public
|
||||||
|
* License along with this program; if not, write to the
|
||||||
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||||
|
* Boston, MA 021110-1307, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef __BTRFS_FREE_SPACE_TREE
|
||||||
|
#define __BTRFS_FREE_SPACE_TREE
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The default size for new free space bitmap items. The last bitmap in a block
|
||||||
|
* group may be truncated, and none of the free space tree code assumes that
|
||||||
|
* existing bitmaps are this size.
|
||||||
|
*/
|
||||||
|
#define BTRFS_FREE_SPACE_BITMAP_SIZE 256
|
||||||
|
#define BTRFS_FREE_SPACE_BITMAP_BITS (BTRFS_FREE_SPACE_BITMAP_SIZE * BITS_PER_BYTE)
|
||||||
|
|
||||||
|
void set_free_space_tree_thresholds(struct btrfs_block_group_cache *block_group);
|
||||||
|
int btrfs_create_free_space_tree(struct btrfs_fs_info *fs_info);
|
||||||
|
int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info);
|
||||||
|
int load_free_space_tree(struct btrfs_caching_control *caching_ctl);
|
||||||
|
int add_block_group_free_space(struct btrfs_trans_handle *trans,
|
||||||
|
struct btrfs_fs_info *fs_info,
|
||||||
|
struct btrfs_block_group_cache *block_group);
|
||||||
|
int remove_block_group_free_space(struct btrfs_trans_handle *trans,
|
||||||
|
struct btrfs_fs_info *fs_info,
|
||||||
|
struct btrfs_block_group_cache *block_group);
|
||||||
|
int add_to_free_space_tree(struct btrfs_trans_handle *trans,
|
||||||
|
struct btrfs_fs_info *fs_info,
|
||||||
|
u64 start, u64 size);
|
||||||
|
int remove_from_free_space_tree(struct btrfs_trans_handle *trans,
|
||||||
|
struct btrfs_fs_info *fs_info,
|
||||||
|
u64 start, u64 size);
|
||||||
|
|
||||||
|
/* Exposed for testing. */
|
||||||
|
struct btrfs_free_space_info *
|
||||||
|
search_free_space_info(struct btrfs_trans_handle *trans,
|
||||||
|
struct btrfs_fs_info *fs_info,
|
||||||
|
struct btrfs_block_group_cache *block_group,
|
||||||
|
struct btrfs_path *path, int cow);
|
||||||
|
int __add_to_free_space_tree(struct btrfs_trans_handle *trans,
|
||||||
|
struct btrfs_fs_info *fs_info,
|
||||||
|
struct btrfs_block_group_cache *block_group,
|
||||||
|
struct btrfs_path *path, u64 start, u64 size);
|
||||||
|
int __remove_from_free_space_tree(struct btrfs_trans_handle *trans,
|
||||||
|
struct btrfs_fs_info *fs_info,
|
||||||
|
struct btrfs_block_group_cache *block_group,
|
||||||
|
struct btrfs_path *path, u64 start, u64 size);
|
||||||
|
int convert_free_space_to_bitmaps(struct btrfs_trans_handle *trans,
|
||||||
|
struct btrfs_fs_info *fs_info,
|
||||||
|
struct btrfs_block_group_cache *block_group,
|
||||||
|
struct btrfs_path *path);
|
||||||
|
int convert_free_space_to_extents(struct btrfs_trans_handle *trans,
|
||||||
|
struct btrfs_fs_info *fs_info,
|
||||||
|
struct btrfs_block_group_cache *block_group,
|
||||||
|
struct btrfs_path *path);
|
||||||
|
int free_space_test_bit(struct btrfs_block_group_cache *block_group,
|
||||||
|
struct btrfs_path *path, u64 offset);
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in New Issue