f2fs: fix to determine start_cp_addr by sbi->cur_cp_pack
Subsystems (3)
Jaegeuk Kim
maintainerPATCH 1/1 f2fs: fix to determine start_cp_addr by sbi->cur_cp_pack
We don't guarantee cp_addr is fixed by cp_version. This is to sync with f2fs-tools.
--- fs/f2fs/checkpoint.c | 5 +++++ fs/f2fs/f2fs.h | 14 +++----------- 2 files changed, 8 insertions(+), 11 deletions(-)
fs/f2fs/checkpoint.c +5 -0
@@ -789,6 +789,11 @@ int get_valid_checkpoint(struct f2fs_sb_info *sbi)f2fs_put_page (cur_page,1 ); } done: +if (cur_page == cp1) + sbi->cur_cp_pack =1 ; +else + sbi->cur_cp_pack =2 ; +f2fs_put_page (cp1,1 );f2fs_put_page (cp2,1 );return 0 ;
fs/f2fs/f2fs.h +3 -11
@@ -792,6 +792,7 @@ struct f2fs_sb_info {/* for checkpoint */ struct f2fs_checkpoint *ckpt;/* raw checkpoint pointer */ +int cur_cp_pack;/* remain current cp pack */ spinlock_t cp_lock;/* for flag in ckpt */ struct inode *meta_inode;/* cache meta blocks */ struct mutex cp_mutex;/* checkpoint procedure lock */
@@ -1352,19 +1353,10 @@ static inline void *__bitmap_ptr(struct f2fs_sb_info *sbi, int flag)static inline block_t __start_cp_addr (struct f2fs_sb_info *sbi) { -block_t start_addr; -struct f2fs_checkpoint *ckpt =F2FS_CKPT (sbi); -unsigned long long ckpt_version =cur_cp_version (ckpt); - - start_addr =le32_to_cpu (F2FS_RAW_SUPER (sbi)->cp_blkaddr); +block_t start_addr =le32_to_cpu (F2FS_RAW_SUPER (sbi)->cp_blkaddr); -/* -* odd numbered checkpoint should at cp segment 0 -* and even segment must be at cp segment 1 -*/ -if (!(ckpt_version &1 )) +if (sbi->cur_cp_pack ==2 ) start_addr += sbi->blocks_per_seg; -return start_addr; }
Signature · 1 line
2.8.3
Hi Jaegeuk,
Let me try to understand this, in some cases, we can write a checkpoint pack which has wrong cp_ver, like in 1st cp pack which has even version number or 2nd cp pack which has odd version number, so if we load that kind of cp pack during fill_super, we may load wrong summary data from another older cp pack which cp version pointed to, is that right?
Thanks,
Quoted 61 lines · Jaegeuk Kim
We don't guarantee
cp_addris fixed bycp_version. This is to sync with f2fs-tools.Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/checkpoint.c | 5 +++++ fs/f2fs/f2fs.h | 14 +++----------- 2 files changed, 8 insertions(+), 11 deletions(-)fs/f2fs/checkpoint.c +5
-0@@ -789,6 +789,11 @@ int get_valid_checkpoint(struct f2fs_sb_info *sbi)f2fs_put_page (cur_page,1 ); } done: +if (cur_page == cp1) + sbi->cur_cp_pack =1 ; +else + sbi->cur_cp_pack =2 ; +f2fs_put_page (cp1,1 );f2fs_put_page (cp2,1 );return 0 ;fs/f2fs/f2fs.h +3
-11@@ -792,6 +792,7 @@ struct f2fs_sb_info {/* for checkpoint */ struct f2fs_checkpoint *ckpt;/* raw checkpoint pointer */ +int cur_cp_pack;/* remain current cp pack */ spinlock_t cp_lock;/* for flag in ckpt */ struct inode *meta_inode;/* cache meta blocks */ struct mutex cp_mutex;/* checkpoint procedure lock */ @@ -1352,19 +1353,10 @@ static inline void *__bitmap_ptr(struct f2fs_sb_info *sbi, int flag)static inline block_t __start_cp_addr (struct f2fs_sb_info *sbi) { -block_t start_addr; -struct f2fs_checkpoint *ckpt =F2FS_CKPT (sbi); -unsigned long long ckpt_version =cur_cp_version (ckpt); - - start_addr =le32_to_cpu (F2FS_RAW_SUPER (sbi)->cp_blkaddr); +block_t start_addr =le32_to_cpu (F2FS_RAW_SUPER (sbi)->cp_blkaddr); -/* -* odd numbered checkpoint should at cp segment 0 -* and even segment must be at cp segment 1 -*/ -if (!(ckpt_version &1 )) +if (sbi->cur_cp_pack ==2 ) start_addr += sbi->blocks_per_seg; -return start_addr; }
Jaegeuk Kim
maintainerQuoted 7 lines · Chao Yu
Hi Jaegeuk,
Let me try to understand this, in some cases, we can write a checkpoint pack which has wrong
cp_ver, like in 1st cp pack which has even version number or 2nd cp pack which has odd version number, so if we load that kind of cp pack duringfill_super, we may load wrong summary data from another older cp pack which cp version pointed to, is that right?
Yup. Especially we can use __start_cp_addr() when finding summary blocks. So, I suspect it was able to cause missing summary blocks.
Thanks,
Quoted 65 lines
Thanks,
Quoted 61 lines · Jaegeuk Kim
We don't guarantee
cp_addris fixed bycp_version. This is to sync with f2fs-tools.Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/checkpoint.c | 5 +++++ fs/f2fs/f2fs.h | 14 +++----------- 2 files changed, 8 insertions(+), 11 deletions(-)fs/f2fs/checkpoint.c +5
-0@@ -789,6 +789,11 @@ int get_valid_checkpoint(struct f2fs_sb_info *sbi)f2fs_put_page (cur_page,1 ); } done: +if (cur_page == cp1) + sbi->cur_cp_pack =1 ; +else + sbi->cur_cp_pack =2 ; +f2fs_put_page (cp1,1 );f2fs_put_page (cp2,1 );return 0 ;fs/f2fs/f2fs.h +3
-11@@ -792,6 +792,7 @@ struct f2fs_sb_info {/* for checkpoint */ struct f2fs_checkpoint *ckpt;/* raw checkpoint pointer */ +int cur_cp_pack;/* remain current cp pack */ spinlock_t cp_lock;/* for flag in ckpt */ struct inode *meta_inode;/* cache meta blocks */ struct mutex cp_mutex;/* checkpoint procedure lock */ @@ -1352,19 +1353,10 @@ static inline void *__bitmap_ptr(struct f2fs_sb_info *sbi, int flag)static inline block_t __start_cp_addr (struct f2fs_sb_info *sbi) { -block_t start_addr; -struct f2fs_checkpoint *ckpt =F2FS_CKPT (sbi); -unsigned long long ckpt_version =cur_cp_version (ckpt); - - start_addr =le32_to_cpu (F2FS_RAW_SUPER (sbi)->cp_blkaddr); +block_t start_addr =le32_to_cpu (F2FS_RAW_SUPER (sbi)->cp_blkaddr); -/* -* odd numbered checkpoint should at cp segment 0 -* and even segment must be at cp segment 1 -*/ -if (!(ckpt_version &1 )) +if (sbi->cur_cp_pack ==2 ) start_addr += sbi->blocks_per_seg; -return start_addr; }