Skip to contentSkip to conversation

Btrfs: rework how we deal with metadata space used by delalloc

PATCH New Josef Bacik 1 participant 1 message Sep 21, 2009 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Btrfs: rework how we deal with metadata space used by delalloc

This patch fixes a few problems with how we currently deal with metadata allocations required by delalloc. This patch makes it so we track how much metadata we need for an inode's delayed allocation extents by tracking how many extents are currently waiting for allocation. It introduces two new callbacks for the extent_io tree's, merge_extent_hook and split_extent_hook. These help us keep track of when we merge delalloc extents together and split them up. Reservations are handled prior to any actually dirty'ing occurs, and then we unreserve after we dirty. btrfs_unreserve_metadata_for_delalloc() will make the appropriate unreservations as needed based on the number of reservations we currently have and the number of extents we currently have. Doing the reservation outside of doing any of the actual dirty'ing lets us do things like filemap_flush() the inode to try and force delalloc to happen, or as a last resort actually start allocation on all delalloc inodes in the fs. This has survived dbench, fs_mark and an fsx torture test. Thanks,

---
 fs/btrfs/btrfs_inode.h |    8 +++
 fs/btrfs/ctree.h       |    4 ++
 fs/btrfs/extent-tree.c |  124 +++++++++++++++++++++++++++++++++++++++++------
 fs/btrfs/extent_io.c   |   51 ++++++++------------
 fs/btrfs/extent_io.h   |    4 +-
 fs/btrfs/file.c        |   11 ++++
 fs/btrfs/inode.c       |  123 ++++++++++++++++++++++--------------------------
 7 files changed, 210 insertions(+), 115 deletions(-)
fs/btrfs/btrfs_inode.h +8 -0
index ea1ea0a..9874da8 100644
@@ -128,6 +128,14 @@ struct btrfs_inode {
 	u64 last_unlink_trans;
 
 	/*
+	 * These two counters are for delalloc metadata reservations.  We keep
+	 * track of how many extents we've accounted for vs how many extents we
+	 * have.
+	 */
+	int delalloc_reserved_extents;
+	int delalloc_extents;
+
+	/*
 	 * ordered_data_close is set by truncate when a file that used
 	 * to have good data has been truncated to zero.  When it is set
 	 * the btrfs file release call will add this inode to the
fs/btrfs/ctree.h +4 -0
index 81d3d44..0805971 100644
@@ -2013,6 +2013,10 @@ void btrfs_clear_space_info_full(struct btrfs_fs_info *info);
 
 int btrfs_reserve_metadata_space(struct btrfs_root *root, int num_items);
 int btrfs_unreserve_metadata_space(struct btrfs_root *root, int num_items);
+int btrfs_unreserve_metadata_for_delalloc(struct btrfs_root *root,
+					  struct inode *inode, int num_items);
+int btrfs_reserve_metadata_for_delalloc(struct btrfs_root *root,
+					struct inode *inode, int num_items);
 int btrfs_check_data_free_space(struct btrfs_root *root, struct inode *inode,
 				u64 bytes);
 void btrfs_free_reserved_data_space(struct btrfs_root *root,
fs/btrfs/extent-tree.c +108 -16

169 lines not on this page · raw message

fs/btrfs/extent_io.c +20 -31

144 lines not on this page · raw message

fs/btrfs/extent_io.h +3 -1
index 5d4b140..4794ec8 100644
@@ -64,7 +64,9 @@ struct extent_io_ops {
 			      unsigned long bits);
 	int (*merge_extent_hook)(struct inode *inode,
 				 struct extent_state *new,
-				 struct extent_state *old);
+				 struct extent_state *other);
+	int (*split_extent_hook)(struct inode *inode,
+				 struct extent_state *orig, u64 split);
 	int (*write_cache_pages_lock_hook)(struct page *page);
 };
 
fs/btrfs/file.c +11 -0
index 7b9f09a..4279ed7 100644
@@ -980,10 +980,18 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
 		if (ret)
 			goto out;
 
+		ret = btrfs_reserve_metadata_for_delalloc(root, inode, 1);
+		if (ret) {
+			btrfs_free_reserved_data_space(root, inode,
+						       write_bytes);
+			goto out;
+		}
+
 		ret = prepare_pages(root, file, pages, num_pages,
 				    pos, first_index, last_index,
 				    write_bytes);
 		if (ret) {
+			btrfs_unreserve_metadata_for_delalloc(root, inode, 1);
 			btrfs_free_reserved_data_space(root, inode,
 						       write_bytes);
 			goto out;
@@ -992,6 +1000,7 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
 		ret = btrfs_copy_from_user(pos, num_pages,
 					   write_bytes, pages, buf);
 		if (ret) {
+			btrfs_unreserve_metadata_for_delalloc(root, inode, 1);
 			btrfs_free_reserved_data_space(root, inode,
 						       write_bytes);
 			btrfs_drop_pages(pages, num_pages);
@@ -1002,6 +1011,7 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
 					      num_pages, pos, write_bytes);
 		btrfs_drop_pages(pages, num_pages);
 		if (ret) {
+			btrfs_unreserve_metadata_for_delalloc(root, inode, 1);
 			btrfs_free_reserved_data_space(root, inode,
 						       write_bytes);
 			goto out;
@@ -1019,6 +1029,7 @@ static ssize_t btrfs_file_write(struct file *file, const char __user *buf,
 				btrfs_btree_balance_dirty(root, 1);
 			btrfs_throttle(root);
 		}
+		btrfs_unreserve_metadata_for_delalloc(root, inode, 1);
 
 		buf += write_bytes;
 		count -= write_bytes;
fs/btrfs/inode.c +56 -67

193 lines not on this page · raw message

Signature · 1 line
1.5.4.3