misc f2fs cleanups
Hi all,
a bunch of random cleanups found by code inspection.
Diffstat:
checkpoint.c | 22 ++++----- file.c | 60 +++++++++++--------------- segment.c | 134 +++++++++++++++++++++-------------------------------------- segment.h | 6 -- 4 files changed, 84 insertions(+), 138 deletions(-)
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH 1/8 f2fs: remove __add_sum_entry
This function just assigns a summary entry. This can be done entirely typesafe with an open code struct assignment that relies on array indexing.
--- fs/f2fs/segment.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-)
fs/f2fs/segment.c +2 -21
@@ -2323,19 +2323,6 @@ bool f2fs_is_checkpointed_data(struct f2fs_sb_info *sbi, block_t blkaddr)return is_cp; } -/* -* This function should be resided under the curseg_mutex lock -*/ -static void __add_sum_entry (struct f2fs_sb_info *sbi,int type, -struct f2fs_summary *sum) -{ -struct curseg_info *curseg =CURSEG_I (sbi, type); -void *addr = curseg->sum_blk; - - addr += curseg->next_blkoff *sizeof (struct f2fs_summary ); -memcpy (addr, sum,sizeof (struct f2fs_summary )); -} -/* * Calculate the number of current summary pages for writing */
@@ -3262,13 +3249,7 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,f2fs_wait_discard_bio (sbi, *new_blkaddr); -/* -* __add_sum_entry should be resided under the curseg_mutex -* because, this function updates a summary entry in the -* current summary block. -*/ -__add_sum_entry (sbi, type, sum); - + curseg->sum_blk->entries[curseg->next_blkoff] = *sum;__refresh_next_blkoff (sbi, curseg);stat_inc_block_count (sbi, curseg);
@@ -3571,7 +3552,7 @@ void f2fs_do_replace_block(struct f2fs_sb_info *sbi, struct f2fs_summary *sum, } curseg->next_blkoff =GET_BLKOFF_FROM_SEG0 (sbi, new_blkaddr); -__add_sum_entry (sbi, type, sum); + curseg->sum_blk->entries[curseg->next_blkoff] = *sum;if (!recover_curseg || recover_newaddr) {if (!from_gc)
Signature · 8 lines
2.39.0 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Re: [f2fs-dev] [PATCH 1/8] f2fs: remove __add_sum_entry
Quoted 5 lines · Christoph Hellwig
This function just assigns a summary entry. This can be done entirely typesafe with an open code struct assignment that relies on array indexing.
Signed-off-by Christoph Hellwig <[email protected]>
Thanks,
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Re: [f2fs-dev] [PATCH 1/8] f2fs: remove __add_sum_entry
In reply to Christoph HellwigThis 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 Thu, 19 Jan 2023 07:36:18 +0100 you wrote:
This function just assigns a summary entry. This can be done entirely typesafe with an open code struct assignment that relies on array indexing.
Signed-off-by Christoph Hellwig <[email protected]>--- fs/f2fs/segment.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-)
Here is the summary with links:
- [f2fs-dev,1/8] f2fs: remove __add_sum_entry
https://git.kernel.org/jaegeuk/f2fs/c/2163a691c5f3 - [f2fs-dev,2/8] f2fs: simplify do_checkpoint https://git.kernel.org/jaegeuk/f2fs/c/bc6cc6f92b89 - [f2fs-dev,3/8] f2fs: add a f2fs_curseg_valid_blocks helper https://git.kernel.org/jaegeuk/f2fs/c/0034f8954469 - [f2fs-dev,4/8] f2fs: factor the read/write tracing logic into a helper (no matching commit) - [f2fs-dev,5/8] f2fs: refactor __allocate_new_segment https://git.kernel.org/jaegeuk/f2fs/c/53577f7c5b8b - [f2fs-dev,6/8] f2fs: remove __allocate_new_section https://git.kernel.org/jaegeuk/f2fs/c/b2164fbdb8f8 - [f2fs-dev,7/8] f2fs: refactor next blk selection https://git.kernel.org/jaegeuk/f2fs/c/33234f9705d8 - [f2fs-dev,8/8] f2fs: remove __has_curseg_space https://git.kernel.org/jaegeuk/f2fs/c/b8574d8c47eb
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
PATCH 2/8 f2fs: simplify do_checkpoint
In reply to Christoph HellwigFor each loop add a local curseg_info pointer insted of looking it up for each of the three fields.
--- fs/f2fs/checkpoint.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-)
fs/f2fs/checkpoint.c +10 -12
@@ -1470,20 +1470,18 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc) ckpt->elapsed_time =cpu_to_le64 (get_mtime (sbi, true)); ckpt->free_segment_count =cpu_to_le32 (free_segments (sbi));for (i =0 ; i <NR_CURSEG_NODE_TYPE ; i++) { - ckpt->cur_node_segno[i] = -cpu_to_le32 (curseg_segno (sbi, i +CURSEG_HOT_NODE )); - ckpt->cur_node_blkoff[i] = -cpu_to_le16 (curseg_blkoff (sbi, i +CURSEG_HOT_NODE )); - ckpt->alloc_type[i +CURSEG_HOT_NODE ] = -curseg_alloc_type (sbi, i +CURSEG_HOT_NODE ); +struct curseg_info *curseg =CURSEG_I (sbi, i +CURSEG_HOT_NODE ); + + ckpt->cur_node_segno[i] =cpu_to_le32 (curseg->segno); + ckpt->cur_node_blkoff[i] =cpu_to_le16 (curseg->next_blkoff); + ckpt->alloc_type[i +CURSEG_HOT_NODE ] = curseg->alloc_type; }for (i =0 ; i <NR_CURSEG_DATA_TYPE ; i++) { - ckpt->cur_data_segno[i] = -cpu_to_le32 (curseg_segno (sbi, i +CURSEG_HOT_DATA )); - ckpt->cur_data_blkoff[i] = -cpu_to_le16 (curseg_blkoff (sbi, i +CURSEG_HOT_DATA )); - ckpt->alloc_type[i +CURSEG_HOT_DATA ] = -curseg_alloc_type (sbi, i +CURSEG_HOT_DATA ); +struct curseg_info *curseg =CURSEG_I (sbi, i +CURSEG_HOT_DATA ); + + ckpt->cur_data_segno[i] =cpu_to_le32 (curseg->segno);; + ckpt->cur_data_blkoff[i] =cpu_to_le16 (curseg->next_blkoff); + ckpt->alloc_type[i +CURSEG_HOT_DATA ] = curseg->alloc_type; }/* 2 cp + n data seg summary + orphan inode blocks */
Signature · 8 lines
2.39.0 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Re: [f2fs-dev] [PATCH 2/8] f2fs: simplify do_checkpoint
Quoted 4 lines · Christoph Hellwig
For each loop add a local
curseg_infopointer insted of looking it up for each of the three fields.Signed-off-by Christoph Hellwig <[email protected]>
Thanks,
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH 3/8 f2fs: add a f2fs_curseg_valid_blocks helper
In reply to Christoph HellwigAdd a helper to return the valid blocks on log and SSR segments, and replace the last two uses of curseg_blkoff with it.
--- fs/f2fs/segment.c | 32 +++++++++++++++----------------- fs/f2fs/segment.h | 6 ------ 2 files changed, 15 insertions(+), 23 deletions(-)
fs/f2fs/segment.c +15 -17
@@ -2323,6 +2323,15 @@ bool f2fs_is_checkpointed_data(struct f2fs_sb_info *sbi, block_t blkaddr)return is_cp; } +static unsigned short f2fs_curseg_valid_blocks (struct f2fs_sb_info *sbi,int type) +{ +struct curseg_info *curseg =CURSEG_I (sbi, type); + +if (sbi->ckpt->alloc_type[type] ==SSR ) +return sbi->blocks_per_seg; +return curseg->next_blkoff; +} +/* * Calculate the number of current summary pages for writing */
@@ -2332,15 +2341,11 @@ int f2fs_npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra)int i, sum_in_page;for (i =CURSEG_HOT_DATA ; i <=CURSEG_COLD_DATA ; i++) { -if (sbi->ckpt->alloc_type[i] ==SSR ) - valid_sum_count += sbi->blocks_per_seg; -else { -if (for_ra) - valid_sum_count +=le16_to_cpu ( -F2FS_CKPT (sbi)->cur_data_blkoff[i]); -else - valid_sum_count +=curseg_blkoff (sbi, i); - } +if (sbi->ckpt->alloc_type[i] !=SSR && for_ra) + valid_sum_count += +le16_to_cpu (F2FS_CKPT (sbi)->cur_data_blkoff[i]); +else + valid_sum_count +=f2fs_curseg_valid_blocks (sbi, i); } sum_in_page = (PAGE_SIZE - 2 * SUM_JOURNAL_SIZE -
@@ -3861,15 +3866,8 @@ static void write_compacted_summaries(struct f2fs_sb_info *sbi, block_t blkaddr)/* Step 3: write summary entries */ for (i =CURSEG_HOT_DATA ; i <=CURSEG_COLD_DATA ; i++) { -unsigned short blkoff; - seg_i =CURSEG_I (sbi, i); -if (sbi->ckpt->alloc_type[i] ==SSR ) - blkoff = sbi->blocks_per_seg; -else - blkoff =curseg_blkoff (sbi, i); - -for (j =0 ; j < blkoff; j++) { +for (j =0 ; j <f2fs_curseg_valid_blocks (sbi, i); j++) {if (!page) { page =f2fs_grab_meta_page (sbi, blkaddr++); kaddr = (unsigned char *)page_address (page);
fs/f2fs/segment.h +0 -6
@@ -710,12 +710,6 @@ static inline unsigned char curseg_alloc_type(struct f2fs_sb_info *sbi,return curseg->alloc_type; } -static inline unsigned short curseg_blkoff (struct f2fs_sb_info *sbi,int type) -{ -struct curseg_info *curseg =CURSEG_I (sbi, type); -return curseg->next_blkoff; -} -static inline void check_seg_range (struct f2fs_sb_info *sbi,unsigned int segno) {f2fs_bug_on (sbi, segno >TOTAL_SEGS (sbi) -1 );
Signature · 8 lines
2.39.0 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Re: [f2fs-dev] [PATCH 3/8] f2fs: add a f2fs_curseg_valid_blocks helper
Quoted 4 lines · Christoph Hellwig
Add a helper to return the valid blocks on log and SSR segments, and replace the last two uses of
curseg_blkoffwith it.Signed-off-by Christoph Hellwig <[email protected]>
Thanks,
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH 4/8 f2fs: factor the read/write tracing logic into a helper
In reply to Christoph HellwigFactor the logic to log a path for reads and writs into a helper shared between the read_iter and write_iter methods.
--- fs/f2fs/file.c | 60 +++++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 35 deletions(-)
fs/f2fs/file.c +25 -35
@@ -4340,6 +4340,27 @@ static ssize_t f2fs_dio_read_iter(struct kiocb *iocb, struct iov_iter *to)return ret; } +static void f2fs_trace_rw_file_path (struct kiocb *iocb,size_t count,int rw) +{ +struct inode *inode =file_inode (iocb->ki_filp); +char *buf, *path; + + buf =f2fs_kmalloc (F2FS_I_SB (inode),PATH_MAX ,GFP_KERNEL ); +if (!buf) +return ; + path =dentry_path_raw (file_dentry (iocb->ki_filp), buf,PATH_MAX ); +if (IS_ERR (path)) + goto free_buf; +if (rw ==WRITE ) +trace_f2fs_datawrite_start (inode, iocb->ki_pos, count, + current->pid, path, current->comm); +else +trace_f2fs_dataread_start (inode, iocb->ki_pos, count, + current->pid, path, current->comm); +free_buf: +kfree (buf); +} +static ssize_t f2fs_file_read_iter (struct kiocb *iocb,struct iov_iter *to) {struct inode *inode =file_inode (iocb->ki_filp);
@@ -4349,24 +4370,9 @@ static ssize_t f2fs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)if (!f2fs_is_compress_backend_ready (inode))return -EOPNOTSUPP ; -if (trace_f2fs_dataread_start_enabled ()) { -char *p =f2fs_kmalloc (F2FS_I_SB (inode),PATH_MAX ,GFP_KERNEL ); -char *path; - -if (!p) - goto skip_read_trace; +if (trace_f2fs_dataread_start_enabled ()) +f2fs_trace_rw_file_path (iocb,iov_iter_count (to),READ ); - path =dentry_path_raw (file_dentry (iocb->ki_filp), p,PATH_MAX ); -if (IS_ERR (path)) { -kfree (p); - goto skip_read_trace; - } - -trace_f2fs_dataread_start (inode, pos,iov_iter_count (to), - current->pid, path, current->comm); -kfree (p); - } -skip_read_trace:if (f2fs_should_use_dio (inode, iocb, to)) { ret =f2fs_dio_read_iter (iocb, to); }else {
@@ -4672,24 +4678,8 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)if (preallocated <0 ) { ret = preallocated; }else { -if (trace_f2fs_datawrite_start_enabled ()) { -char *p =f2fs_kmalloc (F2FS_I_SB (inode), -PATH_MAX ,GFP_KERNEL ); -char *path; - -if (!p) - goto skip_write_trace; - path =dentry_path_raw (file_dentry (iocb->ki_filp), - p,PATH_MAX ); -if (IS_ERR (path)) { -kfree (p); - goto skip_write_trace; - } -trace_f2fs_datawrite_start (inode, orig_pos, orig_count, - current->pid, path, current->comm); -kfree (p); - } -skip_write_trace: +f2fs_trace_rw_file_path (iocb, orig_count,WRITE ); +/* Do the actual write. */ ret = dio ? f2fs_dio_write_iter(iocb, from, &may_need_sync) :
Signature · 8 lines
2.39.0 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Chao Yu
maintainerRe: [f2fs-dev] [PATCH 4/8] f2fs: factor the read/write tracing logic into a helper
Quoted 80 lines · Christoph Hellwig
Factor the logic to log a path for reads and writs into a helper shared between the
read_iterandwrite_itermethods.Signed-off-by Christoph Hellwig <[email protected]>--- fs/f2fs/file.c | 60 +++++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 35 deletions(-)fs/f2fs/file.c +23
-26@@ -4340,6 +4340,27 @@ static ssize_t f2fs_dio_read_iter(struct kiocb *iocb, struct iov_iter *to)return ret; } +static void f2fs_trace_rw_file_path (struct kiocb *iocb,size_t count,int rw) +{ +struct inode *inode =file_inode (iocb->ki_filp); +char *buf, *path; + + buf =f2fs_kmalloc (F2FS_I_SB (inode),PATH_MAX ,GFP_KERNEL ); +if (!buf) +return ; + path =dentry_path_raw (file_dentry (iocb->ki_filp), buf,PATH_MAX ); +if (IS_ERR (path)) + goto free_buf; +if (rw ==WRITE ) +trace_f2fs_datawrite_start (inode, iocb->ki_pos, count, + current->pid, path, current->comm); +else +trace_f2fs_dataread_start (inode, iocb->ki_pos, count, + current->pid, path, current->comm); +free_buf: +kfree (buf); +} +static ssize_t f2fs_file_read_iter (struct kiocb *iocb,struct iov_iter *to) {struct inode *inode =file_inode (iocb->ki_filp);@@ -4349,24 +4370,9 @@ static ssize_t f2fs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)if (!f2fs_is_compress_backend_ready (inode))return -EOPNOTSUPP ; -if (trace_f2fs_dataread_start_enabled ()) { -char *p =f2fs_kmalloc (F2FS_I_SB (inode),PATH_MAX ,GFP_KERNEL ); -char *path; - -if (!p) - goto skip_read_trace; +if (trace_f2fs_dataread_start_enabled ()) +f2fs_trace_rw_file_path (iocb,iov_iter_count (to),READ ); - path =dentry_path_raw (file_dentry (iocb->ki_filp), p,PATH_MAX ); -if (IS_ERR (path)) { -kfree (p); - goto skip_read_trace; - } - -trace_f2fs_dataread_start (inode, pos,iov_iter_count (to), - current->pid, path, current->comm); -kfree (p); - } -skip_read_trace:if (f2fs_should_use_dio (inode, iocb, to)) { ret =f2fs_dio_read_iter (iocb, to); }else {@@ -4672,24 +4678,8 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)if (preallocated <0 ) { ret = preallocated; }else { -if (trace_f2fs_datawrite_start_enabled ()) { -char *p =f2fs_kmalloc (F2FS_I_SB (inode), -PATH_MAX ,GFP_KERNEL ); -char *path; - -if (!p) - goto skip_write_trace; - path =dentry_path_raw (file_dentry (iocb->ki_filp), - p,PATH_MAX );
fs/f2fs/file.c static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) · line 4681
Quoted 10 lines
fs/f2fs/file.c +1
-9-if (IS_ERR (path)) { -kfree (p); - goto skip_write_trace; - } -trace_f2fs_datawrite_start (inode, orig_pos, orig_count, - current->pid, path, current->comm); -kfree (p); - } -skip_write_trace: +f2fs_trace_rw_file_path (iocb, orig_count,WRITE );
if (trace_f2fs_datawrite_start_enabled())
f2fs_trace_rw_file_path(..);
Thanks,
fs/f2fs/file.c static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) · line 4685
Quoted 4 lines
fs/f2fs/file.c +1
-0+/* Do the actual write. */ ret = dio ? f2fs_dio_write_iter(iocb, from, &may_need_sync) :
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerRe: [f2fs-dev] [PATCH 4/8] f2fs: factor the read/write tracing logic into a helper
Quoted 90 lines · Chao Yu
Quoted 77 lines · Christoph Hellwig
Factor the logic to log a path for reads and writs into a helper shared between the
read_iterandwrite_itermethods.Signed-off-by Christoph Hellwig <[email protected]>--- fs/f2fs/file.c | 60 +++++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 35 deletions(-)fs/f2fs/file.c +23
-26@@ -4340,6 +4340,27 @@ static ssize_t f2fs_dio_read_iter(struct kiocb *iocb, struct iov_iter *to)return ret; } +static void f2fs_trace_rw_file_path (struct kiocb *iocb,size_t count,int rw) +{ +struct inode *inode =file_inode (iocb->ki_filp); +char *buf, *path; + + buf =f2fs_kmalloc (F2FS_I_SB (inode),PATH_MAX ,GFP_KERNEL ); +if (!buf) +return ; + path =dentry_path_raw (file_dentry (iocb->ki_filp), buf,PATH_MAX ); +if (IS_ERR (path)) + goto free_buf; +if (rw ==WRITE ) +trace_f2fs_datawrite_start (inode, iocb->ki_pos, count, + current->pid, path, current->comm); +else +trace_f2fs_dataread_start (inode, iocb->ki_pos, count, + current->pid, path, current->comm); +free_buf: +kfree (buf); +} +static ssize_t f2fs_file_read_iter (struct kiocb *iocb,struct iov_iter *to) {struct inode *inode =file_inode (iocb->ki_filp);@@ -4349,24 +4370,9 @@ static ssize_t f2fs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)if (!f2fs_is_compress_backend_ready (inode))return -EOPNOTSUPP ; -if (trace_f2fs_dataread_start_enabled ()) { -char *p =f2fs_kmalloc (F2FS_I_SB (inode),PATH_MAX ,GFP_KERNEL ); -char *path; - -if (!p) - goto skip_read_trace; +if (trace_f2fs_dataread_start_enabled ()) +f2fs_trace_rw_file_path (iocb,iov_iter_count (to),READ ); - path =dentry_path_raw (file_dentry (iocb->ki_filp), p,PATH_MAX ); -if (IS_ERR (path)) { -kfree (p); - goto skip_read_trace; - } - -trace_f2fs_dataread_start (inode, pos,iov_iter_count (to), - current->pid, path, current->comm); -kfree (p); - } -skip_read_trace:if (f2fs_should_use_dio (inode, iocb, to)) { ret =f2fs_dio_read_iter (iocb, to); }else {@@ -4672,24 +4678,8 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)if (preallocated <0 ) { ret = preallocated; }else { -if (trace_f2fs_datawrite_start_enabled ()) { -char *p =f2fs_kmalloc (F2FS_I_SB (inode), -PATH_MAX ,GFP_KERNEL ); -char *path; - -if (!p) - goto skip_write_trace; - path =dentry_path_raw (file_dentry (iocb->ki_filp), - p,PATH_MAX );fs/f2fs/file.c static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) · line 4681
Quoted 10 lines
fs/f2fs/file.c +1
-9-if (IS_ERR (path)) { -kfree (p); - goto skip_write_trace; - } -trace_f2fs_datawrite_start (inode, orig_pos, orig_count, - current->pid, path, current->comm); -kfree (p); - } -skip_write_trace: +f2fs_trace_rw_file_path (iocb, orig_count,WRITE );if (
trace_f2fs_datawrite_start_enabled())
Quoted 1 line
f2fs_trace_rw_file_path(..);
I queued the patch with this change in dev-test first.
Thanks,
Quoted 7 lines
Thanks,
Quoted 4 lines
fs/f2fs/file.c +1
-0+/* Do the actual write. */ ret = dio ? f2fs_dio_write_iter(iocb, from, &may_need_sync) :
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH 5/8 f2fs: refactor __allocate_new_segment
In reply to Christoph HellwigSimplify the check whether to allocate a new segment or reuse an open one.
--- fs/f2fs/segment.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
fs/f2fs/segment.c +5 -9
@@ -2897,16 +2897,12 @@ static void __allocate_new_segment(struct f2fs_sb_info *sbi, int type,struct curseg_info *curseg =CURSEG_I (sbi, type);unsigned int old_segno; -if (!curseg->inited) - goto alloc; - -if (force || curseg->next_blkoff || -get_valid_blocks (sbi, curseg->segno, new_sec)) - goto alloc; - -if (!get_ckpt_valid_blocks (sbi, curseg->segno, new_sec)) +if (!force && curseg->inited && + !curseg->next_blkoff && + !get_valid_blocks (sbi, curseg->segno, new_sec) && + !get_ckpt_valid_blocks (sbi, curseg->segno, new_sec))return ; -alloc: + old_segno = curseg->segno;new_curseg (sbi, type, true);stat_inc_seg_type (sbi, curseg);
Signature · 8 lines
2.39.0 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Re: [f2fs-dev] [PATCH 5/8] f2fs: refactor __allocate_new_segment
Quoted 4 lines · Christoph Hellwig
Simplify the check whether to allocate a new segment or reuse an open one.
Signed-off-by Christoph Hellwig <[email protected]>
Thanks,
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH 6/8 f2fs: remove __allocate_new_section
In reply to Christoph HellwigJust fold this trivial wrapper into the only caller.
--- fs/f2fs/segment.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
fs/f2fs/segment.c +1 -7
@@ -2909,17 +2909,11 @@ static void __allocate_new_segment(struct f2fs_sb_info *sbi, int type,locate_dirty_segment (sbi, old_segno); } -static void __allocate_new_section (struct f2fs_sb_info *sbi, -int type,bool force) -{ -__allocate_new_segment (sbi, type, true, force); -} -void f2fs_allocate_new_section (struct f2fs_sb_info *sbi,int type,bool force) {f2fs_down_read (&SM_I (sbi)->curseg_lock);down_write (&SIT_I (sbi)->sentry_lock); -__allocate_new_section (sbi, type, force); +__allocate_new_segment (sbi, type, true, force);up_write (&SIT_I (sbi)->sentry_lock);f2fs_up_read (&SM_I (sbi)->curseg_lock); }
Signature · 8 lines
2.39.0 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Re: [f2fs-dev] [PATCH 6/8] f2fs: remove __allocate_new_section
Quoted 3 lines · Christoph Hellwig
Just fold this trivial wrapper into the only caller.
Signed-off-by Christoph Hellwig <[email protected]>
Thanks,
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH 7/8 f2fs: refactor next blk selection
In reply to Christoph HellwigRemove __refresh_next_blkoff by opencoding the SSR vs LFS segment check in the only caller, and then add helpers for SSR block selection and blkoff randomization instead.
--- fs/f2fs/segment.c | 48 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 25 deletions(-)
fs/f2fs/segment.c +23 -25
@@ -2616,30 +2616,10 @@ static int __next_free_blkoff(struct f2fs_sb_info *sbi,return __find_rev_next_zero_bit (target_map, sbi->blocks_per_seg, start); } -/* -* If a segment is written by LFS manner, next block offset is just obtained -* by increasing the current block offset. However, if a segment is written by -* SSR manner, next block offset obtained by calling __next_free_blkoff -*/ -static void __refresh_next_blkoff (struct f2fs_sb_info *sbi, -struct curseg_info *seg) +static int f2fs_find_next_ssr_block (struct f2fs_sb_info *sbi, +struct curseg_info *seg) { -if (seg->alloc_type ==SSR ) { - seg->next_blkoff = -__next_free_blkoff (sbi, seg->segno, - seg->next_blkoff +1 ); - }else { - seg->next_blkoff++; -if (F2FS_OPTION (sbi).fs_mode ==FS_MODE_FRAGMENT_BLK ) { -/* To allocate block chunks in different sizes, use random number */ -if (--seg->fragment_remained_chunk <=0 ) { - seg->fragment_remained_chunk = -get_random_u32_inclusive (1 , sbi->max_fragment_chunk); - seg->next_blkoff += -get_random_u32_inclusive (1 , sbi->max_fragment_hole); - } - } - } +return __next_free_blkoff (sbi, seg->segno, seg->next_blkoff +1 ); }bool f2fs_segment_has_free_slot (struct f2fs_sb_info *sbi,int segno)
@@ -3216,6 +3196,19 @@ static int __get_segment_type(struct f2fs_io_info *fio)return type; } +static void f2fs_randomize_chunk (struct f2fs_sb_info *sbi, +struct curseg_info *seg) +{ +/* To allocate block chunks in different sizes, use random number */ +if (--seg->fragment_remained_chunk >0 ) +return ; + + seg->fragment_remained_chunk = +get_random_u32_inclusive (1 , sbi->max_fragment_chunk); + seg->next_blkoff += +get_random_u32_inclusive (1 , sbi->max_fragment_hole); +} + void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, block_t old_blkaddr, block_t *new_blkaddr, struct f2fs_summary *sum, int type,
@@ -3245,8 +3238,13 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,f2fs_wait_discard_bio (sbi, *new_blkaddr); curseg->sum_blk->entries[curseg->next_blkoff] = *sum; -__refresh_next_blkoff (sbi, curseg); - +if (curseg->alloc_type ==SSR ) { + curseg->next_blkoff =f2fs_find_next_ssr_block (sbi, curseg); + }else { + curseg->next_blkoff++; +if (F2FS_OPTION (sbi).fs_mode ==FS_MODE_FRAGMENT_BLK ) +f2fs_randomize_chunk (sbi, curseg); + }stat_inc_block_count (sbi, curseg);if (from_gc) {
Signature · 8 lines
2.39.0 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Re: [f2fs-dev] [PATCH 7/8] f2fs: refactor next blk selection
Quoted 5 lines · Christoph Hellwig
Remove
__refresh_next_blkoffby opencoding the SSR vs LFS segment check in the only caller, and then add helpers for SSR block selection and blkoff randomization instead.Signed-off-by Christoph Hellwig <[email protected]>
Thanks,
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
PATCH 8/8 f2fs: remove __has_curseg_space
In reply to Christoph HellwigJust open code the logic in the only caller, where it is more obvious.
--- fs/f2fs/segment.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
fs/f2fs/segment.c +8 -11
@@ -3071,13 +3071,6 @@ int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fstrim_range *range)return err; } -static bool __has_curseg_space (struct f2fs_sb_info *sbi, -struct curseg_info *curseg) -{ -return curseg->next_blkoff <f2fs_usable_blks_in_seg (sbi, - curseg->segno); -} -int f2fs_rw_hint_to_seg_type (enum rw_hint hint) {switch (hint) {
@@ -3219,6 +3212,7 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,unsigned long long old_mtime;bool from_gc = (type ==CURSEG_ALL_DATA_ATGC );struct seg_entry *se =NULL ; +bool segment_full = false;f2fs_down_read (&SM_I (sbi)->curseg_lock);
@@ -3245,6 +3239,8 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,if (F2FS_OPTION (sbi).fs_mode ==FS_MODE_FRAGMENT_BLK )f2fs_randomize_chunk (sbi, curseg); } +if (curseg->next_blkoff >=f2fs_usable_blks_in_seg (sbi, curseg->segno)) + segment_full = true;stat_inc_block_count (sbi, curseg);if (from_gc) {
@@ -3263,10 +3259,11 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,if (GET_SEGNO (sbi, old_blkaddr) !=NULL_SEGNO )update_sit_entry (sbi, old_blkaddr,-1 ); -if (!__has_curseg_space (sbi, curseg)) { -/* -* Flush out current segment and replace it with new segment. -*/ +/* +* If the current segment is full, flush it out and replace it with a +* new segment. +*/ +if (segment_full) {if (from_gc) {get_atssr_segment (sbi, type, se->type,AT_SSR , se->mtime);
Signature · 8 lines
2.39.0 _______________________________________________ Linux-f2fs-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Re: [f2fs-dev] [PATCH 8/8] f2fs: remove __has_curseg_space
Quoted 4 lines · Christoph Hellwig
Just open code the logic in the only caller, where it is more obvious.
Signed-off-by Christoph Hellwig <[email protected]>
Thanks,
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel