Merge extent_page_data and bio_ctrl
David Sterba
maintainercover Merge extent_page_data and bio_ctrl
The extent_page_data structure has shrunk over time and does not make much sense to have it separately from bio_ctrl.
David Sterba (2):
btrfs: switch extent_page_data bit fields to bools
btrfs: merge struct extent_page_data to btrfs_bio_ctrl
fs/btrfs/extent_io.c | 121 +++++++++++++++++++++---------------------- 1 file changed, 58 insertions(+), 63 deletions(-)
Signature · 1 line
2.37.3
David Sterba
maintainerPATCH 1/2 btrfs: switch extent_page_data bit fields to bools
The semantics of the two members is a boolean, so change the type accordingly. We have space in extent_page_data due to alignment there's no change in size.
--- fs/btrfs/extent_io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/btrfs/extent_io.c +2 -2
@@ -105,10 +105,10 @@ struct extent_page_data {/* tells writepage not to lock the state bits for this range * it still does the unlocking */ - unsigned int extent_locked:1; +bool extent_locked;/* tells the submit_bio code to use REQ_SYNC */ - unsigned int sync_io:1; +bool sync_io; };static void submit_one_bio (struct btrfs_bio_ctrl *bio_ctrl)
Signature · 1 line
2.37.3
David Sterba
maintainerPATCH 2/2 btrfs: merge struct extent_page_data to btrfs_bio_ctrl
In reply to David SterbaThe two structures appear on the same call paths, btrfs_bio_ctrl is embedded in extent_page_data and we pass bio_ctrl to some functions. After merging there are fewer indirections and we have only one control structure. The packing remains same.
The btrfs_bio_ctrl was selected as the target structure as the operation is closer to bio processing.
Structure layout:
struct btrfs_bio_ctrl {
struct bio * bio; /* 0 8 */
int mirror_num; /* 8 4 */
enum btrfs_compression_type compress_type; /* 12 4 */
u32 len_to_stripe_boundary; /* 16 4 */
u32 len_to_oe_boundary; /* 20 4 */
btrfs_bio_end_io_t end_io_func; /* 24 8 */
bool extent_locked; /* 32 1 */
bool sync_io; /* 33 1 */ /* size: 40, cachelines: 1, members: 8 */
/* padding: 6 */
/* last cacheline: 40 bytes */
};--- fs/btrfs/extent_io.c | 117 +++++++++++++++++++++---------------------- 1 file changed, 56 insertions(+), 61 deletions(-)
fs/btrfs/extent_io.c +56 -61
@@ -98,16 +98,14 @@ struct btrfs_bio_ctrl {u32 len_to_stripe_boundary;u32 len_to_oe_boundary;btrfs_bio_end_io_t end_io_func; -}; -struct extent_page_data { -struct btrfs_bio_ctrl bio_ctrl; -/* tells writepage not to lock the state bits for this range -* it still does the unlocking +/* +* Tell writepage not to lock the state bits for this range, it still +* does the unlocking. */ bool extent_locked; -/* tells the submit_bio code to use REQ_SYNC */ +/* Tell the submit_bio code to use REQ_SYNC */ bool sync_io; };
@@ -144,11 +142,11 @@ static void submit_one_bio(struct btrfs_bio_ctrl *bio_ctrl) }/* -* Submit or fail the current bio in an extent_page_data structure. +* Submit or fail the current bio in the bio_ctrl structure. */ -static void submit_write_bio (struct extent_page_data *epd,int ret) +static void submit_write_bio (struct btrfs_bio_ctrl *bio_ctrl,int ret) { -struct bio *bio = epd->bio_ctrl.bio; +struct bio *bio = bio_ctrl->bio;if (!bio)return ;
@@ -157,9 +155,9 @@ static void submit_write_bio(struct extent_page_data *epd, int ret)ASSERT (ret <0 );btrfs_bio_end_io (btrfs_bio (bio),errno_to_blk_status (ret));/* The bio is owned by the end_io handler now */ - epd->bio_ctrl.bio =NULL ; + bio_ctrl->bio =NULL ; }else { -submit_one_bio (&epd->bio_ctrl); +submit_one_bio (bio_ctrl); } }
@@ -2067,7 +2065,7 @@ static void find_next_dirty_byte(struct btrfs_fs_info *fs_info, static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode,struct page *page,struct writeback_control *wbc, -struct extent_page_data *epd, +struct btrfs_bio_ctrl *bio_ctrl,loff_t i_size,int *nr_ret) {
@@ -2099,7 +2097,7 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode,*/ wbc->nr_to_write--; - epd->bio_ctrl.end_io_func = end_bio_extent_writepage; + bio_ctrl->end_io_func = end_bio_extent_writepage;while (cur <= end) {u64 disk_bytenr;u64 em_end;
@@ -2193,7 +2191,7 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode,btrfs_page_clear_dirty (fs_info, page, cur, iosize); ret =submit_extent_page (op | write_flags, wbc, - &epd->bio_ctrl, disk_bytenr, + bio_ctrl, disk_bytenr, page, iosize, cur -page_offset (page),0 , false);
@@ -2233,7 +2231,7 @@ static noinline_for_stack int __extent_writepage_io(struct btrfs_inode *inode,* Return <0 for error. */ static int __extent_writepage (struct page *page,struct writeback_control *wbc, -struct extent_page_data *epd) +struct btrfs_bio_ctrl *bio_ctrl) {struct folio *folio =page_folio (page);struct inode *inode = page->mapping->host;
@@ -2270,7 +2268,7 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc, goto done; } -if (!epd->extent_locked) { +if (!bio_ctrl->extent_locked) { ret =writepage_delalloc (BTRFS_I (inode), page, wbc);if (ret ==1 )return 0 ;
@@ -2278,7 +2276,7 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc, goto done; } - ret =__extent_writepage_io (BTRFS_I (inode), page, wbc, epd, i_size, + ret =__extent_writepage_io (BTRFS_I (inode), page, wbc, bio_ctrl, i_size, &nr);if (ret ==1 )return 0 ;
@@ -2322,9 +2320,9 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,*/ if (PageError (page))end_extent_writepage (page, ret, page_start, page_end); -if (epd->extent_locked) { +if (bio_ctrl->extent_locked) {/* -* If epd->extent_locked, it's from extent_write_locked_range(), +* If bio_ctrl->extent_locked, it's from extent_write_locked_range(), * the page can either be locked by lock_page() or * process_one_page(). * Let btrfs_page_unlock_writer() handle both cases.
@@ -2363,7 +2361,7 @@ static void end_extent_buffer_writeback(struct extent_buffer *eb)* Return <0 if something went wrong, no page is locked. */ static noinline_for_stack int lock_extent_buffer_for_io(struct extent_buffer *eb, -struct extent_page_data *epd) +struct btrfs_bio_ctrl *bio_ctrl) {struct btrfs_fs_info *fs_info = eb->fs_info;int i, num_pages;
@@ -2371,17 +2369,17 @@ static noinline_for_stack int lock_extent_buffer_for_io(struct extent_buffer *ebint ret =0 ;if (!btrfs_try_tree_write_lock (eb)) { -submit_write_bio (epd,0 ); +submit_write_bio (bio_ctrl,0 ); flush =1 ;btrfs_tree_lock (eb); }if (test_bit (EXTENT_BUFFER_WRITEBACK , &eb->bflags)) {btrfs_tree_unlock (eb); -if (!epd->sync_io) +if (!bio_ctrl->sync_io)return 0 ;if (!flush) { -submit_write_bio (epd,0 ); +submit_write_bio (bio_ctrl,0 ); flush =1 ; }while (1 ) {
@@ -2428,7 +2426,7 @@ static noinline_for_stack int lock_extent_buffer_for_io(struct extent_buffer *ebif (!trylock_page (p)) {if (!flush) { -submit_write_bio (epd,0 ); +submit_write_bio (bio_ctrl,0 ); flush =1 ; }lock_page (p);
@@ -2668,7 +2666,7 @@ static void prepare_eb_write(struct extent_buffer *eb)*/ static int write_one_subpage_eb (struct extent_buffer *eb,struct writeback_control *wbc, -struct extent_page_data *epd) +struct btrfs_bio_ctrl *bio_ctrl) {struct btrfs_fs_info *fs_info = eb->fs_info;struct page *page = eb->pages[0 ];
@@ -2688,10 +2686,10 @@ static int write_one_subpage_eb(struct extent_buffer *eb,if (no_dirty_ebs)clear_page_dirty_for_io (page); - epd->bio_ctrl.end_io_func = end_bio_subpage_eb_writepage; + bio_ctrl->end_io_func = end_bio_subpage_eb_writepage; ret =submit_extent_page (REQ_OP_WRITE | write_flags, wbc, - &epd->bio_ctrl, eb->start, page, eb->len, + bio_ctrl, eb->start, page, eb->len, eb->start -page_offset (page),0 , false);if (ret) {btrfs_subpage_clear_writeback (fs_info, page, eb->start, eb->len);
@@ -2714,7 +2712,7 @@ static int write_one_subpage_eb(struct extent_buffer *eb, static noinline_for_stack int write_one_eb(struct extent_buffer *eb,struct writeback_control *wbc, -struct extent_page_data *epd) +struct btrfs_bio_ctrl *bio_ctrl) {u64 disk_bytenr = eb->start;int i, num_pages;
@@ -2723,7 +2721,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb,prepare_eb_write (eb); - epd->bio_ctrl.end_io_func = end_bio_extent_buffer_writepage; + bio_ctrl->end_io_func = end_bio_extent_buffer_writepage; num_pages =num_extent_pages (eb);for (i =0 ; i < num_pages; i++) {
@@ -2732,7 +2730,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb,clear_page_dirty_for_io (p);set_page_writeback (p); ret =submit_extent_page (REQ_OP_WRITE | write_flags, wbc, - &epd->bio_ctrl, disk_bytenr, p, + bio_ctrl, disk_bytenr, p,PAGE_SIZE ,0 ,0 , false);if (ret) {set_btree_ioerr (p, eb);
@@ -2775,7 +2773,7 @@ static noinline_for_stack int write_one_eb(struct extent_buffer *eb,*/ static int submit_eb_subpage (struct page *page,struct writeback_control *wbc, -struct extent_page_data *epd) +struct btrfs_bio_ctrl *bio_ctrl) {struct btrfs_fs_info *fs_info =btrfs_sb (page->mapping->host->i_sb);int submitted =0 ;
@@ -2828,7 +2826,7 @@ static int submit_eb_subpage(struct page *page,if (!eb)continue ; - ret =lock_extent_buffer_for_io (eb, epd); + ret =lock_extent_buffer_for_io (eb, bio_ctrl);if (ret ==0 ) {free_extent_buffer (eb);continue ;
@@ -2837,7 +2835,7 @@ static int submit_eb_subpage(struct page *page,free_extent_buffer (eb); goto cleanup; } - ret =write_one_subpage_eb (eb, wbc, epd); + ret =write_one_subpage_eb (eb, wbc, bio_ctrl);free_extent_buffer (eb);if (ret <0 ) goto cleanup;
@@ -2847,7 +2845,7 @@ static int submit_eb_subpage(struct page *page, cleanup:/* We hit error, end bio for the submitted extent buffers */ -submit_write_bio (epd, ret); +submit_write_bio (bio_ctrl, ret);return ret; }
@@ -2872,7 +2870,7 @@ static int submit_eb_subpage(struct page *page,* Return <0 for fatal error. */ static int submit_eb_page (struct page *page,struct writeback_control *wbc, -struct extent_page_data *epd, +struct btrfs_bio_ctrl *bio_ctrl,struct extent_buffer **eb_context) {struct address_space *mapping = page->mapping;
@@ -2884,7 +2882,7 @@ static int submit_eb_page(struct page *page, struct writeback_control *wbc,return 0 ;if (btrfs_sb (page->mapping->host->i_sb)->nodesize <PAGE_SIZE ) -return submit_eb_subpage (page, wbc, epd); +return submit_eb_subpage (page, wbc, bio_ctrl);spin_lock (&mapping->private_lock);if (!PagePrivate (page)) {
@@ -2927,7 +2925,7 @@ static int submit_eb_page(struct page *page, struct writeback_control *wbc, *eb_context = eb; - ret =lock_extent_buffer_for_io (eb, epd); + ret =lock_extent_buffer_for_io (eb, bio_ctrl);if (ret <=0 ) {btrfs_revert_meta_write_pointer (cache, eb);if (cache)
@@ -2942,7 +2940,7 @@ static int submit_eb_page(struct page *page, struct writeback_control *wbc,btrfs_schedule_zone_finish_bg (cache, eb);btrfs_put_block_group (cache); } - ret =write_one_eb (eb, wbc, epd); + ret =write_one_eb (eb, wbc, bio_ctrl);free_extent_buffer (eb);if (ret <0 )return ret;
@@ -2953,10 +2951,9 @@ int btree_write_cache_pages(struct address_space *mapping, struct writeback_control *wbc) {struct extent_buffer *eb_context =NULL ; -struct extent_page_data epd = { - .bio_ctrl = {0 }, +struct btrfs_bio_ctrl bio_ctrl = { .extent_locked =0 , - .sync_io = wbc->sync_mode ==WB_SYNC_ALL , + .sync_io = (wbc->sync_mode ==WB_SYNC_ALL ), };struct btrfs_fs_info *fs_info =BTRFS_I (mapping->host)->root->fs_info;int ret =0 ;
@@ -2999,7 +2996,7 @@ int btree_write_cache_pages(struct address_space *mapping,for (i =0 ; i < nr_pages; i++) {struct page *page = pvec.pages[i]; - ret =submit_eb_page (page, wbc, &epd, &eb_context); + ret =submit_eb_page (page, wbc, &bio_ctrl, &eb_context);if (ret ==0 )continue ;if (ret <0 ) {
@@ -3060,18 +3057,18 @@ int btree_write_cache_pages(struct address_space *mapping, ret =0 ;if (!ret &&BTRFS_FS_ERROR (fs_info)) ret = -EROFS ; -submit_write_bio (&epd, ret); +submit_write_bio (&bio_ctrl, ret);btrfs_zoned_meta_io_unlock (fs_info);return ret; } -/** +/* * Walk the list of dirty pages of the given address space and write all of them. * -* @mapping: address space structure to write -* @wbc: subtract the number of written pages from *@wbc->nr_to_write -* @epd: holds context for the write, namely the bio +* @mapping: address space structure to write +* @wbc: subtract the number of written pages from *@wbc->nr_to_write +* @bio_ctrl: holds context for the write, namely the bio * * If a page is already under I/O, write_cache_pages() skips it, even * if it's dirty. This is desirable behaviour for memory-cleaning writeback,
@@ -3083,7 +3080,7 @@ int btree_write_cache_pages(struct address_space *mapping,*/ static int extent_write_cache_pages (struct address_space *mapping,struct writeback_control *wbc, -struct extent_page_data *epd) +struct btrfs_bio_ctrl *bio_ctrl) {struct inode *inode = mapping->host;int ret =0 ;
@@ -3164,7 +3161,7 @@ static int extent_write_cache_pages(struct address_space *mapping,* tmpfs file mapping */ if (!trylock_page (page)) { -submit_write_bio (epd,0 ); +submit_write_bio (bio_ctrl,0 );lock_page (page); }
@@ -3175,7 +3172,7 @@ static int extent_write_cache_pages(struct address_space *mapping,if (wbc->sync_mode !=WB_SYNC_NONE ) {if (PageWriteback (page)) -submit_write_bio (epd,0 ); +submit_write_bio (bio_ctrl,0 );wait_on_page_writeback (page); }
@@ -3185,7 +3182,7 @@ static int extent_write_cache_pages(struct address_space *mapping,continue ; } - ret =__extent_writepage (page, wbc, epd); + ret =__extent_writepage (page, wbc, bio_ctrl);if (ret <0 ) { done =1 ;break ;
@@ -3215,7 +3212,7 @@ static int extent_write_cache_pages(struct address_space *mapping,* page in our current bio, and thus deadlock, so flush the * write bio here. */ -submit_write_bio (epd,0 ); +submit_write_bio (bio_ctrl,0 ); goto retry; }
@@ -3241,8 +3238,7 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end)u64 cur = start;unsigned long nr_pages;const u32 sectorsize =btrfs_sb (inode->i_sb)->sectorsize; -struct extent_page_data epd = { - .bio_ctrl = {0 }, +struct btrfs_bio_ctrl bio_ctrl = { .extent_locked =1 , .sync_io =1 , };
@@ -3273,7 +3269,7 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end)ASSERT (PageLocked (page));ASSERT (PageDirty (page));clear_page_dirty_for_io (page); - ret =__extent_writepage (page, &wbc_writepages, &epd); + ret =__extent_writepage (page, &wbc_writepages, &bio_ctrl);ASSERT (ret <=0 );if (ret <0 ) { found_error = true;
@@ -3283,7 +3279,7 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end) cur = cur_end +1 ; } -submit_write_bio (&epd, found_error ? ret :0 ); +submit_write_bio (&bio_ctrl, found_error ? ret :0 );wbc_detach_inode (&wbc_writepages);if (found_error)
@@ -3296,10 +3292,9 @@ int extent_writepages(struct address_space *mapping, {struct inode *inode = mapping->host;int ret =0 ; -struct extent_page_data epd = { - .bio_ctrl = {0 }, +struct btrfs_bio_ctrl bio_ctrl = { .extent_locked =0 , - .sync_io = wbc->sync_mode ==WB_SYNC_ALL , + .sync_io = (wbc->sync_mode ==WB_SYNC_ALL ), };/*
@@ -3307,8 +3302,8 @@ int extent_writepages(struct address_space *mapping,* protect the write pointer updates. */ btrfs_zoned_data_reloc_lock (BTRFS_I (inode)); - ret =extent_write_cache_pages (mapping, wbc, &epd); -submit_write_bio (&epd, ret); + ret =extent_write_cache_pages (mapping, wbc, &bio_ctrl); +submit_write_bio (&bio_ctrl, ret);btrfs_zoned_data_reloc_unlock (BTRFS_I (inode));return ret; }
Signature · 1 line
2.37.3