f2fs: support non-4KB block size without packed_ssa feature
PATCH v2 1/1 f2fs: support non-4KB block size without packed_ssa feature
From: Daeho Jeong <[email protected]>
Currently, F2FS requires the packed_ssa feature to be enabled when utilizing non-4KB block sizes (e.g., 16KB). This restriction limits the flexibility of filesystem formatting options.
This patch allows F2FS to support non-4KB block sizes even when the packed_ssa feature is disabled. It adjusts the SSA calculation logic to correctly handle summary entries in larger blocks without the packed layout.
Fixes 7ee8bc3942f2 ("f2fs: revert summary entry count from 2048 to 512 in 16kb block support")
Signed-off-by Daeho Jeong <[email protected]>
---
v2: using sbi->sum_blocksize instead of F2FS_SUM_BLKSIZE()
--- fs/f2fs/f2fs.h | 55 ++++++++++++++++++-------- fs/f2fs/gc.c | 23 +++++------ fs/f2fs/node.c | 12 +++--- fs/f2fs/recovery.c | 6 +-- fs/f2fs/segment.c | 86 ++++++++++++++++++++++------------------- fs/f2fs/segment.h | 10 ++--- fs/f2fs/super.c | 16 +------- include/linux/f2fs_fs.h | 73 ++++++++++++++++++++-------------- 8 files changed, 158 insertions(+), 123 deletions(-)
fs/f2fs/f2fs.h +39 -16
@@ -521,13 +521,34 @@ struct fsync_inode_entry {#define nats_in_cursum (jnl) (le16_to_cpu((jnl)->n_nats))#define sits_in_cursum (jnl) (le16_to_cpu((jnl)->n_sits)) -#define nat_in_journal (jnl, i) ((jnl)->nat_j.entries[i].ne) -#define nid_in_journal (jnl, i) ((jnl)->nat_j.entries[i].nid) -#define sit_in_journal (jnl, i) ((jnl)->sit_j.entries[i].se) -#define segno_in_journal (jnl, i) ((jnl)->sit_j.entries[i].segno) - -#define MAX_NAT_JENTRIES (jnl) (NAT_JOURNAL_ENTRIES - nats_in_cursum(jnl)) -#define MAX_SIT_JENTRIES (jnl) (SIT_JOURNAL_ENTRIES - sits_in_cursum(jnl)) +#define nat_in_journal (jnl, i) \ + (((struct nat_journal_entry *)(jnl)->nat_j.entries)[i].ne) +#define nid_in_journal (jnl, i) \ + (((struct nat_journal_entry *)(jnl)->nat_j.entries)[i].nid) +#define sit_in_journal (jnl, i) \ + (((struct sit_journal_entry *)(jnl)->sit_j.entries)[i].se) +#define segno_in_journal (jnl, i) \ + (((struct sit_journal_entry *)(jnl)->sit_j.entries)[i].segno) + +#define ENTRIES_IN_SUM (sbi) ((sbi)->sum_blocksize / 8) +#define SUM_ENTRY_SIZE (sbi) (SUMMARY_SIZE * ENTRIES_IN_SUM(sbi)) +#define SUM_JOURNAL_SIZE (sbi) ((sbi)->sum_blocksize - SUM_FOOTER_SIZE - \ + SUM_ENTRY_SIZE(sbi)) +#define NAT_JOURNAL_ENTRIES (sbi) ((SUM_JOURNAL_SIZE(sbi) - 2) / \ + sizeof(struct nat_journal_entry)) +#define SIT_JOURNAL_ENTRIES (sbi) ((SUM_JOURNAL_SIZE(sbi) - 2) / \ + sizeof(struct sit_journal_entry)) + +#define sum_entries (sum) ((struct f2fs_summary *)(sum)) +#define sum_journal (sbi, sum) \ + ((struct f2fs_journal *)((char *)(sum) + \ + (ENTRIES_IN_SUM(sbi) * sizeof(struct f2fs_summary)))) +#define sum_footer (sbi, sum) \ + ((struct summary_footer *)((char *)(sum) + (sbi)->sum_blocksize - \ + sizeof(struct summary_footer))) + +#define MAX_NAT_JENTRIES (sbi, jnl) (NAT_JOURNAL_ENTRIES(sbi) - nats_in_cursum(jnl)) +#define MAX_SIT_JENTRIES (sbi, jnl) (SIT_JOURNAL_ENTRIES(sbi) - sits_in_cursum(jnl))static inline int update_nats_in_cursum (struct f2fs_journal *journal,int i) {
@@ -545,14 +566,6 @@ static inline int update_sits_in_cursum(struct f2fs_journal *journal, int i)return before; } -static inline bool __has_cursum_space (struct f2fs_journal *journal, -int size,int type) -{ -if (type ==NAT_JOURNAL ) -return size <=MAX_NAT_JENTRIES (journal); -return size <=MAX_SIT_JENTRIES (journal); -} -/* for inline stuff */ #define DEF_INLINE_RESERVED_SIZE 1static inline int get_extra_isize (struct inode *inode);
@@ -1750,6 +1763,7 @@ struct f2fs_sb_info {unsigned int log_sectors_per_block;/* log2 sectors per block */ unsigned int log_blocksize;/* log2 block size */ unsigned int blocksize;/* block size */ +unsigned int sum_blocksize;/* summary block size */ unsigned int root_ino_num;/* root inode number*/ unsigned int node_ino_num;/* node inode number*/ unsigned int meta_ino_num;/* meta inode number*/
@@ -2813,6 +2827,14 @@ static inline block_t __start_sum_addr(struct f2fs_sb_info *sbi)return le32_to_cpu (F2FS_CKPT (sbi)->cp_pack_start_sum); } +static inline bool __has_cursum_space (struct f2fs_sb_info *sbi, +struct f2fs_journal *journal,int size,int type) +{ +if (type ==NAT_JOURNAL ) +return size <=MAX_NAT_JENTRIES (sbi, journal); +return size <=MAX_SIT_JENTRIES (sbi, journal); +} +extern void f2fs_mark_inode_dirty_sync (struct inode *inode,bool sync);static inline int inc_valid_node_count (struct f2fs_sb_info *sbi,struct inode *inode,bool is_inode)
@@ -3956,7 +3978,8 @@ void f2fs_wait_on_block_writeback_range(struct inode *inode, block_t blkaddr, block_t len);void f2fs_write_data_summaries (struct f2fs_sb_info *sbi,block_t start_blk);void f2fs_write_node_summaries (struct f2fs_sb_info *sbi,block_t start_blk); -int f2fs_lookup_journal_in_cursum (struct f2fs_journal *journal,int type, +int f2fs_lookup_journal_in_cursum (struct f2fs_sb_info *sbi, +struct f2fs_journal *journal,int type,unsigned int val,int alloc);void f2fs_flush_sit_entries (struct f2fs_sb_info *sbi,struct cp_control *cpc);int f2fs_check_and_fix_write_pointer (struct f2fs_sb_info *sbi);
fs/f2fs/gc.c +12 -11
@@ -1769,8 +1769,8 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,sanity_check_seg_type (sbi,get_seg_entry (sbi, segno)->type); - segno =rounddown (segno,SUMS_PER_BLOCK ); - sum_blk_cnt =DIV_ROUND_UP (end_segno - segno,SUMS_PER_BLOCK ); + segno =rounddown (segno,SUMS_PER_BLOCK (sbi)); + sum_blk_cnt =DIV_ROUND_UP (end_segno - segno,SUMS_PER_BLOCK (sbi));/* readahead multi ssa blocks those have contiguous address */ if (__is_large_section (sbi)) f2fs_ra_meta_pages(sbi, GET_SUM_BLOCK(sbi, segno),
@@ -1780,17 +1780,17 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,while (segno < end_segno) {struct folio *sum_folio =f2fs_get_sum_folio (sbi, segno); - segno +=SUMS_PER_BLOCK ; + segno +=SUMS_PER_BLOCK (sbi);if (IS_ERR (sum_folio)) {int err =PTR_ERR (sum_folio); - end_segno = segno -SUMS_PER_BLOCK ; - segno =rounddown (start_segno,SUMS_PER_BLOCK ); + end_segno = segno -SUMS_PER_BLOCK (sbi); + segno =rounddown (start_segno,SUMS_PER_BLOCK (sbi));while (segno < end_segno) { sum_folio =filemap_get_folio (META_MAPPING (sbi),GET_SUM_BLOCK (sbi, segno));folio_put_refs (sum_folio,2 ); - segno +=SUMS_PER_BLOCK ; + segno +=SUMS_PER_BLOCK (sbi); }return err; }
@@ -1806,8 +1806,8 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi,/* find segment summary of victim */ struct folio *sum_folio =filemap_get_folio (META_MAPPING (sbi),GET_SUM_BLOCK (sbi, segno)); -unsigned int block_end_segno =rounddown (segno,SUMS_PER_BLOCK ) - +SUMS_PER_BLOCK ; +unsigned int block_end_segno =rounddown (segno,SUMS_PER_BLOCK (sbi)) + +SUMS_PER_BLOCK (sbi);if (block_end_segno > end_segno) block_end_segno = end_segno;
@@ -1833,12 +1833,13 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi, migrated >= sbi->migration_granularity)continue ; - sum =SUM_BLK_PAGE_ADDR (sum_folio, cur_segno); -if (type !=GET_SUM_TYPE ((&sum->footer))) { + sum =SUM_BLK_PAGE_ADDR (sbi, sum_folio, cur_segno); +if (type !=GET_SUM_TYPE (sum_footer (sbi, sum))) {f2fs_err (sbi,"Inconsistent segment (%u) type " "[%d, %d] in SSA and SIT" , cur_segno, type, -GET_SUM_TYPE ((&sum->footer))); +GET_SUM_TYPE ( +sum_footer (sbi, sum)));f2fs_stop_checkpoint (sbi, false,STOP_CP_REASON_CORRUPTED_SUMMARY );continue ;
fs/f2fs/node.c +6 -6
@@ -606,7 +606,7 @@ int f2fs_get_node_info(struct f2fs_sb_info *sbi, nid_t nid, goto retry; } - i =f2fs_lookup_journal_in_cursum (journal,NAT_JOURNAL , nid,0 ); + i =f2fs_lookup_journal_in_cursum (sbi, journal,NAT_JOURNAL , nid,0 );if (i >=0 ) { ne =nat_in_journal (journal, i);node_info_from_raw_nat (ni, &ne);
@@ -2937,7 +2937,7 @@ int f2fs_restore_node_summary(struct f2fs_sb_info *sbi,/* scan the node segment */ last_offset =BLKS_PER_SEG (sbi); addr =START_BLOCK (sbi, segno); - sum_entry = &sum->entries[0 ]; + sum_entry =sum_entries (sum);for (i =0 ; i < last_offset; i += nrpages, addr += nrpages) { nrpages =bio_max_segs (last_offset - i);
@@ -3078,7 +3078,7 @@ static int __flush_nat_entry_set(struct f2fs_sb_info *sbi,* #2, flush nat entries to nat page. */ if (enabled_nat_bits (sbi, cpc) || - !__has_cursum_space (journal, set->entry_cnt,NAT_JOURNAL )) + !__has_cursum_space (sbi, journal, set->entry_cnt,NAT_JOURNAL )) to_journal = false;if (to_journal) {
@@ -3101,7 +3101,7 @@ static int __flush_nat_entry_set(struct f2fs_sb_info *sbi,f2fs_bug_on (sbi,nat_get_blkaddr (ne) ==NEW_ADDR );if (to_journal) { - offset =f2fs_lookup_journal_in_cursum (journal, + offset =f2fs_lookup_journal_in_cursum (sbi, journal,NAT_JOURNAL , nid,1 );f2fs_bug_on (sbi, offset <0 ); raw_ne = &nat_in_journal (journal, offset);
@@ -3172,7 +3172,7 @@ int f2fs_flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc)* into nat entry set. */ if (enabled_nat_bits (sbi, cpc) || - !__has_cursum_space (journal, + !__has_cursum_space (sbi, journal, nm_i->nat_cnt[DIRTY_NAT ],NAT_JOURNAL ))remove_nats_in_journal (sbi);
@@ -3183,7 +3183,7 @@ int f2fs_flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc) set_idx = setvec[found -1 ]->set +1 ;for (idx =0 ; idx < found; idx++)__adjust_nat_entry_set (setvec[idx], &sets, -MAX_NAT_JENTRIES (journal)); +MAX_NAT_JENTRIES (sbi, journal)); }/* flush dirty nats in nat entry set */
fs/f2fs/recovery.c +3 -3
@@ -514,7 +514,7 @@ static int check_index_in_prev_nodes(struct f2fs_sb_info *sbi,struct curseg_info *curseg =CURSEG_I (sbi, i);if (curseg->segno == segno) { - sum = curseg->sum_blk->entries[blkoff]; + sum =sum_entries (curseg->sum_blk)[blkoff]; goto got_it; } }
@@ -522,8 +522,8 @@ static int check_index_in_prev_nodes(struct f2fs_sb_info *sbi, sum_folio =f2fs_get_sum_folio (sbi, segno);if (IS_ERR (sum_folio))return PTR_ERR (sum_folio); - sum_node =SUM_BLK_PAGE_ADDR (sum_folio, segno); - sum = sum_node->entries[blkoff]; + sum_node =SUM_BLK_PAGE_ADDR (sbi, sum_folio, segno); + sum =sum_entries (sum_node)[blkoff];f2fs_folio_put (sum_folio, true); got_it:/* Use the locked dnode page and inode */
fs/f2fs/segment.c +46 -40
244 lines not on this page · raw message
fs/f2fs/segment.h +5 -5
@@ -90,12 +90,12 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi,#define GET_ZONE_FROM_SEG (sbi, segno) \ GET_ZONE_FROM_SEC(sbi, GET_SEC_FROM_SEG(sbi, segno)) -#define SUMS_PER_BLOCK (F2FS_BLKSIZE / F2FS_SUM_BLKSIZE) +#define SUMS_PER_BLOCK (sbi) ((sbi)->blocksize / (sbi)->sum_blocksize)#define GET_SUM_BLOCK (sbi, segno) \ - (SM_I(sbi)->ssa_blkaddr + (segno / SUMS_PER_BLOCK)) -#define GET_SUM_BLKOFF (segno) (segno % SUMS_PER_BLOCK) -#define SUM_BLK_PAGE_ADDR (folio, segno) \ - (folio_address(folio) + GET_SUM_BLKOFF(segno) * F2FS_SUM_BLKSIZE) + (SM_I(sbi)->ssa_blkaddr + (segno / SUMS_PER_BLOCK(sbi))) +#define GET_SUM_BLKOFF (sbi, segno) (segno % SUMS_PER_BLOCK(sbi)) +#define SUM_BLK_PAGE_ADDR (sbi, folio, segno) \ + (folio_address(folio) + GET_SUM_BLKOFF(sbi, segno) * (sbi)->sum_blocksize)#define GET_SUM_TYPE (footer) ((footer)->entry_type)#define SET_SUM_TYPE (footer, type) ((footer)->entry_type = (type))
fs/f2fs/super.c +2 -14
@@ -4080,20 +4080,6 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi,if (sanity_check_area_boundary (sbi, folio, index))return -EFSCORRUPTED ; -/* -* Check for legacy summary layout on 16KB+ block devices. -* Modern f2fs-tools packs multiple 4KB summary areas into one block, -* whereas legacy versions used one block per summary, leading -* to a much larger SSA. -*/ -if (SUMS_PER_BLOCK >1 && - !(__F2FS_HAS_FEATURE (raw_super,F2FS_FEATURE_PACKED_SSA ))) { -f2fs_info (sbi,"Error: Device formatted with a legacy version. " -"Please reformat with a tool supporting the packed ssa " -"feature for block sizes larger than 4kb." ); -return -EOPNOTSUPP ; - } -return 0 ; }
@@ -4277,6 +4263,8 @@ static void init_sb_info(struct f2fs_sb_info *sbi)le32_to_cpu (raw_super->log_sectors_per_block); sbi->log_blocksize =le32_to_cpu (raw_super->log_blocksize); sbi->blocksize =BIT (sbi->log_blocksize); + sbi->sum_blocksize =f2fs_sb_has_packed_ssa (sbi) ? +4096 : sbi->blocksize; sbi->log_blocks_per_seg =le32_to_cpu (raw_super->log_blocks_per_seg); sbi->blocks_per_seg =BIT (sbi->log_blocks_per_seg); sbi->segs_per_sec =le32_to_cpu (raw_super->segs_per_sec);
include/linux/f2fs_fs.h +45 -28
118 lines not on this page · raw message
Signature · 1 line
2.52.0.457.g6b5491de43-goog