Commit 76962860 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull btrfs updates from David Sterba:
 "Features:

   - shutdown ioctl support (needs CONFIG_BTRFS_EXPERIMENTAL for now):
      - set filesystem state as being shut down (also named going down
        in other filesystems), where all active operations return EIO
        and this cannot be changed until unmount
      - pending operations are attempted to be finished but error
        messages may still show up depending on where exactly the
        shutdown happened

   - scrub (and device replace) vs suspend/hibernate:
      - a running scrub will prevent suspend, which can be annoying as
        suspend is an immediate request and scrub is not critical
      - filesystem freezing before suspend was not sufficient as the
        problem was in process freezing
      - behaviour change: on suspend scrub and device replace are
        cancelled, where scrub can record the last state and continue
        from there; the device replace has to be restarted from the
        beginning

   - zone stats exported in sysfs, from the perspective of the
     filesystem this includes active, reclaimable, relocation etc zones

  Performance:

   - improvements when processing space reservation tickets by
     optimizing locking and shrinking critical sections, cumulative
     improvements in lockstat numbers show +15%

  Notable fixes:

   - use vmalloc fallback when allocating bios as high order allocations
     can happen with wide checksums (like sha256)

   - scrub will always track the last position of progress so it's not
     starting from zero after an error

  Core:

   - under experimental config, checksum calculations are offloaded to
     process context, simplifies locking and allows to remove
     compression write worker kthread(s):
      - speed improvement in direct IO throughput with buffered IO
        fallback is +15% when not offloaded but this is more related to
        internal crypto subsystem improvements
      - this will be probably default in the future removing the sysfs
        tunable

   - (experimental) block size > page size updates:
      - support more operations when not using large folios (encoded
        read/write and send)
      - raid56

   - more preparations for fscrypt support

  Other:

   - more conversions to auto-cleaned variables

   - parameter cleanups and removals

   - extended warning fixes

   - improved printing of structured values like keys

   - lots of other cleanups and refactoring"

* tag 'for-6.19-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: (147 commits)
  btrfs: remove unnecessary inode key in btrfs_log_all_parents()
  btrfs: remove redundant zero/NULL initializations in btrfs_alloc_root()
  btrfs: remaining BTRFS_PATH_AUTO_FREE conversions
  btrfs: send: do not allocate memory for xattr data when checking it exists
  btrfs: send: add unlikely to all unexpected overflow checks
  btrfs: reduce arguments to btrfs_del_inode_ref_in_log()
  btrfs: remove root argument from btrfs_del_dir_entries_in_log()
  btrfs: use test_and_set_bit() in btrfs_delayed_delete_inode_ref()
  btrfs: don't search back for dir inode item in INO_LOOKUP_USER
  btrfs: don't rewrite ret from inode_permission
  btrfs: add orig_logical to btrfs_bio for encryption
  btrfs: disable verity on encrypted inodes
  btrfs: disable various operations on encrypted inodes
  btrfs: remove redundant level reset in btrfs_del_items()
  btrfs: simplify leaf traversal after path release in btrfs_next_old_leaf()
  btrfs: optimize balance_level() path reference handling
  btrfs: factor out root promotion logic into promote_child_to_root()
  btrfs: raid56: remove the "_step" infix
  btrfs: raid56: enable bs > ps support
  btrfs: raid56: prepare finish_parity_scrub() to support bs > ps cases
  ...
parents cc25df3e 9e0e6577

fs/btrfs/accessors.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/string.h>

#include <linux/mm.h>

#include <uapi/linux/btrfs_tree.h>

#include "fs.h"

#include "extent_io.h"



struct extent_buffer;

fs/btrfs/acl.c

+10 −15
Original line number Diff line number Diff line
@@ -14,12 +14,13 @@ 
#include "ctree.h"

#include "xattr.h"

#include "acl.h"

#include "misc.h"



struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu)

{

	int size;

	const char *name;

	char *value = NULL;

	char AUTO_KFREE(value);

	struct posix_acl *acl;



	if (rcu)
@@ -49,7 +50,6 @@ struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu) 
		acl = NULL;

	else

		acl = ERR_PTR(size);

	kfree(value);



	return acl;

}
@@ -59,7 +59,7 @@ int __btrfs_set_acl(struct btrfs_trans_handle *trans, struct inode *inode, 
{

	int ret, size = 0;

	const char *name;

	char *value = NULL;

	char AUTO_KFREE(value);



	switch (type) {

	case ACL_TYPE_ACCESS:
@@ -85,28 +85,23 @@ int __btrfs_set_acl(struct btrfs_trans_handle *trans, struct inode *inode, 
		nofs_flag = memalloc_nofs_save();

		value = kmalloc(size, GFP_KERNEL);

		memalloc_nofs_restore(nofs_flag);

		if (!value) {

			ret = -ENOMEM;

			goto out;

		}

		if (!value)

			return -ENOMEM;



		ret = posix_acl_to_xattr(&init_user_ns, acl, value, size);

		if (ret < 0)

			goto out;

			return ret;

	}



	if (trans)

		ret = btrfs_setxattr(trans, inode, name, value, size, 0);

	else

		ret = btrfs_setxattr_trans(inode, name, value, size, 0);

	if (ret < 0)

		return ret;



out:

	kfree(value);



	if (!ret)

	set_cached_acl(inode, type, acl);



	return ret;

	return 0;

}



int btrfs_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,

fs/btrfs/backref.c

+14 −23
Original line number Diff line number Diff line
@@ -666,10 +666,9 @@ static int resolve_indirect_ref(struct btrfs_backref_walk_ctx *ctx, 
		ret = btrfs_search_old_slot(root, &search_key, path, ctx->time_seq);



	btrfs_debug(ctx->fs_info,

		"search slot in root %llu (level %d, ref count %d) returned %d for key (%llu %u %llu)",

"search slot in root %llu (level %d, ref count %d) returned %d for key " BTRFS_KEY_FMT,

		    ref->root_id, level, ref->count, ret,

		 ref->key_for_search.objectid, ref->key_for_search.type,

		 ref->key_for_search.offset);

		    BTRFS_KEY_FMT_VALUE(&ref->key_for_search));

	if (ret < 0)

		goto out;
@@ -1409,12 +1408,12 @@ static int find_parent_nodes(struct btrfs_backref_walk_ctx *ctx, 
	if (!path)

		return -ENOMEM;

	if (!ctx->trans) {

		path->search_commit_root = 1;

		path->skip_locking = 1;

		path->search_commit_root = true;

		path->skip_locking = true;

	}



	if (ctx->time_seq == BTRFS_SEQ_LAST)

		path->skip_locking = 1;

		path->skip_locking = true;



again:

	head = NULL;
@@ -1561,7 +1560,7 @@ static int find_parent_nodes(struct btrfs_backref_walk_ctx *ctx, 


	btrfs_release_path(path);



	ret = add_missing_keys(ctx->fs_info, &preftrees, path->skip_locking == 0);

	ret = add_missing_keys(ctx->fs_info, &preftrees, !path->skip_locking);

	if (ret)

		goto out;
@@ -2786,7 +2785,7 @@ struct btrfs_data_container *init_data_container(u32 total_bytes) 
 * allocates space to return multiple file system paths for an inode.

 * total_bytes to allocate are passed, note that space usable for actual path

 * information will be total_bytes - sizeof(struct inode_fs_paths).

 * the returned pointer must be freed with free_ipath() in the end.

 * the returned pointer must be freed with __free_inode_fs_paths() in the end.

 */

struct inode_fs_paths *init_ipath(s32 total_bytes, struct btrfs_root *fs_root,

					struct btrfs_path *path)
@@ -2811,14 +2810,6 @@ struct inode_fs_paths *init_ipath(s32 total_bytes, struct btrfs_root *fs_root, 
	return ifp;

}



void free_ipath(struct inode_fs_paths *ipath)

{

	if (!ipath)

		return;

	kvfree(ipath->fspath);

	kfree(ipath);

}



struct btrfs_backref_iter *btrfs_backref_iter_alloc(struct btrfs_fs_info *fs_info)

{

	struct btrfs_backref_iter *ret;
@@ -2834,8 +2825,8 @@ struct btrfs_backref_iter *btrfs_backref_iter_alloc(struct btrfs_fs_info *fs_inf 
	}



	/* Current backref iterator only supports iteration in commit root */

	ret->path->search_commit_root = 1;

	ret->path->skip_locking = 1;

	ret->path->search_commit_root = true;

	ret->path->skip_locking = true;

	ret->fs_info = fs_info;



	return ret;
@@ -3308,8 +3299,8 @@ static int handle_indirect_tree_backref(struct btrfs_trans_handle *trans, 
	level = cur->level + 1;



	/* Search the tree to find parent blocks referring to the block */

	path->search_commit_root = 1;

	path->skip_locking = 1;

	path->search_commit_root = true;

	path->skip_locking = true;

	path->lowest_level = level;

	ret = btrfs_search_slot(NULL, root, tree_key, path, 0, 0);

	path->lowest_level = 0;
@@ -3323,9 +3314,9 @@ static int handle_indirect_tree_backref(struct btrfs_trans_handle *trans, 
	eb = path->nodes[level];

	if (btrfs_node_blockptr(eb, path->slots[level]) != cur->bytenr) {

		btrfs_err(fs_info,

"couldn't find block (%llu) (level %d) in tree (%llu) with key (%llu %u %llu)",

"couldn't find block (%llu) (level %d) in tree (%llu) with key " BTRFS_KEY_FMT,

			  cur->bytenr, level - 1, btrfs_root_id(root),

			  tree_key->objectid, tree_key->type, tree_key->offset);

			  BTRFS_KEY_FMT_VALUE(tree_key));

		btrfs_put_root(root);

		ret = -ENOENT;

		goto out;

fs/btrfs/backref.h

+6 −1
Original line number Diff line number Diff line
@@ -241,7 +241,12 @@ char *btrfs_ref_to_path(struct btrfs_root *fs_root, struct btrfs_path *path, 
struct btrfs_data_container *init_data_container(u32 total_bytes);

struct inode_fs_paths *init_ipath(s32 total_bytes, struct btrfs_root *fs_root,

					struct btrfs_path *path);

void free_ipath(struct inode_fs_paths *ipath);



DEFINE_FREE(inode_fs_paths, struct inode_fs_paths *,

	if (_T) {

		kvfree(_T->fspath);

		kfree(_T);

	})



int btrfs_find_one_extref(struct btrfs_root *root, u64 inode_objectid,

			  u64 start_off, struct btrfs_path *path,

fs/btrfs/bio.c

+202 −88

File changed.

Preview size limit exceeded, changes collapsed.