fix per-block age-based extent_cache
Jaegeuk Kim
maintainercover fix per-block age-based extent_cache
Clean up and one bug fix.
Jaegeuk Kim (3):
f2fs: initialize extent_cache parameter
f2fs: don't mix to use union values in extent_info
f2fs: should use a temp extent_info for lookup
fs/f2fs/data.c | 2 +- fs/f2fs/extent_cache.c | 31 ++++++++++++++++--------------- fs/f2fs/file.c | 2 +- fs/f2fs/segment.c | 2 +- 4 files changed, 19 insertions(+), 18 deletions(-)
Signature · 1 line
2.39.0.314.g84b9a713c41-goog
Jaegeuk Kim
maintainerPATCH 1/3 f2fs: initialize extent_cache parameter
This can avoid confusing tracepoint values.
--- fs/f2fs/data.c | 2 +- fs/f2fs/extent_cache.c | 2 +- fs/f2fs/file.c | 2 +- fs/f2fs/segment.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
fs/f2fs/data.c +1 -1
@@ -2191,7 +2191,7 @@ int f2fs_read_multi_pages(struct compress_ctx *cc, struct bio **bio_ret,sector_t last_block_in_file;const unsigned blocksize =blks_to_bytes (inode,1 );struct decompress_io_ctx *dic =NULL ; -struct extent_info ei = {0 , }; +struct extent_info ei = {};bool from_dnode = true;int i;int ret =0 ;
fs/f2fs/extent_cache.c +1 -1
@@ -938,7 +938,7 @@ static int __get_new_block_age(struct inode *inode, struct extent_info *ei)static void __update_extent_cache (struct dnode_of_data *dn,enum extent_type type) { -struct extent_info ei; +struct extent_info ei = {};if (!__may_extent_tree (dn->inode, type))return ;
fs/f2fs/file.c +1 -1
@@ -2560,7 +2560,7 @@ static int f2fs_defragment_range(struct f2fs_sb_info *sbi,struct f2fs_map_blocks map = { .m_next_extent =NULL , .m_seg_type =NO_CHECK_TYPE , .m_may_create = false }; -struct extent_info ei = {0 , }; +struct extent_info ei = {};pgoff_t pg_start, pg_end, next_pgofs;unsigned int blk_per_seg = sbi->blocks_per_seg;unsigned int total =0 , sec_num;
fs/f2fs/segment.c +1 -1
@@ -3159,7 +3159,7 @@ static int __get_segment_type_4(struct f2fs_io_info *fio)static int __get_age_segment_type (struct inode *inode,pgoff_t pgofs) {struct f2fs_sb_info *sbi =F2FS_I_SB (inode); -struct extent_info ei; +struct extent_info ei = {};if (f2fs_lookup_age_extent_cache (inode, pgofs, &ei)) {if (!ei.age)
Signature · 8 lines
2.39.0.314.g84b9a713c41-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerPATCH 2/3 f2fs: don't mix to use union values in extent_info
In reply to Jaegeuk KimLet's explicitly use the defined values in block_age case only.
--- fs/f2fs/extent_cache.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
fs/f2fs/extent_cache.c +8 -8
@@ -881,7 +881,8 @@ static unsigned long long __calculate_block_age(unsigned long long new, }/* This returns a new age and allocated blocks in ei */ -static int __get_new_block_age (struct inode *inode,struct extent_info *ei) +static int __get_new_block_age (struct inode *inode,struct extent_info *ei, +block_t blkaddr) {struct f2fs_sb_info *sbi =F2FS_I_SB (inode);loff_t f_size =i_size_read (inode);
@@ -894,7 +895,7 @@ static int __get_new_block_age(struct inode *inode, struct extent_info *ei)* block here. */ if ((f_size >>PAGE_SHIFT ) == ei->fofs && f_size & (PAGE_SIZE -1 ) && - ei->blk ==NEW_ADDR ) + blkaddr ==NEW_ADDR )return -EINVAL ;if (__lookup_extent_tree (inode, ei->fofs, ei,EX_BLOCK_AGE )) {
@@ -915,14 +916,14 @@ static int __get_new_block_age(struct inode *inode, struct extent_info *ei)return 0 ; } -f2fs_bug_on (sbi, ei->blk ==NULL_ADDR ); +f2fs_bug_on (sbi, blkaddr ==NULL_ADDR );/* the data block was allocated for the first time */ -if (ei->blk ==NEW_ADDR ) +if (blkaddr ==NEW_ADDR ) goto out; -if (__is_valid_data_blkaddr (ei->blk) && - !f2fs_is_valid_blkaddr (sbi, ei->blk,DATA_GENERIC_ENHANCE )) { +if (__is_valid_data_blkaddr (blkaddr) && + !f2fs_is_valid_blkaddr (sbi, blkaddr,DATA_GENERIC_ENHANCE )) {f2fs_bug_on (sbi,1 );return -EINVAL ; }
@@ -953,8 +954,7 @@ static void __update_extent_cache(struct dnode_of_data *dn, enum extent_type typelse ei.blk = dn->data_blkaddr; }else if (type ==EX_BLOCK_AGE ) { - ei.blk = dn->data_blkaddr; -if (__get_new_block_age (dn->inode, &ei)) +if (__get_new_block_age (dn->inode, &ei, dn->data_blkaddr))return ; }__update_extent_tree_range (dn->inode, &ei, type);
Signature · 8 lines
2.39.0.314.g84b9a713c41-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerPATCH 3/3 f2fs: should use a temp extent_info for lookup
In reply to Jaegeuk KimOtherwise, __lookup_extent_tree() will override the given extent_info which will be used by caller.
--- fs/f2fs/extent_cache.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
fs/f2fs/extent_cache.c +7 -6
@@ -888,6 +888,7 @@ static int __get_new_block_age(struct inode *inode, struct extent_info *ei,loff_t f_size =i_size_read (inode);unsigned long long cur_blocks =atomic64_read (&sbi->allocated_data_blocks); +struct extent_info tei = *ei;/* only fofs and len are valid */ /* * When I/O is not aligned to a PAGE_SIZE, update will happen to the last
@@ -898,17 +899,17 @@ static int __get_new_block_age(struct inode *inode, struct extent_info *ei, blkaddr == NEW_ADDR)return -EINVAL ; -if (__lookup_extent_tree (inode, ei->fofs, ei,EX_BLOCK_AGE )) { +if (__lookup_extent_tree (inode, ei->fofs, &tei,EX_BLOCK_AGE )) {unsigned long long cur_age; -if (cur_blocks >= ei->last_blocks) - cur_age = cur_blocks - ei->last_blocks; +if (cur_blocks >= tei.last_blocks) + cur_age = cur_blocks - tei.last_blocks;else /* allocated_data_blocks overflow */ - cur_age =ULLONG_MAX - ei->last_blocks + cur_blocks; + cur_age =ULLONG_MAX - tei.last_blocks + cur_blocks; -if (ei->age) - ei->age =__calculate_block_age (cur_age, ei->age); +if (tei.age) + ei->age =__calculate_block_age (cur_age, tei.age);else ei->age = cur_age; ei->last_blocks = cur_blocks;
Signature · 8 lines
2.39.0.314.g84b9a713c41-goog _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
This series was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This series was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 8 lines · On Fri, 16 Dec 2022 16:46:56 -0800 you wrote:
Clean up and one bug fix.
Jaegeuk Kim (3):
f2fs: initializeextent_cacheparameter
f2fs: don't mix to use union values inextent_info
f2fs: should use a tempextent_infofor lookup[...]
Here is the summary with links:
- [f2fs-dev,1/3] f2fs: initialize extent_cache parameter
https://git.kernel.org/jaegeux/f2fs/c/fe59109ae5c0 - [f2fs-dev,2/3] f2fs: don't mix to use union values in extent_info https://git.kernel.org/jaegeux/f2fs/c/ed2724765e58 - [f2fs-dev,3/3] f2fs: should use a temp extent_info for lookup https://git.kernel.org/jaegeux/f2fs/c/22a341b43036
You are awesome, thank you!
Signature · 10 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel