Commit 43a7548e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull btrfs updates from David Sterba:
 "Mostly stabilization, refactoring and cleanup changes. There rest are
  minor performance optimizations due to caching or lock contention
  reduction and a few notable fixes.

  Performance improvements:

   - minor speedup in logging when repeatedly allocated structure is
     preallocated only once, improves latency and decreases lock
     contention

   - minor throughput increase (+6%), reduced lock contention after
     clearing delayed allocation bits, applies to several common
     workload types

   - skip full quota rescan if a new relation is added in the same
     transaction

  Fixes:

   - zstd fix for inline compressed file in subpage mode, updated
     version from the 6.8 time

   - proper qgroup inheritance ioctl parameter validation

   - more fiemap followup fixes after reduced locking done in 6.8:
      - fix race when detecting delalloc ranges

  Core changes:

   - more debugging code:
      - added assertions for a very rare crash in raid56 calculation
      - tree-checker dumps page state to give more insights into
        possible reference counting issues

   - add checksum calculation offloading sysfs knob, for now enabled
     under DEBUG only to determine a good heuristic for deciding the
     offload or synchronous, depends on various factors (block group
     profile, device speed) and is not as clear as initially thought
     (checksum type)

   - error handling improvements, added assertions

   - more page to folio conversion (defrag, truncate), cached size and
     shift

   - preparation for more fine grained locking of sectors in subpage
     mode

   - cleanups and refactoring:
      - include cleanups, forward declarations
      - pointer-to-structure helpers
      - redundant argument removals
      - removed unused code
      - slab cache updates, last use of SLAB_MEM_SPREAD removed"

* tag 'for-6.9-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: (114 commits)
  btrfs: reuse cloned extent buffer during fiemap to avoid re-allocations
  btrfs: fix race when detecting delalloc ranges during fiemap
  btrfs: fix off-by-one chunk length calculation at contains_pending_extent()
  btrfs: qgroup: allow quick inherit if snapshot is created and added to the same parent
  btrfs: qgroup: validate btrfs_qgroup_inherit parameter
  btrfs: include device major and minor numbers in the device scan notice
  btrfs: mark btrfs_put_caching_control() static
  btrfs: remove SLAB_MEM_SPREAD flag use
  btrfs: qgroup: always free reserved space for extent records
  btrfs: tree-checker: dump the page status if hit something wrong
  btrfs: compression: remove dead comments in btrfs_compress_heuristic()
  btrfs: subpage: make writer lock utilize bitmap
  btrfs: subpage: make reader lock utilize bitmap
  btrfs: unexport btrfs_subpage_start_writer() and btrfs_subpage_end_and_test_writer()
  btrfs: pass a valid extent map cache pointer to __get_extent_map()
  btrfs: merge btrfs_del_delalloc_inode() helpers
  btrfs: pass btrfs_device to btrfs_scratch_superblocks()
  btrfs: handle transaction commit errors in flush_reservations()
  btrfs: use KMEM_CACHE() to create btrfs_free_space cache
  btrfs: use KMEM_CACHE() to create delayed ref caches
  ...
parents 35d4aeea 1cab1375

fs/btrfs/accessors.c

+8 −7
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 


#include <asm/unaligned.h>

#include "messages.h"

#include "ctree.h"

#include "extent_io.h"

#include "fs.h"

#include "accessors.h"



static bool check_setget_bounds(const struct extent_buffer *eb,
@@ -63,8 +64,8 @@ u##bits btrfs_get_token_##bits(struct btrfs_map_token *token, \ 
	const unsigned long idx = get_eb_folio_index(token->eb, member_offset); \

	const unsigned long oil = get_eb_offset_in_folio(token->eb,	\

							 member_offset);\

	const int unit_size = folio_size(token->eb->folios[0]);		\

	const int unit_shift = folio_shift(token->eb->folios[0]);	\

	const int unit_size = token->eb->folio_size;			\

	const int unit_shift = token->eb->folio_shift;			\

	const int size = sizeof(u##bits);				\

	u8 lebytes[sizeof(u##bits)];					\

	const int part = unit_size - oil;				\
@@ -94,7 +95,7 @@ u##bits btrfs_get_##bits(const struct extent_buffer *eb, \ 
	const unsigned long idx = get_eb_folio_index(eb, member_offset);\

	const unsigned long oil = get_eb_offset_in_folio(eb,		\

							 member_offset);\

	const int unit_size = folio_size(eb->folios[0]);		\

	const int unit_size = eb->folio_size;				\

	char *kaddr = folio_address(eb->folios[idx]);			\

	const int size = sizeof(u##bits);				\

	const int part = unit_size - oil;				\
@@ -117,8 +118,8 @@ void btrfs_set_token_##bits(struct btrfs_map_token *token, \ 
	const unsigned long idx = get_eb_folio_index(token->eb, member_offset); \

	const unsigned long oil = get_eb_offset_in_folio(token->eb,	\

							 member_offset);\

	const int unit_size = folio_size(token->eb->folios[0]);		\

	const int unit_shift = folio_shift(token->eb->folios[0]);	\

	const int unit_size = token->eb->folio_size;			\

	const int unit_shift = token->eb->folio_shift;			\

	const int size = sizeof(u##bits);				\

	u8 lebytes[sizeof(u##bits)];					\

	const int part = unit_size - oil;				\
@@ -151,7 +152,7 @@ void btrfs_set_##bits(const struct extent_buffer *eb, void *ptr, \ 
	const unsigned long idx = get_eb_folio_index(eb, member_offset);\

	const unsigned long oil = get_eb_offset_in_folio(eb,		\

							 member_offset);\

	const int unit_size = folio_size(eb->folios[0]);		\

	const int unit_size = eb->folio_size;				\

	char *kaddr = folio_address(eb->folios[idx]);			\

	const int size = sizeof(u##bits);				\

	const int part = unit_size - oil;				\

fs/btrfs/accessors.h

+10 −40
Original line number Diff line number Diff line
@@ -3,8 +3,17 @@ 
#ifndef BTRFS_ACCESSORS_H

#define BTRFS_ACCESSORS_H



#include <linux/stddef.h>

#include <asm/unaligned.h>

#include <linux/stddef.h>

#include <linux/types.h>

#include <linux/align.h>

#include <linux/build_bug.h>

#include <linux/compiler.h>

#include <linux/string.h>

#include <linux/mm.h>

#include <uapi/linux/btrfs_tree.h>



struct extent_buffer;



struct btrfs_map_token {

	struct extent_buffer *eb;
@@ -844,45 +853,6 @@ static inline void btrfs_set_balance_sys(struct extent_buffer *eb, 
	write_eb_member(eb, bi, struct btrfs_balance_item, sys, ba);

}



static inline void btrfs_disk_balance_args_to_cpu(struct btrfs_balance_args *cpu,

			       const struct btrfs_disk_balance_args *disk)

{

	memset(cpu, 0, sizeof(*cpu));



	cpu->profiles = le64_to_cpu(disk->profiles);

	cpu->usage = le64_to_cpu(disk->usage);

	cpu->devid = le64_to_cpu(disk->devid);

	cpu->pstart = le64_to_cpu(disk->pstart);

	cpu->pend = le64_to_cpu(disk->pend);

	cpu->vstart = le64_to_cpu(disk->vstart);

	cpu->vend = le64_to_cpu(disk->vend);

	cpu->target = le64_to_cpu(disk->target);

	cpu->flags = le64_to_cpu(disk->flags);

	cpu->limit = le64_to_cpu(disk->limit);

	cpu->stripes_min = le32_to_cpu(disk->stripes_min);

	cpu->stripes_max = le32_to_cpu(disk->stripes_max);

}



static inline void btrfs_cpu_balance_args_to_disk(

				struct btrfs_disk_balance_args *disk,

				const struct btrfs_balance_args *cpu)

{

	memset(disk, 0, sizeof(*disk));



	disk->profiles = cpu_to_le64(cpu->profiles);

	disk->usage = cpu_to_le64(cpu->usage);

	disk->devid = cpu_to_le64(cpu->devid);

	disk->pstart = cpu_to_le64(cpu->pstart);

	disk->pend = cpu_to_le64(cpu->pend);

	disk->vstart = cpu_to_le64(cpu->vstart);

	disk->vend = cpu_to_le64(cpu->vend);

	disk->target = cpu_to_le64(cpu->target);

	disk->flags = cpu_to_le64(cpu->flags);

	disk->limit = cpu_to_le64(cpu->limit);

	disk->stripes_min = cpu_to_le32(cpu->stripes_min);

	disk->stripes_max = cpu_to_le32(cpu->stripes_max);

}



/* struct btrfs_super_block */

BTRFS_SETGET_STACK_FUNCS(super_bytenr, struct btrfs_super_block, bytenr, 64);

BTRFS_SETGET_STACK_FUNCS(super_flags, struct btrfs_super_block, flags, 64);

fs/btrfs/acl.c

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

#include <linux/slab.h>

#include "ctree.h"

#include "btrfs_inode.h"

#include "xattr.h"

#include "acl.h"

fs/btrfs/acl.h

+11 −0
Original line number Diff line number Diff line
@@ -3,8 +3,15 @@ 
#ifndef BTRFS_ACL_H

#define BTRFS_ACL_H



struct posix_acl;

struct inode;

struct btrfs_trans_handle;



#ifdef CONFIG_BTRFS_FS_POSIX_ACL



struct mnt_idmap;

struct dentry;



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

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

		  struct posix_acl *acl, int type);
@@ -13,6 +20,10 @@ int __btrfs_set_acl(struct btrfs_trans_handle *trans, struct inode *inode, 


#else



#include <linux/errno.h>



struct btrfs_trans_handle;



#define btrfs_get_acl NULL

#define btrfs_set_acl NULL

static inline int __btrfs_set_acl(struct btrfs_trans_handle *trans,

fs/btrfs/async-thread.c

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

#include <trace/events/btrfs.h>

#include "async-thread.h"

#include "ctree.h"



enum {

	WORK_DONE_BIT,