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

Pull btrfs updates from David Sterba: "There are no exciting changes for users, it's been mostly API conversions and some fixes or refactoring. The mount API conversion is a base for future improvements that would come with VFS. Metadata processing has been converted to folios, not yet enabling the large folios but it's one patch away once everything gets tested enough. Core changes: - convert extent buffers to folios: - direct API conversion where possible - performance can drop by a few percent on metadata heavy workloads, the folio sizes are not constant and the calculations add up in the item helpers - both regular and subpage modes - data cannot be converted yet, we need to port that to iomap and there are some other generic changes required - convert mount to the new API, should not be user visible: - options deprecated long time ago have been removed: inode_cache, recovery - the new logic that splits mount to two phases slightly changes timing of device scanning for multi-device filesystems - LSM options will now work (like for selinux) - convert delayed nodes radix tree to xarray, preserving the preload-like logic that still allows to allocate with GFP_NOFS - more validation of sysfs value of scrub_speed_max - refactor chunk map structure, reduce size and improve performance - extent map refactoring, smaller data structures, improved performance - reduce size of struct extent_io_tree, embedded in several structures - temporary pages used for compression are cached and attached to a shrinker, this may slightly improve performance - in zoned mode, remove redirty extent buffer tracking, zeros are written in case an out-of-order is detected and proper data are written to the actual write pointer - cleanups, refactoring, error message improvements, updated tests - verify and update branch name or tag - remove unwanted text" * tag 'for-6.8-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: (89 commits) btrfs: pass btrfs_io_geometry into btrfs_max_io_len btrfs: pass struct btrfs_io_geometry to set_io_stripe btrfs: open code set_io_stripe for RAID56 btrfs: change block mapping to switch/case in btrfs_map_block btrfs: factor out block mapping for single profiles btrfs: factor out block mapping for RAID5/6 btrfs: reduce scope of data_stripes in btrfs_map_block btrfs: factor out block mapping for RAID10 btrfs: factor out block mapping for DUP profiles btrfs: factor out RAID1 block mapping btrfs: factor out block-mapping for RAID0 btrfs: re-introduce struct btrfs_io_geometry btrfs: factor out helper for single device IO check btrfs: migrate btrfs_repair_io_failure() to folio interfaces btrfs: migrate eb_bitmap_offset() to folio interfaces btrfs: migrate various end io functions to folios btrfs: migrate subpage code to folio interfaces btrfs: migrate get_eb_page_index() and get_eb_offset_in_page() to folios btrfs: don't double put our subpage reference in alloc_extent_buffer btrfs: cleanup metadata page pointer usage ...

Linus Torvalds committed 2 years ago

Commit affc5af2 parents 12958e9 e94dfb761 files · +3883 −3184Browse files

Showing the changes to include/trace (1 of 61 files). Show all

Unified · Split

include/trace/events/btrfs.h+30−48

 struct btrfs_delayed_ref_head;
 struct btrfs_block_group;
 struct btrfs_free_cluster;
-struct map_lookup;
+struct btrfs_chunk_map;
 struct extent_buffer;
 struct btrfs_work;
 struct btrfs_workqueue;
 	__print_symbolic_u64(type,					\
 		{ EXTENT_MAP_LAST_BYTE, "LAST_BYTE" 	},		\
 		{ EXTENT_MAP_HOLE, 	"HOLE" 		},		\
-		{ EXTENT_MAP_INLINE, 	"INLINE" 	},		\
+		{ EXTENT_MAP_INLINE,	"INLINE"	})
-		{ EXTENT_MAP_DELALLOC,	"DELALLOC" 	})
 #define show_map_type(type)			\
 	type, (type >= EXTENT_MAP_LAST_BYTE) ? "-" :  __show_map_type(type)
 #define show_map_flags(flag)						\
 	__print_flags(flag, "|",					\
-		{ (1 << EXTENT_FLAG_PINNED), 		"PINNED" 	},\
+		{ EXTENT_FLAG_PINNED,		"PINNED"	},\
-		{ (1 << EXTENT_FLAG_COMPRESSED), 	"COMPRESSED" 	},\
+		{ EXTENT_FLAG_COMPRESS_ZLIB,	"COMPRESS_ZLIB"	},\
-		{ (1 << EXTENT_FLAG_PREALLOC), 		"PREALLOC" 	},\
+		{ EXTENT_FLAG_COMPRESS_LZO,	"COMPRESS_LZO"	},\
-		{ (1 << EXTENT_FLAG_LOGGING),	 	"LOGGING" 	},\
+		{ EXTENT_FLAG_COMPRESS_ZSTD,	"COMPRESS_ZSTD"	},\
-		{ (1 << EXTENT_FLAG_FILLING),	 	"FILLING" 	},\
+		{ EXTENT_FLAG_PREALLOC,		"PREALLOC"	},\
-		{ (1 << EXTENT_FLAG_FS_MAPPING),	"FS_MAPPING"	})
+		{ EXTENT_FLAG_LOGGING,		"LOGGING"	},\
+		{ EXTENT_FLAG_FILLING,		"FILLING"	})
 TRACE_EVENT_CONDITION(btrfs_get_extent,
 		__field(	u64,  orig_start	)
 		__field(	u64,  block_start	)
 		__field(	u64,  block_len		)
-		__field(	unsigned long,  flags	)
+		__field(	u32,  flags		)
 		__field(	int,  refs		)
-		__field(	unsigned int,  compress_type	)
 	),
 	TP_fast_assign_btrfs(root->fs_info,
 		__entry->block_len	= map->block_len;
 		__entry->flags		= map->flags;
 		__entry->refs		= refcount_read(&map->refs);
-		__entry->compress_type	= map->compress_type;
 	),
 	TP_printk_btrfs("root=%llu(%s) ino=%llu start=%llu len=%llu "
 		  "orig_start=%llu block_start=%llu(%s) "
-		  "block_len=%llu flags=%s refs=%u "
+		  "block_len=%llu flags=%s refs=%u",
-		  "compress_type=%u",
 		  show_root_type(__entry->root_objectid),
 		  __entry->ino,
 		  __entry->start,
 		  show_map_type(__entry->block_start),
 		  __entry->block_len,
 		  show_map_flags(__entry->flags),
-		  __entry->refs, __entry->compress_type)
+		  __entry->refs)
 );
 TRACE_EVENT(btrfs_handle_em_exist,
 DECLARE_EVENT_CLASS(btrfs__chunk,
 	TP_PROTO(const struct btrfs_fs_info *fs_info,
-		 const struct map_lookup *map, u64 offset, u64 size),
+		 const struct btrfs_chunk_map *map, u64 offset, u64 size),
 	TP_ARGS(fs_info, map, offset, size),
 DEFINE_EVENT(btrfs__chunk,  btrfs_chunk_alloc,
 	TP_PROTO(const struct btrfs_fs_info *fs_info,
-		 const struct map_lookup *map, u64 offset, u64 size),
+		 const struct btrfs_chunk_map *map, u64 offset, u64 size),
 	TP_ARGS(fs_info, map, offset, size)
 );
 DEFINE_EVENT(btrfs__chunk,  btrfs_chunk_free,
 	TP_PROTO(const struct btrfs_fs_info *fs_info,
-		 const struct map_lookup *map, u64 offset, u64 size),
+		 const struct btrfs_chunk_map *map, u64 offset, u64 size),
 	TP_ARGS(fs_info, map, offset, size)
 );
 		__field(	unsigned,	set_bits)
 	),
-	TP_fast_assign_btrfs(tree->fs_info,
+	TP_fast_assign_btrfs(extent_io_tree_to_fs_info(tree),
-		__entry->owner = tree->owner;
+		const struct btrfs_inode *inode = extent_io_tree_to_inode_const(tree);
-		if (tree->inode) {
-			const struct btrfs_inode *inode = tree->inode;
-			__entry->ino	= btrfs_ino(inode);
+		__entry->owner		= tree->owner;
-			__entry->rootid	= inode->root->root_key.objectid;
+		__entry->ino		= inode ? btrfs_ino(inode) : 0;
-		} else {
+		__entry->rootid		= inode ? inode->root->root_key.objectid : 0;
-			__entry->ino	= 0;
-			__entry->rootid	= 0;
-		}
 		__entry->start		= start;
 		__entry->len		= len;
 		__entry->set_bits	= set_bits;
 		__field(	unsigned,	clear_bits)
 	),
-	TP_fast_assign_btrfs(tree->fs_info,
+	TP_fast_assign_btrfs(extent_io_tree_to_fs_info(tree),
-		__entry->owner = tree->owner;
+		const struct btrfs_inode *inode = extent_io_tree_to_inode_const(tree);
-		if (tree->inode) {
-			const struct btrfs_inode *inode = tree->inode;
-			__entry->ino	= btrfs_ino(inode);
+		__entry->owner		= tree->owner;
-			__entry->rootid	= inode->root->root_key.objectid;
+		__entry->ino		= inode ? btrfs_ino(inode) : 0;
-		} else {
+		__entry->rootid		= inode ? inode->root->root_key.objectid : 0;
-			__entry->ino	= 0;
-			__entry->rootid	= 0;
-		}
 		__entry->start		= start;
 		__entry->len		= len;
 		__entry->clear_bits	= clear_bits;
 		__field(	unsigned,	clear_bits)
 	),
-	TP_fast_assign_btrfs(tree->fs_info,
+	TP_fast_assign_btrfs(extent_io_tree_to_fs_info(tree),
-		__entry->owner = tree->owner;
+		const struct btrfs_inode *inode = extent_io_tree_to_inode_const(tree);
-		if (tree->inode) {
-			const struct btrfs_inode *inode = tree->inode;
-			__entry->ino	= btrfs_ino(inode);
+		__entry->owner		= tree->owner;
-			__entry->rootid	= inode->root->root_key.objectid;
+		__entry->ino		= inode ? btrfs_ino(inode) : 0;
-		} else {
+		__entry->rootid		= inode ? inode->root->root_key.objectid : 0;
-			__entry->ino	= 0;
-			__entry->rootid	= 0;
-		}
 		__entry->start		= start;
 		__entry->len		= len;
 		__entry->set_bits	= set_bits;