| Message ID | a61f241459cdfccfe338ec6bb5e883047c4457b6.1714707707.git.wqu@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs: extent-map: unify the members with btrfs_ordered_extent | expand |
On Fri, May 3, 2024 at 7:03 AM Qu Wenruo <wqu@suse.com> wrote: > > All parameters after @filepos of btrfs_alloc_ordered_extent() can be > replaced with btrfs_file_extent structure. > > This patch would do the cleanup, meanwhile some points to note: would do -> does > > - Move btrfs_file_extent structure to ordered-data.h > The structure is needed by both btrfs_alloc_ordered_extent() and > can_nocow_extent(), but since btrfs_inode.h would include would include -> includes (it's including at the moment, before this patchset - there's an include of ordered-data.h in btrfs_inode.h) > ordered-data.h, so we need to move the structure to ordered-data.h. > > - Move the special handling of NOCOW/PREALLOC into > btrfs_alloc_ordered_extent() > Previously we have two call sites intentionally forging the numbers, So this forging is the thing you don't like about disk_bytenr not matching the disk_bytenr of a file extent item, but rather that plus some offset. I would leave the rant about it from the changelog the comments in code. Leave that for a patch that specifically addresses that. Otherwise the rest of this patch looks fine. Thanks. > but now with accurate btrfs_file_extent results, it's better to move > the special handling into btrfs_alloc_ordered_extent(), so callers can > just pass the accurate file_extent. > > Signed-off-by: Qu Wenruo <wqu@suse.com> > --- > fs/btrfs/btrfs_inode.h | 17 ----------- > fs/btrfs/inode.c | 64 +++++++---------------------------------- > fs/btrfs/ordered-data.c | 36 +++++++++++++++++++---- > fs/btrfs/ordered-data.h | 22 ++++++++++++-- > 4 files changed, 59 insertions(+), 80 deletions(-) > > diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h > index bea343615ad1..6622485389dc 100644 > --- a/fs/btrfs/btrfs_inode.h > +++ b/fs/btrfs/btrfs_inode.h > @@ -443,23 +443,6 @@ int btrfs_check_sector_csum(struct btrfs_fs_info *fs_info, struct page *page, > u32 pgoff, u8 *csum, const u8 * const csum_expected); > bool btrfs_data_csum_ok(struct btrfs_bio *bbio, struct btrfs_device *dev, > u32 bio_offset, struct bio_vec *bv); > - > -/* > - * A more access-friendly representation of btrfs_file_extent_item. > - * > - * Unused members are excluded. > - */ > -struct btrfs_file_extent { > - u64 disk_bytenr; > - u64 disk_num_bytes; > - > - u64 num_bytes; > - u64 ram_bytes; > - u64 offset; > - > - u8 compression; > -}; > - > noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len, > struct btrfs_file_extent *file_extent, > bool nowait, bool strict); > diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c > index 89f284ae26a4..eec5ecb917d8 100644 > --- a/fs/btrfs/inode.c > +++ b/fs/btrfs/inode.c > @@ -1220,14 +1220,8 @@ static void submit_one_async_extent(struct async_chunk *async_chunk, > } > free_extent_map(em); > > - ordered = btrfs_alloc_ordered_extent(inode, start, /* file_offset */ > - async_extent->ram_size, /* num_bytes */ > - async_extent->ram_size, /* ram_bytes */ > - ins.objectid, /* disk_bytenr */ > - ins.offset, /* disk_num_bytes */ > - 0, /* offset */ > - 1 << BTRFS_ORDERED_COMPRESSED, > - async_extent->compress_type); > + ordered = btrfs_alloc_ordered_extent(inode, start, &file_extent, > + 1 << BTRFS_ORDERED_COMPRESSED); > if (IS_ERR(ordered)) { > btrfs_drop_extent_map_range(inode, start, end, false); > ret = PTR_ERR(ordered); > @@ -1463,10 +1457,8 @@ static noinline int cow_file_range(struct btrfs_inode *inode, > } > free_extent_map(em); > > - ordered = btrfs_alloc_ordered_extent(inode, start, ram_size, > - ram_size, ins.objectid, cur_alloc_size, > - 0, 1 << BTRFS_ORDERED_REGULAR, > - BTRFS_COMPRESS_NONE); > + ordered = btrfs_alloc_ordered_extent(inode, start, &file_extent, > + 1 << BTRFS_ORDERED_REGULAR); > if (IS_ERR(ordered)) { > unlock_extent(&inode->io_tree, start, > start + ram_size - 1, &cached); > @@ -2192,20 +2184,11 @@ static noinline int run_delalloc_nocow(struct btrfs_inode *inode, > free_extent_map(em); > } > > - /* > - * Check btrfs_create_dio_extent() for why we intentionally pass > - * incorrect value for NOCOW/PREALLOC OEs. > - */ > ordered = btrfs_alloc_ordered_extent(inode, cur_offset, > - nocow_args.file_extent.num_bytes, > - nocow_args.file_extent.num_bytes, > - nocow_args.file_extent.disk_bytenr + > - nocow_args.file_extent.offset, > - nocow_args.file_extent.num_bytes, 0, > + &nocow_args.file_extent, > is_prealloc > ? (1 << BTRFS_ORDERED_PREALLOC) > - : (1 << BTRFS_ORDERED_NOCOW), > - BTRFS_COMPRESS_NONE); > + : (1 << BTRFS_ORDERED_NOCOW)); > btrfs_dec_nocow_writers(nocow_bg); > if (IS_ERR(ordered)) { > if (is_prealloc) { > @@ -7020,33 +7003,9 @@ static struct extent_map *btrfs_create_dio_extent(struct btrfs_inode *inode, > goto out; > } > > - /* > - * NOTE: I know the numbers are totally wrong for NOCOW/PREALLOC, > - * but it doesn't cause problem at least for now. > - * > - * For regular writes, we would have file_extent->offset as 0, > - * thus we really only need disk_bytenr, every other length > - * (disk_num_bytes/ram_bytes) would match @len and fe->num_bytes. > - * The current numbers are totally fine. > - * > - * For NOCOW, we don't really care about the numbers except @file_pos > - * and @num_bytes, as we won't insert a file extent item at all. > - * > - * For PREALLOC, we do not use ordered extent's member, but > - * btrfs_mark_extent_written() would handle everything. > - * > - * So here we intentionally go with pseudo numbers for the NOCOW/PREALLOC > - * OEs, or btrfs_extract_ordered_extent() would need a completely new > - * routine to handle NOCOW/PREALLOC splits, meanwhile result nothing > - * different. > - */ > - ordered = btrfs_alloc_ordered_extent(inode, start, len, len, > - file_extent->disk_bytenr + > - file_extent->offset, > - len, 0, > + ordered = btrfs_alloc_ordered_extent(inode, start, file_extent, > (1 << type) | > - (1 << BTRFS_ORDERED_DIRECT), > - BTRFS_COMPRESS_NONE); > + (1 << BTRFS_ORDERED_DIRECT)); > if (IS_ERR(ordered)) { > if (em) { > free_extent_map(em); > @@ -10377,12 +10336,9 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from, > } > free_extent_map(em); > > - ordered = btrfs_alloc_ordered_extent(inode, start, num_bytes, ram_bytes, > - ins.objectid, ins.offset, > - encoded->unencoded_offset, > + ordered = btrfs_alloc_ordered_extent(inode, start, &file_extent, > (1 << BTRFS_ORDERED_ENCODED) | > - (1 << BTRFS_ORDERED_COMPRESSED), > - compression); > + (1 << BTRFS_ORDERED_COMPRESSED)); > if (IS_ERR(ordered)) { > btrfs_drop_extent_map_range(inode, start, end, false); > ret = PTR_ERR(ordered); > diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c > index c5bdd674f55c..371a85250d6a 100644 > --- a/fs/btrfs/ordered-data.c > +++ b/fs/btrfs/ordered-data.c > @@ -263,17 +263,41 @@ static void insert_ordered_extent(struct btrfs_ordered_extent *entry) > */ > struct btrfs_ordered_extent *btrfs_alloc_ordered_extent( > struct btrfs_inode *inode, u64 file_offset, > - u64 num_bytes, u64 ram_bytes, u64 disk_bytenr, > - u64 disk_num_bytes, u64 offset, unsigned long flags, > - int compress_type) > + struct btrfs_file_extent *file_extent, > + unsigned long flags) > { > struct btrfs_ordered_extent *entry; > > ASSERT((flags & ~BTRFS_ORDERED_TYPE_FLAGS) == 0); > > - entry = alloc_ordered_extent(inode, file_offset, num_bytes, ram_bytes, > - disk_bytenr, disk_num_bytes, offset, flags, > - compress_type); > + /* > + * NOTE: I know the numbers are totally wrong for NOCOW/PREALLOC, > + * but it doesn't cause problem at least for now. > + * > + * For NOCOW, we don't really care about the numbers except @file_pos > + * and @num_bytes, as we won't insert a file extent item at all. > + * > + * For PREALLOC, we do not use ordered extent's member, but > + * btrfs_mark_extent_written() would handle everything. > + * > + * So here we intentionally go with pseudo numbers for the NOCOW/PREALLOC > + * OEs, or btrfs_extract_ordered_extent() would need a completely new > + * routine to handle NOCOW/PREALLOC splits, meanwhile result nothing > + * different. > + */ > + if (flags & ((1 << BTRFS_ORDERED_NOCOW) | (1 << BTRFS_ORDERED_PREALLOC))) > + entry = alloc_ordered_extent(inode, file_offset, > + file_extent->num_bytes, file_extent->num_bytes, > + file_extent->disk_bytenr + file_extent->offset, > + file_extent->num_bytes, 0, flags, > + file_extent->compression); > + else > + entry = alloc_ordered_extent(inode, file_offset, > + file_extent->num_bytes, file_extent->ram_bytes, > + file_extent->disk_bytenr, > + file_extent->disk_num_bytes, > + file_extent->offset, flags, > + file_extent->compression); > if (!IS_ERR(entry)) > insert_ordered_extent(entry); > return entry; > diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h > index b6f6c6b91732..5bbec06fbc8d 100644 > --- a/fs/btrfs/ordered-data.h > +++ b/fs/btrfs/ordered-data.h > @@ -171,11 +171,27 @@ void btrfs_mark_ordered_io_finished(struct btrfs_inode *inode, > bool btrfs_dec_test_ordered_pending(struct btrfs_inode *inode, > struct btrfs_ordered_extent **cached, > u64 file_offset, u64 io_size); > + > +/* > + * A more access-friendly representation of btrfs_file_extent_item. > + * > + * Unused members are excluded. > + */ > +struct btrfs_file_extent { > + u64 disk_bytenr; > + u64 disk_num_bytes; > + > + u64 num_bytes; > + u64 ram_bytes; > + u64 offset; > + > + u8 compression; > +}; > + > struct btrfs_ordered_extent *btrfs_alloc_ordered_extent( > struct btrfs_inode *inode, u64 file_offset, > - u64 num_bytes, u64 ram_bytes, u64 disk_bytenr, > - u64 disk_num_bytes, u64 offset, unsigned long flags, > - int compress_type); > + struct btrfs_file_extent *file_extent, > + unsigned long flags); > void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry, > struct btrfs_ordered_sum *sum); > struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct btrfs_inode *inode, > -- > 2.45.0 > >
diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index bea343615ad1..6622485389dc 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h @@ -443,23 +443,6 @@ int btrfs_check_sector_csum(struct btrfs_fs_info *fs_info, struct page *page, u32 pgoff, u8 *csum, const u8 * const csum_expected); bool btrfs_data_csum_ok(struct btrfs_bio *bbio, struct btrfs_device *dev, u32 bio_offset, struct bio_vec *bv); - -/* - * A more access-friendly representation of btrfs_file_extent_item. - * - * Unused members are excluded. - */ -struct btrfs_file_extent { - u64 disk_bytenr; - u64 disk_num_bytes; - - u64 num_bytes; - u64 ram_bytes; - u64 offset; - - u8 compression; -}; - noinline int can_nocow_extent(struct inode *inode, u64 offset, u64 *len, struct btrfs_file_extent *file_extent, bool nowait, bool strict); diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 89f284ae26a4..eec5ecb917d8 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1220,14 +1220,8 @@ static void submit_one_async_extent(struct async_chunk *async_chunk, } free_extent_map(em); - ordered = btrfs_alloc_ordered_extent(inode, start, /* file_offset */ - async_extent->ram_size, /* num_bytes */ - async_extent->ram_size, /* ram_bytes */ - ins.objectid, /* disk_bytenr */ - ins.offset, /* disk_num_bytes */ - 0, /* offset */ - 1 << BTRFS_ORDERED_COMPRESSED, - async_extent->compress_type); + ordered = btrfs_alloc_ordered_extent(inode, start, &file_extent, + 1 << BTRFS_ORDERED_COMPRESSED); if (IS_ERR(ordered)) { btrfs_drop_extent_map_range(inode, start, end, false); ret = PTR_ERR(ordered); @@ -1463,10 +1457,8 @@ static noinline int cow_file_range(struct btrfs_inode *inode, } free_extent_map(em); - ordered = btrfs_alloc_ordered_extent(inode, start, ram_size, - ram_size, ins.objectid, cur_alloc_size, - 0, 1 << BTRFS_ORDERED_REGULAR, - BTRFS_COMPRESS_NONE); + ordered = btrfs_alloc_ordered_extent(inode, start, &file_extent, + 1 << BTRFS_ORDERED_REGULAR); if (IS_ERR(ordered)) { unlock_extent(&inode->io_tree, start, start + ram_size - 1, &cached); @@ -2192,20 +2184,11 @@ static noinline int run_delalloc_nocow(struct btrfs_inode *inode, free_extent_map(em); } - /* - * Check btrfs_create_dio_extent() for why we intentionally pass - * incorrect value for NOCOW/PREALLOC OEs. - */ ordered = btrfs_alloc_ordered_extent(inode, cur_offset, - nocow_args.file_extent.num_bytes, - nocow_args.file_extent.num_bytes, - nocow_args.file_extent.disk_bytenr + - nocow_args.file_extent.offset, - nocow_args.file_extent.num_bytes, 0, + &nocow_args.file_extent, is_prealloc ? (1 << BTRFS_ORDERED_PREALLOC) - : (1 << BTRFS_ORDERED_NOCOW), - BTRFS_COMPRESS_NONE); + : (1 << BTRFS_ORDERED_NOCOW)); btrfs_dec_nocow_writers(nocow_bg); if (IS_ERR(ordered)) { if (is_prealloc) { @@ -7020,33 +7003,9 @@ static struct extent_map *btrfs_create_dio_extent(struct btrfs_inode *inode, goto out; } - /* - * NOTE: I know the numbers are totally wrong for NOCOW/PREALLOC, - * but it doesn't cause problem at least for now. - * - * For regular writes, we would have file_extent->offset as 0, - * thus we really only need disk_bytenr, every other length - * (disk_num_bytes/ram_bytes) would match @len and fe->num_bytes. - * The current numbers are totally fine. - * - * For NOCOW, we don't really care about the numbers except @file_pos - * and @num_bytes, as we won't insert a file extent item at all. - * - * For PREALLOC, we do not use ordered extent's member, but - * btrfs_mark_extent_written() would handle everything. - * - * So here we intentionally go with pseudo numbers for the NOCOW/PREALLOC - * OEs, or btrfs_extract_ordered_extent() would need a completely new - * routine to handle NOCOW/PREALLOC splits, meanwhile result nothing - * different. - */ - ordered = btrfs_alloc_ordered_extent(inode, start, len, len, - file_extent->disk_bytenr + - file_extent->offset, - len, 0, + ordered = btrfs_alloc_ordered_extent(inode, start, file_extent, (1 << type) | - (1 << BTRFS_ORDERED_DIRECT), - BTRFS_COMPRESS_NONE); + (1 << BTRFS_ORDERED_DIRECT)); if (IS_ERR(ordered)) { if (em) { free_extent_map(em); @@ -10377,12 +10336,9 @@ ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from, } free_extent_map(em); - ordered = btrfs_alloc_ordered_extent(inode, start, num_bytes, ram_bytes, - ins.objectid, ins.offset, - encoded->unencoded_offset, + ordered = btrfs_alloc_ordered_extent(inode, start, &file_extent, (1 << BTRFS_ORDERED_ENCODED) | - (1 << BTRFS_ORDERED_COMPRESSED), - compression); + (1 << BTRFS_ORDERED_COMPRESSED)); if (IS_ERR(ordered)) { btrfs_drop_extent_map_range(inode, start, end, false); ret = PTR_ERR(ordered); diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c index c5bdd674f55c..371a85250d6a 100644 --- a/fs/btrfs/ordered-data.c +++ b/fs/btrfs/ordered-data.c @@ -263,17 +263,41 @@ static void insert_ordered_extent(struct btrfs_ordered_extent *entry) */ struct btrfs_ordered_extent *btrfs_alloc_ordered_extent( struct btrfs_inode *inode, u64 file_offset, - u64 num_bytes, u64 ram_bytes, u64 disk_bytenr, - u64 disk_num_bytes, u64 offset, unsigned long flags, - int compress_type) + struct btrfs_file_extent *file_extent, + unsigned long flags) { struct btrfs_ordered_extent *entry; ASSERT((flags & ~BTRFS_ORDERED_TYPE_FLAGS) == 0); - entry = alloc_ordered_extent(inode, file_offset, num_bytes, ram_bytes, - disk_bytenr, disk_num_bytes, offset, flags, - compress_type); + /* + * NOTE: I know the numbers are totally wrong for NOCOW/PREALLOC, + * but it doesn't cause problem at least for now. + * + * For NOCOW, we don't really care about the numbers except @file_pos + * and @num_bytes, as we won't insert a file extent item at all. + * + * For PREALLOC, we do not use ordered extent's member, but + * btrfs_mark_extent_written() would handle everything. + * + * So here we intentionally go with pseudo numbers for the NOCOW/PREALLOC + * OEs, or btrfs_extract_ordered_extent() would need a completely new + * routine to handle NOCOW/PREALLOC splits, meanwhile result nothing + * different. + */ + if (flags & ((1 << BTRFS_ORDERED_NOCOW) | (1 << BTRFS_ORDERED_PREALLOC))) + entry = alloc_ordered_extent(inode, file_offset, + file_extent->num_bytes, file_extent->num_bytes, + file_extent->disk_bytenr + file_extent->offset, + file_extent->num_bytes, 0, flags, + file_extent->compression); + else + entry = alloc_ordered_extent(inode, file_offset, + file_extent->num_bytes, file_extent->ram_bytes, + file_extent->disk_bytenr, + file_extent->disk_num_bytes, + file_extent->offset, flags, + file_extent->compression); if (!IS_ERR(entry)) insert_ordered_extent(entry); return entry; diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h index b6f6c6b91732..5bbec06fbc8d 100644 --- a/fs/btrfs/ordered-data.h +++ b/fs/btrfs/ordered-data.h @@ -171,11 +171,27 @@ void btrfs_mark_ordered_io_finished(struct btrfs_inode *inode, bool btrfs_dec_test_ordered_pending(struct btrfs_inode *inode, struct btrfs_ordered_extent **cached, u64 file_offset, u64 io_size); + +/* + * A more access-friendly representation of btrfs_file_extent_item. + * + * Unused members are excluded. + */ +struct btrfs_file_extent { + u64 disk_bytenr; + u64 disk_num_bytes; + + u64 num_bytes; + u64 ram_bytes; + u64 offset; + + u8 compression; +}; + struct btrfs_ordered_extent *btrfs_alloc_ordered_extent( struct btrfs_inode *inode, u64 file_offset, - u64 num_bytes, u64 ram_bytes, u64 disk_bytenr, - u64 disk_num_bytes, u64 offset, unsigned long flags, - int compress_type); + struct btrfs_file_extent *file_extent, + unsigned long flags); void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry, struct btrfs_ordered_sum *sum); struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct btrfs_inode *inode,
All parameters after @filepos of btrfs_alloc_ordered_extent() can be replaced with btrfs_file_extent structure. This patch would do the cleanup, meanwhile some points to note: - Move btrfs_file_extent structure to ordered-data.h The structure is needed by both btrfs_alloc_ordered_extent() and can_nocow_extent(), but since btrfs_inode.h would include ordered-data.h, so we need to move the structure to ordered-data.h. - Move the special handling of NOCOW/PREALLOC into btrfs_alloc_ordered_extent() Previously we have two call sites intentionally forging the numbers, but now with accurate btrfs_file_extent results, it's better to move the special handling into btrfs_alloc_ordered_extent(), so callers can just pass the accurate file_extent. Signed-off-by: Qu Wenruo <wqu@suse.com> --- fs/btrfs/btrfs_inode.h | 17 ----------- fs/btrfs/inode.c | 64 +++++++---------------------------------- fs/btrfs/ordered-data.c | 36 +++++++++++++++++++---- fs/btrfs/ordered-data.h | 22 ++++++++++++-- 4 files changed, 59 insertions(+), 80 deletions(-)