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

Commit 5cea7647 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux 

Pull btrfs updates from David Sterba:
 "There are some new user features and the usual load of invisible
  enhancements or cleanups.

  New features:

   - extend mount options to specify zlib compression level, -o
     compress=zlib:9

   - v2 of ioctl "extent to inode mapping", addressing a usecase where
     we want to retrieve more but inaccurate results and do the
     postprocessing in userspace, aiding defragmentation or
     deduplication tools

   - populate compression heuristics logic, do data sampling and try to
     guess compressibility by: looking for repeated patterns, counting
     unique byte values and distribution, calculating Shannon entropy;
     this will need more benchmarking and possibly fine tuning, but the
     base should be good enough

   - enable indexing for btrfs as lower filesystem in overlayfs

   - speedup page cache readahead during send on large files

  Internal enhancements:

   - more sanity checks of b-tree items when reading them from disk

   - more EINVAL/EUCLEAN fixups, missing BLK_STS_* conversion, other
     errno or error handling fixes

   - remove some homegrown IO-related logic, that's been obsoleted by
     core block layer changes (batching, plug/unplug, own counters)

   - add ref-verify, optional debugging feature to verify extent
     reference accounting

   - simplify code handling outstanding extents, make it more clear
     where and how the accounting is done

   - make delalloc reservations per-inode, simplify the code and make
     the logic more straightforward

   - extensive cleanup of delayed refs code

  Notable fixes:

   - fix send ioctl on 32bit with 64bit kernel"

* 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: (102 commits)
  btrfs: Fix bug for misused dev_t when lookup in dev state hash table.
  Btrfs: heuristic: add Shannon entropy calculation
  Btrfs: heuristic: add byte core set calculation
  Btrfs: heuristic: add byte set calculation
  Btrfs: heuristic: add detection of repeated data patterns
  Btrfs: heuristic: implement sampling logic
  Btrfs: heuristic: add bucket and sample counters and other defines
  Btrfs: compression: separate heuristic/compression workspaces
  btrfs: move btrfs_truncate_block out of trans handle
  btrfs: don't call btrfs_start_delalloc_roots in flushoncommit
  btrfs: track refs in a rb_tree instead of a list
  btrfs: add a comp_refs() helper
  btrfs: switch args for comp_*_refs
  btrfs: make the delalloc block rsv per inode
  btrfs: add tracepoints for outstanding extents mods
  Btrfs: rework outstanding_extents
  btrfs: increase output size for LOGICAL_INO_V2 ioctl
  btrfs: add a flags argument to LOGICAL_INO and call it LOGICAL_INO_V2
  btrfs: add a flag to iterate_inodes_from_logical to find all extent refs for uncompressed extents
  btrfs: send: remove unused code
  ...
parents 808eb24e d28e649a

fs/btrfs/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -91,3 +91,14 @@ config BTRFS_ASSERT 
	  any of the assertions trip.  This is meant for btrfs developers only.



	  If unsure, say N.



config BTRFS_FS_REF_VERIFY

	bool "Btrfs with the ref verify tool compiled in"

	depends on BTRFS_FS

	default n

	help

	  Enable run-time extent reference verification instrumentation.  This

	  is meant to be used by btrfs developers for tracking down extent

	  reference problems or verifying they didn't break something.



	  If unsure, say N.

fs/btrfs/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -10,10 +10,11 @@ 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 zstd.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 \

	   uuid-tree.o props.o hash.o free-space-tree.o

	   uuid-tree.o props.o hash.o free-space-tree.o tree-checker.o



btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o

btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o

btrfs-$(CONFIG_BTRFS_FS_REF_VERIFY) += ref-verify.o



btrfs-$(CONFIG_BTRFS_FS_RUN_SANITY_TESTS) += tests/free-space-tests.o \

	tests/extent-buffer-tests.o tests/btrfs-tests.o \

fs/btrfs/async-thread.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ struct btrfs_workqueue { 
static void normal_work_helper(struct btrfs_work *work);



#define BTRFS_WORK_HELPER(name)					\

void btrfs_##name(struct work_struct *arg)				\

noinline_for_stack void btrfs_##name(struct work_struct *arg)		\

{									\

	struct btrfs_work *work = container_of(arg, struct btrfs_work,	\

					       normal_work);		\

fs/btrfs/backref.c

+44 −28
Original line number Diff line number Diff line
@@ -40,12 +40,14 @@ static int check_extent_in_eb(const struct btrfs_key *key, 
			      const struct extent_buffer *eb,

			      const struct btrfs_file_extent_item *fi,

			      u64 extent_item_pos,

			      struct extent_inode_elem **eie)

			      struct extent_inode_elem **eie,

			      bool ignore_offset)

{

	u64 offset = 0;

	struct extent_inode_elem *e;



	if (!btrfs_file_extent_compression(eb, fi) &&

	if (!ignore_offset &&

	    !btrfs_file_extent_compression(eb, fi) &&

	    !btrfs_file_extent_encryption(eb, fi) &&

	    !btrfs_file_extent_other_encoding(eb, fi)) {

		u64 data_offset;
@@ -84,7 +86,8 @@ static void free_inode_elem_list(struct extent_inode_elem *eie) 


static int find_extent_in_eb(const struct extent_buffer *eb,

			     u64 wanted_disk_byte, u64 extent_item_pos,

			     struct extent_inode_elem **eie)

			     struct extent_inode_elem **eie,

			     bool ignore_offset)

{

	u64 disk_byte;

	struct btrfs_key key;
@@ -113,7 +116,7 @@ static int find_extent_in_eb(const struct extent_buffer *eb, 
		if (disk_byte != wanted_disk_byte)

			continue;



		ret = check_extent_in_eb(&key, eb, fi, extent_item_pos, eie);

		ret = check_extent_in_eb(&key, eb, fi, extent_item_pos, eie, ignore_offset);

		if (ret < 0)

			return ret;

	}
@@ -419,7 +422,7 @@ static int add_indirect_ref(const struct btrfs_fs_info *fs_info, 
static int add_all_parents(struct btrfs_root *root, struct btrfs_path *path,

			   struct ulist *parents, struct prelim_ref *ref,

			   int level, u64 time_seq, const u64 *extent_item_pos,

			   u64 total_refs)

			   u64 total_refs, bool ignore_offset)

{

	int ret = 0;

	int slot;
@@ -472,7 +475,7 @@ static int add_all_parents(struct btrfs_root *root, struct btrfs_path *path, 
			if (extent_item_pos) {

				ret = check_extent_in_eb(&key, eb, fi,

						*extent_item_pos,

						&eie);

						&eie, ignore_offset);

				if (ret < 0)

					break;

			}
@@ -510,7 +513,8 @@ static int add_all_parents(struct btrfs_root *root, struct btrfs_path *path, 
static int resolve_indirect_ref(struct btrfs_fs_info *fs_info,

				struct btrfs_path *path, u64 time_seq,

				struct prelim_ref *ref, struct ulist *parents,

				const u64 *extent_item_pos, u64 total_refs)

				const u64 *extent_item_pos, u64 total_refs,

				bool ignore_offset)

{

	struct btrfs_root *root;

	struct btrfs_key root_key;
@@ -581,7 +585,7 @@ static int resolve_indirect_ref(struct btrfs_fs_info *fs_info, 
	}



	ret = add_all_parents(root, path, parents, ref, level, time_seq,

			      extent_item_pos, total_refs);

			      extent_item_pos, total_refs, ignore_offset);

out:

	path->lowest_level = 0;

	btrfs_release_path(path);
@@ -616,7 +620,7 @@ static int resolve_indirect_refs(struct btrfs_fs_info *fs_info, 
				 struct btrfs_path *path, u64 time_seq,

				 struct preftrees *preftrees,

				 const u64 *extent_item_pos, u64 total_refs,

				 struct share_check *sc)

				 struct share_check *sc, bool ignore_offset)

{

	int err;

	int ret = 0;
@@ -661,7 +665,7 @@ static int resolve_indirect_refs(struct btrfs_fs_info *fs_info, 
		}

		err = resolve_indirect_ref(fs_info, path, time_seq, ref,

					   parents, extent_item_pos,

					   total_refs);

					   total_refs, ignore_offset);

		/*

		 * we can only tolerate ENOENT,otherwise,we should catch error

		 * and return directly.
@@ -769,6 +773,7 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info, 
	struct btrfs_key key;

	struct btrfs_key tmp_op_key;

	struct btrfs_key *op_key = NULL;

	struct rb_node *n;

	int count;

	int ret = 0;
@@ -778,7 +783,9 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info, 
	}



	spin_lock(&head->lock);

	list_for_each_entry(node, &head->ref_list, list) {

	for (n = rb_first(&head->ref_tree); n; n = rb_next(n)) {

		node = rb_entry(n, struct btrfs_delayed_ref_node,

				ref_node);

		if (node->seq > seq)

			continue;
@@ -1107,13 +1114,17 @@ static int add_keyed_refs(struct btrfs_fs_info *fs_info, 
 *

 * Otherwise this returns 0 for success and <0 for an error.

 *

 * If ignore_offset is set to false, only extent refs whose offsets match

 * extent_item_pos are returned.  If true, every extent ref is returned

 * and extent_item_pos is ignored.

 *

 * FIXME some caching might speed things up

 */

static int find_parent_nodes(struct btrfs_trans_handle *trans,

			     struct btrfs_fs_info *fs_info, u64 bytenr,

			     u64 time_seq, struct ulist *refs,

			     struct ulist *roots, const u64 *extent_item_pos,

			     struct share_check *sc)

			     struct share_check *sc, bool ignore_offset)

{

	struct btrfs_key key;

	struct btrfs_path *path;
@@ -1178,7 +1189,7 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, 
		head = btrfs_find_delayed_ref_head(delayed_refs, bytenr);

		if (head) {

			if (!mutex_trylock(&head->mutex)) {

				refcount_inc(&head->node.refs);

				refcount_inc(&head->refs);

				spin_unlock(&delayed_refs->lock);



				btrfs_release_path(path);
@@ -1189,7 +1200,7 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, 
				 */

				mutex_lock(&head->mutex);

				mutex_unlock(&head->mutex);

				btrfs_put_delayed_ref(&head->node);

				btrfs_put_delayed_ref_head(head);

				goto again;

			}

			spin_unlock(&delayed_refs->lock);
@@ -1235,7 +1246,7 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, 
	WARN_ON(!RB_EMPTY_ROOT(&preftrees.indirect_missing_keys.root));



	ret = resolve_indirect_refs(fs_info, path, time_seq, &preftrees,

				    extent_item_pos, total_refs, sc);

				    extent_item_pos, total_refs, sc, ignore_offset);

	if (ret)

		goto out;
@@ -1282,7 +1293,7 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, 
				btrfs_tree_read_lock(eb);

				btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);

				ret = find_extent_in_eb(eb, bytenr,

							*extent_item_pos, &eie);

							*extent_item_pos, &eie, ignore_offset);

				btrfs_tree_read_unlock_blocking(eb);

				free_extent_buffer(eb);

				if (ret < 0)
@@ -1350,7 +1361,7 @@ static void free_leaf_list(struct ulist *blocks) 
static int btrfs_find_all_leafs(struct btrfs_trans_handle *trans,

				struct btrfs_fs_info *fs_info, u64 bytenr,

				u64 time_seq, struct ulist **leafs,

				const u64 *extent_item_pos)

				const u64 *extent_item_pos, bool ignore_offset)

{

	int ret;
@@ -1359,7 +1370,7 @@ static int btrfs_find_all_leafs(struct btrfs_trans_handle *trans, 
		return -ENOMEM;



	ret = find_parent_nodes(trans, fs_info, bytenr, time_seq,

				*leafs, NULL, extent_item_pos, NULL);

				*leafs, NULL, extent_item_pos, NULL, ignore_offset);

	if (ret < 0 && ret != -ENOENT) {

		free_leaf_list(*leafs);

		return ret;
@@ -1383,7 +1394,8 @@ static int btrfs_find_all_leafs(struct btrfs_trans_handle *trans, 
 */

static int btrfs_find_all_roots_safe(struct btrfs_trans_handle *trans,

				     struct btrfs_fs_info *fs_info, u64 bytenr,

				     u64 time_seq, struct ulist **roots)

				     u64 time_seq, struct ulist **roots,

				     bool ignore_offset)

{

	struct ulist *tmp;

	struct ulist_node *node = NULL;
@@ -1402,7 +1414,7 @@ static int btrfs_find_all_roots_safe(struct btrfs_trans_handle *trans, 
	ULIST_ITER_INIT(&uiter);

	while (1) {

		ret = find_parent_nodes(trans, fs_info, bytenr, time_seq,

					tmp, *roots, NULL, NULL);

					tmp, *roots, NULL, NULL, ignore_offset);

		if (ret < 0 && ret != -ENOENT) {

			ulist_free(tmp);

			ulist_free(*roots);
@@ -1421,14 +1433,15 @@ static int btrfs_find_all_roots_safe(struct btrfs_trans_handle *trans, 


int btrfs_find_all_roots(struct btrfs_trans_handle *trans,

			 struct btrfs_fs_info *fs_info, u64 bytenr,

			 u64 time_seq, struct ulist **roots)

			 u64 time_seq, struct ulist **roots,

			 bool ignore_offset)

{

	int ret;



	if (!trans)

		down_read(&fs_info->commit_root_sem);

	ret = btrfs_find_all_roots_safe(trans, fs_info, bytenr,

					time_seq, roots);

					time_seq, roots, ignore_offset);

	if (!trans)

		up_read(&fs_info->commit_root_sem);

	return ret;
@@ -1483,7 +1496,7 @@ int btrfs_check_shared(struct btrfs_root *root, u64 inum, u64 bytenr) 
	ULIST_ITER_INIT(&uiter);

	while (1) {

		ret = find_parent_nodes(trans, fs_info, bytenr, elem.seq, tmp,

					roots, NULL, &shared);

					roots, NULL, &shared, false);

		if (ret == BACKREF_FOUND_SHARED) {

			/* this is the only condition under which we return 1 */

			ret = 1;
@@ -1877,7 +1890,8 @@ static int iterate_leaf_refs(struct btrfs_fs_info *fs_info, 
int iterate_extent_inodes(struct btrfs_fs_info *fs_info,

				u64 extent_item_objectid, u64 extent_item_pos,

				int search_commit_root,

				iterate_extent_inodes_t *iterate, void *ctx)

				iterate_extent_inodes_t *iterate, void *ctx,

				bool ignore_offset)

{

	int ret;

	struct btrfs_trans_handle *trans = NULL;
@@ -1903,14 +1917,15 @@ int iterate_extent_inodes(struct btrfs_fs_info *fs_info, 


	ret = btrfs_find_all_leafs(trans, fs_info, extent_item_objectid,

				   tree_mod_seq_elem.seq, &refs,

				   &extent_item_pos);

				   &extent_item_pos, ignore_offset);

	if (ret)

		goto out;



	ULIST_ITER_INIT(&ref_uiter);

	while (!ret && (ref_node = ulist_next(refs, &ref_uiter))) {

		ret = btrfs_find_all_roots_safe(trans, fs_info, ref_node->val,

						tree_mod_seq_elem.seq, &roots);

						tree_mod_seq_elem.seq, &roots,

						ignore_offset);

		if (ret)

			break;

		ULIST_ITER_INIT(&root_uiter);
@@ -1943,7 +1958,8 @@ int iterate_extent_inodes(struct btrfs_fs_info *fs_info, 


int iterate_inodes_from_logical(u64 logical, struct btrfs_fs_info *fs_info,

				struct btrfs_path *path,

				iterate_extent_inodes_t *iterate, void *ctx)

				iterate_extent_inodes_t *iterate, void *ctx,

				bool ignore_offset)

{

	int ret;

	u64 extent_item_pos;
@@ -1961,7 +1977,7 @@ int iterate_inodes_from_logical(u64 logical, struct btrfs_fs_info *fs_info, 
	extent_item_pos = logical - found_key.objectid;

	ret = iterate_extent_inodes(fs_info, found_key.objectid,

					extent_item_pos, search_commit_root,

					iterate, ctx);

					iterate, ctx, ignore_offset);



	return ret;

}

fs/btrfs/backref.h

+5 −3
Original line number Diff line number Diff line
@@ -43,17 +43,19 @@ int tree_backref_for_extent(unsigned long *ptr, struct extent_buffer *eb, 
int iterate_extent_inodes(struct btrfs_fs_info *fs_info,

				u64 extent_item_objectid,

				u64 extent_offset, int search_commit_root,

				iterate_extent_inodes_t *iterate, void *ctx);

				iterate_extent_inodes_t *iterate, void *ctx,

				bool ignore_offset);



int iterate_inodes_from_logical(u64 logical, struct btrfs_fs_info *fs_info,

				struct btrfs_path *path,

				iterate_extent_inodes_t *iterate, void *ctx);

				iterate_extent_inodes_t *iterate, void *ctx,

				bool ignore_offset);



int paths_from_inode(u64 inum, struct inode_fs_paths *ipath);



int btrfs_find_all_roots(struct btrfs_trans_handle *trans,

			 struct btrfs_fs_info *fs_info, u64 bytenr,

			 u64 time_seq, struct ulist **roots);

			 u64 time_seq, struct ulist **roots, bool ignore_offset);

char *btrfs_ref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path,

			u32 name_len, unsigned long name_off,

			struct extent_buffer *eb_in, u64 parent,