Commit 3eaea0db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-6.1-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux 

Pull btrfs fixes from David Sterba:

 - fix a regression in nowait + buffered write

 - in zoned mode fix endianness when comparing super block generation

 - locking and lockdep fixes:
     - fix potential sleeping under spinlock when setting qgroup limit
     - lockdep warning fixes when btrfs_path is freed after copy_to_user
     - do not modify log tree while holding a leaf from fs tree locked

 - fix freeing of sysfs files of static features on error

 - use kv.alloc for zone map allocation as a fallback to avoid warnings
   due to high order allocation

 - send, avoid unaligned encoded writes when attempting to clone range

* tag 'for-6.1-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: sysfs: normalize the error handling branch in btrfs_init_sysfs()
  btrfs: do not modify log tree while holding a leaf from fs tree locked
  btrfs: use kvcalloc in btrfs_get_dev_zone_info
  btrfs: qgroup: fix sleep from invalid context bug in btrfs_qgroup_inherit()
  btrfs: send: avoid unaligned encoded writes when attempting to clone range
  btrfs: zoned: fix missing endianness conversion in sb_write_pointer
  btrfs: free btrfs_path before copying subvol info to userspace
  btrfs: free btrfs_path before copying fspath to userspace
  btrfs: free btrfs_path before copying inodes to userspace
  btrfs: free btrfs_path before copying root refs to userspace
  btrfs: fix assertion failure and blocking during nowait buffered write
parents 88817acb ffdbb44f

fs/btrfs/ctree.c

+30 −6
Original line number Diff line number Diff line
@@ -4663,6 +4663,11 @@ int btrfs_next_old_leaf(struct btrfs_root *root, struct btrfs_path *path, 
	int ret;

	int i;



	/*

	 * The nowait semantics are used only for write paths, where we don't

	 * use the tree mod log and sequence numbers.

	 */

	if (time_seq)

		ASSERT(!path->nowait);



	nritems = btrfs_header_nritems(path->nodes[0]);
@@ -4683,8 +4688,15 @@ int btrfs_next_old_leaf(struct btrfs_root *root, struct btrfs_path *path, 
		if (path->need_commit_sem) {

			path->need_commit_sem = 0;

			need_commit_sem = true;

			if (path->nowait) {

				if (!down_read_trylock(&fs_info->commit_root_sem)) {

					ret = -EAGAIN;

					goto done;

				}

			} else {

				down_read(&fs_info->commit_root_sem);

			}

		}

		ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);

	}

	path->keep_locks = 0;
@@ -4759,7 +4771,7 @@ int btrfs_next_old_leaf(struct btrfs_root *root, struct btrfs_path *path, 
		next = c;

		ret = read_block_for_search(root, path, &next, level,

					    slot, &key);

		if (ret == -EAGAIN)

		if (ret == -EAGAIN && !path->nowait)

			goto again;



		if (ret < 0) {
@@ -4769,6 +4781,10 @@ int btrfs_next_old_leaf(struct btrfs_root *root, struct btrfs_path *path, 


		if (!path->skip_locking) {

			ret = btrfs_try_tree_read_lock(next);

			if (!ret && path->nowait) {

				ret = -EAGAIN;

				goto done;

			}

			if (!ret && time_seq) {

				/*

				 * If we don't get the lock, we may be racing
@@ -4799,7 +4815,7 @@ int btrfs_next_old_leaf(struct btrfs_root *root, struct btrfs_path *path, 


		ret = read_block_for_search(root, path, &next, level,

					    0, &key);

		if (ret == -EAGAIN)

		if (ret == -EAGAIN && !path->nowait)

			goto again;



		if (ret < 0) {
@@ -4807,9 +4823,17 @@ int btrfs_next_old_leaf(struct btrfs_root *root, struct btrfs_path *path, 
			goto done;

		}



		if (!path->skip_locking)

		if (!path->skip_locking) {

			if (path->nowait) {

				if (!btrfs_try_tree_read_lock(next)) {

					ret = -EAGAIN;

					goto done;

				}

			} else {

				btrfs_tree_read_lock(next);

			}

		}

	}

	ret = 0;

done:

	unlock_up(path, 0, 1, 0, NULL);

fs/btrfs/ioctl.c

+13 −10
Original line number Diff line number Diff line
@@ -3105,6 +3105,8 @@ static int btrfs_ioctl_get_subvol_info(struct inode *inode, void __user *argp) 
		}

	}



	btrfs_free_path(path);

	path = NULL;

	if (copy_to_user(argp, subvol_info, sizeof(*subvol_info)))

		ret = -EFAULT;
@@ -3194,6 +3196,8 @@ static int btrfs_ioctl_get_subvol_rootref(struct btrfs_root *root, 
	}



out:

	btrfs_free_path(path);



	if (!ret || ret == -EOVERFLOW) {

		rootrefs->num_items = found;

		/* update min_treeid for next search */
@@ -3205,7 +3209,6 @@ static int btrfs_ioctl_get_subvol_rootref(struct btrfs_root *root, 
	}



	kfree(rootrefs);

	btrfs_free_path(path);



	return ret;

}
@@ -4231,6 +4234,8 @@ static long btrfs_ioctl_ino_to_path(struct btrfs_root *root, void __user *arg) 
		ipath->fspath->val[i] = rel_ptr;

	}



	btrfs_free_path(path);

	path = NULL;

	ret = copy_to_user((void __user *)(unsigned long)ipa->fspath,

			   ipath->fspath, size);

	if (ret) {
@@ -4281,21 +4286,20 @@ static long btrfs_ioctl_logical_to_ino(struct btrfs_fs_info *fs_info, 
		size = min_t(u32, loi->size, SZ_16M);

	}



	path = btrfs_alloc_path();

	if (!path) {

		ret = -ENOMEM;

		goto out;

	}



	inodes = init_data_container(size);

	if (IS_ERR(inodes)) {

		ret = PTR_ERR(inodes);

		inodes = NULL;

		goto out;

		goto out_loi;

	}



	path = btrfs_alloc_path();

	if (!path) {

		ret = -ENOMEM;

		goto out;

	}

	ret = iterate_inodes_from_logical(loi->logical, fs_info, path,

					  inodes, ignore_offset);

	btrfs_free_path(path);

	if (ret == -EINVAL)

		ret = -ENOENT;

	if (ret < 0)
@@ -4307,7 +4311,6 @@ static long btrfs_ioctl_logical_to_ino(struct btrfs_fs_info *fs_info, 
		ret = -EFAULT;



out:

	btrfs_free_path(path);

	kvfree(inodes);

out_loi:

	kfree(loi);

fs/btrfs/qgroup.c

+1 −8
Original line number Diff line number Diff line
@@ -2951,14 +2951,7 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid, 
		dstgroup->rsv_rfer = inherit->lim.rsv_rfer;

		dstgroup->rsv_excl = inherit->lim.rsv_excl;



		ret = update_qgroup_limit_item(trans, dstgroup);

		if (ret) {

			qgroup_mark_inconsistent(fs_info);

			btrfs_info(fs_info,

				   "unable to update quota limit for %llu",

				   dstgroup->qgroupid);

			goto unlock;

		}

		qgroup_dirty(fs_info, dstgroup);

	}



	if (srcid) {

fs/btrfs/send.c

+23 −1
Original line number Diff line number Diff line
@@ -5702,6 +5702,7 @@ static int clone_range(struct send_ctx *sctx, struct btrfs_path *dst_path, 
		u64 ext_len;

		u64 clone_len;

		u64 clone_data_offset;

		bool crossed_src_i_size = false;



		if (slot >= btrfs_header_nritems(leaf)) {

			ret = btrfs_next_leaf(clone_root->root, path);
@@ -5759,8 +5760,10 @@ static int clone_range(struct send_ctx *sctx, struct btrfs_path *dst_path, 
		if (key.offset >= clone_src_i_size)

			break;



		if (key.offset + ext_len > clone_src_i_size)

		if (key.offset + ext_len > clone_src_i_size) {

			ext_len = clone_src_i_size - key.offset;

			crossed_src_i_size = true;

		}



		clone_data_offset = btrfs_file_extent_offset(leaf, ei);

		if (btrfs_file_extent_disk_bytenr(leaf, ei) == disk_byte) {
@@ -5821,6 +5824,25 @@ static int clone_range(struct send_ctx *sctx, struct btrfs_path *dst_path, 
				ret = send_clone(sctx, offset, clone_len,

						 clone_root);

			}

		} else if (crossed_src_i_size && clone_len < len) {

			/*

			 * If we are at i_size of the clone source inode and we

			 * can not clone from it, terminate the loop. This is

			 * to avoid sending two write operations, one with a

			 * length matching clone_len and the final one after

			 * this loop with a length of len - clone_len.

			 *

			 * When using encoded writes (BTRFS_SEND_FLAG_COMPRESSED

			 * was passed to the send ioctl), this helps avoid

			 * sending an encoded write for an offset that is not

			 * sector size aligned, in case the i_size of the source

			 * inode is not sector size aligned. That will make the

			 * receiver fallback to decompression of the data and

			 * writing it using regular buffered IO, therefore while

			 * not incorrect, it's not optimal due decompression and

			 * possible re-compression at the receiver.

			 */

			break;

		} else {

			ret = send_extent_data(sctx, dst_path, offset,

					       clone_len);

fs/btrfs/sysfs.c

+5 −2
Original line number Diff line number Diff line
@@ -2321,8 +2321,11 @@ int __init btrfs_init_sysfs(void) 


#ifdef CONFIG_BTRFS_DEBUG

	ret = sysfs_create_group(&btrfs_kset->kobj, &btrfs_debug_feature_attr_group);

	if (ret)

		goto out2;

	if (ret) {

		sysfs_unmerge_group(&btrfs_kset->kobj,

				    &btrfs_static_feature_attr_group);

		goto out_remove_group;

	}

#endif



	return 0;