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

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

Pull btrfs updates from David Sterba:
 "New features:

   - raid-stripe-tree

     New tree for logical file extent mapping where the physical mapping
     may not match on multiple devices. This is now used in zoned mode
     to implement RAID0/RAID1* profiles, but can be used in non-zoned
     mode as well. The support for RAID56 is in development and will
     eventually fix the problems with the current implementation. This
     is a backward incompatible feature and has to be enabled at mkfs
     time.

   - simple quota accounting (squota)

     A simplified mode of qgroup that accounts all space on the initial
     extent owners (a subvolume), the snapshots are then cheap to create
     and delete. The deletion of snapshots in fully accounting qgroups
     is a known CPU/IO performance bottleneck.

     The squota is not suitable for the general use case but works well
     for containers where the original subvolume exists for the whole
     time. This is a backward incompatible feature as it needs extending
     some structures, but can be enabled on an existing filesystem.

   - temporary filesystem fsid (temp_fsid)

     The fsid identifies a filesystem and is hard coded in the
     structures, which disallows mounting the same fsid found on
     different devices.

     For a single device filesystem this is not strictly necessary, a
     new temporary fsid can be generated on mount e.g. after a device is
     cloned. This will be used by Steam Deck for root partition A/B
     testing, or can be used for VM root images.

  Other user visible changes:

   - filesystems with partially finished metadata_uuid conversion cannot
     be mounted anymore and the uuid fixup has to be done by btrfs-progs
     (btrfstune).

  Performance improvements:

   - reduce reservations for checksum deletions (with enabled free space
     tree by factor of 4), on a sample workload on file with many
     extents the deletion time decreased by 12%

   - make extent state merges more efficient during insertions, reduce
     rb-tree iterations (run time of critical functions reduced by 5%)

  Core changes:

   - the integrity check functionality has been removed, this was a
     debugging feature and removal does not affect other integrity
     checks like checksums or tree-checker

   - space reservation changes:

      - more efficient delayed ref reservations, this avoids building up
        too much work or overusing or exhausting the global block
        reserve in some situations

      - move delayed refs reservation to the transaction start time,
        this prevents some ENOSPC corner cases related to exhaustion of
        global reserve

      - improvements in reducing excessive reservations for block group
        items

      - adjust overcommit logic in near full situations, account for one
        more chunk to eventually allocate metadata chunk, this is mostly
        relevant for small filesystems (<10GiB)

   - single device filesystems are scanned but not registered (except
     seed devices), this allows temp_fsid to work

   - qgroup iterations do not need GFP_ATOMIC allocations anymore

   - cleanups, refactoring, reduced data structure size, function
     parameter simplifications, error handling fixes"

* tag 'for-6.7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: (156 commits)
  btrfs: open code timespec64 in struct btrfs_inode
  btrfs: remove redundant log root tree index assignment during log sync
  btrfs: remove redundant initialization of variable dirty in btrfs_update_time()
  btrfs: sysfs: show temp_fsid feature
  btrfs: disable the device add feature for temp-fsid
  btrfs: disable the seed feature for temp-fsid
  btrfs: update comment for temp-fsid, fsid, and metadata_uuid
  btrfs: remove pointless empty log context list check when syncing log
  btrfs: update comment for struct btrfs_inode::lock
  btrfs: remove pointless barrier from btrfs_sync_file()
  btrfs: add and use helpers for reading and writing last_trans_committed
  btrfs: add and use helpers for reading and writing fs_info->generation
  btrfs: add and use helpers for reading and writing log_transid
  btrfs: add and use helpers for reading and writing last_log_commit
  btrfs: support cloned-device mount capability
  btrfs: add helper function find_fsid_by_disk
  btrfs: stop reserving excessive space for block group item insertions
  btrfs: stop reserving excessive space for block group item updates
  btrfs: reorder btrfs_inode to fill gaps
  btrfs: open code btrfs_ordered_inode_tree in btrfs_inode
  ...
parents 8829687a c6e8f898

fs/btrfs/Kconfig

+0 −21
Original line number Diff line number Diff line
@@ -48,27 +48,6 @@ config BTRFS_FS_POSIX_ACL 


	  If you don't know what Access Control Lists are, say N



config BTRFS_FS_CHECK_INTEGRITY

	bool "Btrfs with integrity check tool compiled in (DEPRECATED)"

	depends on BTRFS_FS

	help

	  This feature has been deprecated and will be removed in 6.7.



	  Adds code that examines all block write requests (including

	  writes of the super block). The goal is to verify that the

	  state of the filesystem on disk is always consistent, i.e.,

	  after a power-loss or kernel panic event the filesystem is

	  in a consistent state.



	  If the integrity check tool is included and activated in

	  the mount options, plenty of kernel memory is used, and

	  plenty of additional CPU cycles are spent. Enabling this

	  functionality is not intended for normal use.



	  In most cases, unless you are a btrfs developer who needs

	  to verify the integrity of (super)-block write requests

	  during the run of a regression test, say N



config BTRFS_FS_RUN_SANITY_TESTS

	bool "Btrfs will run sanity tests upon loading"

	depends on BTRFS_FS

fs/btrfs/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -33,10 +33,9 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ 
	   uuid-tree.o props.o free-space-tree.o tree-checker.o space-info.o \

	   block-rsv.o delalloc-space.o block-group.o discard.o reflink.o \

	   subpage.o tree-mod-log.o extent-io-tree.o fs.o messages.o bio.o \

	   lru_cache.o

	   lru_cache.o raid-stripe-tree.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_BLK_DEV_ZONED) += zoned.o

btrfs-$(CONFIG_FS_VERITY) += verity.o

fs/btrfs/accessors.h

+16 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#define BTRFS_ACCESSORS_H



#include <linux/stddef.h>

#include <asm/unaligned.h>



struct btrfs_map_token {

	struct extent_buffer *eb;
@@ -305,6 +306,14 @@ BTRFS_SETGET_FUNCS(timespec_nsec, struct btrfs_timespec, nsec, 32); 
BTRFS_SETGET_STACK_FUNCS(stack_timespec_sec, struct btrfs_timespec, sec, 64);

BTRFS_SETGET_STACK_FUNCS(stack_timespec_nsec, struct btrfs_timespec, nsec, 32);



BTRFS_SETGET_FUNCS(stripe_extent_encoding, struct btrfs_stripe_extent, encoding, 8);

BTRFS_SETGET_FUNCS(raid_stride_devid, struct btrfs_raid_stride, devid, 64);

BTRFS_SETGET_FUNCS(raid_stride_physical, struct btrfs_raid_stride, physical, 64);

BTRFS_SETGET_STACK_FUNCS(stack_stripe_extent_encoding,

			 struct btrfs_stripe_extent, encoding, 8);

BTRFS_SETGET_STACK_FUNCS(stack_raid_stride_devid, struct btrfs_raid_stride, devid, 64);

BTRFS_SETGET_STACK_FUNCS(stack_raid_stride_physical, struct btrfs_raid_stride, physical, 64);



/* struct btrfs_dev_extent */

BTRFS_SETGET_FUNCS(dev_extent_chunk_tree, struct btrfs_dev_extent, chunk_tree, 64);

BTRFS_SETGET_FUNCS(dev_extent_chunk_objectid, struct btrfs_dev_extent,
@@ -349,6 +358,9 @@ BTRFS_SETGET_FUNCS(extent_data_ref_count, struct btrfs_extent_data_ref, count, 3 


BTRFS_SETGET_FUNCS(shared_data_ref_count, struct btrfs_shared_data_ref, count, 32);



BTRFS_SETGET_FUNCS(extent_owner_ref_root_id, struct btrfs_extent_owner_ref,

		   root_id, 64);



BTRFS_SETGET_FUNCS(extent_inline_ref_type, struct btrfs_extent_inline_ref,

		   type, 8);

BTRFS_SETGET_FUNCS(extent_inline_ref_offset, struct btrfs_extent_inline_ref,
@@ -365,6 +377,8 @@ static inline u32 btrfs_extent_inline_ref_size(int type) 
	if (type == BTRFS_EXTENT_DATA_REF_KEY)

		return sizeof(struct btrfs_extent_data_ref) +

		       offsetof(struct btrfs_extent_inline_ref, offset);

	if (type == BTRFS_EXTENT_OWNER_REF_KEY)

		return sizeof(struct btrfs_extent_inline_ref);

	return 0;

}
@@ -966,6 +980,8 @@ BTRFS_SETGET_FUNCS(qgroup_status_flags, struct btrfs_qgroup_status_item, 
		   flags, 64);

BTRFS_SETGET_FUNCS(qgroup_status_rescan, struct btrfs_qgroup_status_item,

		   rescan, 64);

BTRFS_SETGET_FUNCS(qgroup_status_enable_gen, struct btrfs_qgroup_status_item,

		   enable_gen, 64);



/* btrfs_qgroup_info_item */

BTRFS_SETGET_FUNCS(qgroup_info_generation, struct btrfs_qgroup_info_item,

fs/btrfs/async-thread.c

+6 −6
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/list.h>

#include <linux/spinlock.h>

#include <linux/freezer.h>

#include <trace/events/btrfs.h>

#include "async-thread.h"

#include "ctree.h"
@@ -242,7 +243,7 @@ static void run_ordered_work(struct btrfs_workqueue *wq, 
			break;

		trace_btrfs_ordered_sched(work);

		spin_unlock_irqrestore(lock, flags);

		work->ordered_func(work);

		work->ordered_func(work, false);



		/* now take the lock again and drop our item from the list */

		spin_lock_irqsave(lock, flags);
@@ -277,7 +278,7 @@ static void run_ordered_work(struct btrfs_workqueue *wq, 
			 * We don't want to call the ordered free functions with

			 * the lock held.

			 */

			work->ordered_free(work);

			work->ordered_func(work, true);

			/* NB: work must not be dereferenced past this point. */

			trace_btrfs_all_work_done(wq->fs_info, work);

		}
@@ -285,7 +286,7 @@ static void run_ordered_work(struct btrfs_workqueue *wq, 
	spin_unlock_irqrestore(lock, flags);



	if (free_self) {

		self->ordered_free(self);

		self->ordered_func(self, true);

		/* NB: self must not be dereferenced past this point. */

		trace_btrfs_all_work_done(wq->fs_info, self);

	}
@@ -300,7 +301,7 @@ static void btrfs_work_helper(struct work_struct *normal_work) 


	/*

	 * We should not touch things inside work in the following cases:

	 * 1) after work->func() if it has no ordered_free

	 * 1) after work->func() if it has no ordered_func(..., true) to free

	 *    Since the struct is freed in work->func().

	 * 2) after setting WORK_DONE_BIT

	 *    The work may be freed in other threads almost instantly.
@@ -329,11 +330,10 @@ static void btrfs_work_helper(struct work_struct *normal_work) 
}



void btrfs_init_work(struct btrfs_work *work, btrfs_func_t func,

		     btrfs_func_t ordered_func, btrfs_func_t ordered_free)

		     btrfs_ordered_func_t ordered_func)

{

	work->func = func;

	work->ordered_func = ordered_func;

	work->ordered_free = ordered_free;

	INIT_WORK(&work->normal_work, btrfs_work_helper);

	INIT_LIST_HEAD(&work->ordered_list);

	work->flags = 0;

fs/btrfs/async-thread.h

+3 −3
Original line number Diff line number Diff line
@@ -13,11 +13,11 @@ struct btrfs_fs_info; 
struct btrfs_workqueue;

struct btrfs_work;

typedef void (*btrfs_func_t)(struct btrfs_work *arg);

typedef void (*btrfs_ordered_func_t)(struct btrfs_work *arg, bool);



struct btrfs_work {

	btrfs_func_t func;

	btrfs_func_t ordered_func;

	btrfs_func_t ordered_free;

	btrfs_ordered_func_t ordered_func;



	/* Don't touch things below */

	struct work_struct normal_work;
@@ -35,7 +35,7 @@ struct btrfs_workqueue *btrfs_alloc_ordered_workqueue( 
				struct btrfs_fs_info *fs_info, const char *name,

				unsigned int flags);

void btrfs_init_work(struct btrfs_work *work, btrfs_func_t func,

		     btrfs_func_t ordered_func, btrfs_func_t ordered_free);

		     btrfs_ordered_func_t ordered_func);

void btrfs_queue_work(struct btrfs_workqueue *wq,

		      struct btrfs_work *work);

void btrfs_destroy_workqueue(struct btrfs_workqueue *wq);