fsck.f2fs: refactor extent info verification flow
There are some issues in original approach:
- memory allocated in i_extent.map will leak
- do not convert fields in i_ext from on-disk format to cpu format
- do not support checking file offset with extent info
This patch refactors the flow for fixing above issues and supporting
file offset check.
Signed-off-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
diff --git a/fsck/fsck.c b/fsck/fsck.c
index acdd5d4..aaaa95b 100644
--- a/fsck/fsck.c
+++ b/fsck/fsck.c
@@ -494,8 +494,7 @@
int fsck_chk_node_blk(struct f2fs_sb_info *sbi, struct f2fs_inode *inode,
u32 nid, u8 *name, enum FILE_TYPE ftype, enum NODE_TYPE ntype,
- u32 *blk_cnt, struct child_info *child,
- struct extent_info *i_ext)
+ u32 *blk_cnt, struct child_info *child)
{
struct node_info ni;
struct f2fs_node *node_blk = NULL;
@@ -514,19 +513,19 @@
f2fs_set_main_bitmap(sbi, ni.blk_addr,
CURSEG_WARM_NODE);
fsck_chk_dnode_blk(sbi, inode, nid, ftype, node_blk,
- blk_cnt, child, &ni, i_ext);
+ blk_cnt, child, &ni);
break;
case TYPE_INDIRECT_NODE:
f2fs_set_main_bitmap(sbi, ni.blk_addr,
CURSEG_COLD_NODE);
fsck_chk_idnode_blk(sbi, inode, ftype, node_blk,
- blk_cnt, child, i_ext);
+ blk_cnt, child);
break;
case TYPE_DOUBLE_INDIRECT_NODE:
f2fs_set_main_bitmap(sbi, ni.blk_addr,
CURSEG_COLD_NODE);
fsck_chk_didnode_blk(sbi, inode, ftype, node_blk,
- blk_cnt, child, i_ext);
+ blk_cnt, child);
break;
default:
ASSERT(0);
@@ -539,24 +538,62 @@
return -EINVAL;
}
-static void update_i_extent(struct extent_info *i_ext, block_t blkaddr)
+static inline void get_extent_info(struct extent_info *ext,
+ struct f2fs_extent *i_ext)
{
- block_t end_addr;
+ ext->fofs = le32_to_cpu(i_ext->fofs);
+ ext->blk = le32_to_cpu(i_ext->blk_addr);
+ ext->len = le32_to_cpu(i_ext->len);
+}
- if (!i_ext)
+static void check_extent_info(struct child_info *child,
+ block_t blkaddr, int last)
+{
+ struct extent_info *ei = &child->ei;
+ u32 pgofs = child->pgofs;
+ int is_hole = 0;
+
+ if (!ei->len)
return;
- end_addr = i_ext->ext.blk_addr + i_ext->ext.len;
+ if (child->state & FSCK_UNMATCHED_EXTENT)
+ return;
- /* TODO: check its file offset later */
- if (blkaddr >= i_ext->ext.blk_addr && blkaddr < end_addr) {
- unsigned int offset = blkaddr - i_ext->ext.blk_addr;
-
- if (f2fs_set_bit(offset, i_ext->map))
- i_ext->fail = 1;
- else
- i_ext->len--;
+ if (last) {
+ /* hole exist in the back of extent */
+ if (child->last_blk != ei->blk + ei->len - 1)
+ child->state |= FSCK_UNMATCHED_EXTENT;
+ return;
}
+
+ if (blkaddr == NULL_ADDR || blkaddr == NEW_ADDR)
+ is_hole = 1;
+
+ if (pgofs >= ei->fofs && pgofs < ei->fofs + ei->len) {
+ /* unmatched blkaddr */
+ if (is_hole || (blkaddr != pgofs - ei->fofs + ei->blk))
+ goto unmatched;
+
+ if (!child->last_blk) {
+ /* hole exists in the front of extent */
+ if (pgofs != ei->fofs)
+ goto unmatched;
+ } else if (child->last_blk + 1 != blkaddr) {
+ /* hole exists in the middle of extent */
+ goto unmatched;
+ }
+ child->last_blk = blkaddr;
+ return;
+ }
+
+ if (is_hole)
+ return;
+
+ if (blkaddr < ei->blk || blkaddr >= ei->blk + ei->len)
+ return;
+ /* unmatched file offset */
+unmatched:
+ child->state |= FSCK_UNMATCHED_EXTENT;
}
/* start with valid nid and blkaddr */
@@ -565,14 +602,13 @@
u32 *blk_cnt, struct node_info *ni)
{
struct f2fs_fsck *fsck = F2FS_FSCK(sbi);
- struct child_info child = {2, 0, 0, 0};
+ struct child_info child = {0, 2, 0, 0, 0, 0};
enum NODE_TYPE ntype;
u32 i_links = le32_to_cpu(node_blk->i.i_links);
u64 i_blocks = le64_to_cpu(node_blk->i.i_blocks);
child.p_ino = nid;
child.pp_ino = le32_to_cpu(node_blk->i.i_pino);
child.dir_level = node_blk->i.i_dir_level;
- struct extent_info i_extent;
unsigned int idx = 0;
int need_fix = 0;
int ret;
@@ -670,20 +706,18 @@
}
}
- i_extent.ext = node_blk->i.i_ext;
- i_extent.len = le32_to_cpu(i_extent.ext.len);
- i_extent.fail = 0;
- if (i_extent.len) {
- /* max 126KB */
- i_extent.map = calloc(i_extent.len, 1);
- ASSERT(i_extent.map != NULL);
- }
+ /* init extent info */
+ get_extent_info(&child.ei, &node_blk->i.i_ext);
+ child.last_blk = 0;
/* check data blocks in inode */
for (idx = 0; idx < ADDRS_PER_INODE(&node_blk->i);
idx++, child.pgofs++) {
block_t blkaddr = le32_to_cpu(node_blk->i.i_addr[idx]);
+ /* check extent info */
+ check_extent_info(&child, blkaddr, 0);
+
if (blkaddr != 0) {
ret = fsck_chk_data_blk(sbi,
blkaddr,
@@ -692,7 +726,6 @@
file_is_encrypt(node_blk->i.i_advise));
if (!ret) {
*blk_cnt = *blk_cnt + 1;
- update_i_extent(&i_extent, blkaddr);
} else if (config.fix_on) {
node_blk->i.i_addr[idx] = 0;
need_fix = 1;
@@ -719,8 +752,7 @@
ret = fsck_chk_node_blk(sbi, &node_blk->i,
blkaddr,
- NULL, ftype, ntype, blk_cnt, &child,
- &i_extent);
+ NULL, ftype, ntype, blk_cnt, &child);
if (!ret) {
*blk_cnt = *blk_cnt + 1;
} else if (ret == -EINVAL) {
@@ -740,9 +772,13 @@
}
}
- if (i_extent.len || i_extent.fail) {
- ASSERT_MSG("ino: 0x%x has wrong ext: untouched=%d, overlap=%d",
- nid, i_extent.len, i_extent.fail);
+
+ /* check uncovered range in the back of extent */
+ check_extent_info(&child, 0, 1);
+
+ if (child.state & FSCK_UNMATCHED_EXTENT) {
+ ASSERT_MSG("ino: 0x%x has wrong ext: [pgofs:%u, blk:%u, len:%u]",
+ nid, child.ei.fofs, child.ei.blk, child.ei.len);
if (config.fix_on)
need_fix = 1;
}
@@ -814,8 +850,7 @@
int fsck_chk_dnode_blk(struct f2fs_sb_info *sbi, struct f2fs_inode *inode,
u32 nid, enum FILE_TYPE ftype, struct f2fs_node *node_blk,
- u32 *blk_cnt, struct child_info *child, struct node_info *ni,
- struct extent_info *i_ext)
+ u32 *blk_cnt, struct child_info *child, struct node_info *ni)
{
int idx, ret;
int need_fix = 0;
@@ -825,6 +860,8 @@
for (idx = 0; idx < ADDRS_PER_BLOCK; idx++, child->pgofs++) {
block_t blkaddr = le32_to_cpu(node_blk->dn.addr[idx]);
+ check_extent_info(child, blkaddr, 0);
+
if (blkaddr == 0x0)
continue;
ret = fsck_chk_data_blk(sbi,
@@ -834,7 +871,6 @@
file_is_encrypt(inode->i_advise));
if (!ret) {
*blk_cnt = *blk_cnt + 1;
- update_i_extent(i_ext, blkaddr);
} else if (config.fix_on) {
node_blk->dn.addr[idx] = 0;
need_fix = 1;
@@ -850,7 +886,7 @@
int fsck_chk_idnode_blk(struct f2fs_sb_info *sbi, struct f2fs_inode *inode,
enum FILE_TYPE ftype, struct f2fs_node *node_blk, u32 *blk_cnt,
- struct child_info *child, struct extent_info *i_ext)
+ struct child_info *child)
{
int need_fix = 0, ret;
int i = 0;
@@ -860,8 +896,7 @@
goto skip;
ret = fsck_chk_node_blk(sbi, inode,
le32_to_cpu(node_blk->in.nid[i]), NULL,
- ftype, TYPE_DIRECT_NODE, blk_cnt, child,
- i_ext);
+ ftype, TYPE_DIRECT_NODE, blk_cnt, child);
if (!ret)
*blk_cnt = *blk_cnt + 1;
else if (ret == -EINVAL) {
@@ -891,7 +926,7 @@
int fsck_chk_didnode_blk(struct f2fs_sb_info *sbi, struct f2fs_inode *inode,
enum FILE_TYPE ftype, struct f2fs_node *node_blk, u32 *blk_cnt,
- struct child_info *child, struct extent_info *i_ext)
+ struct child_info *child)
{
int i = 0;
int need_fix = 0, ret = 0;
@@ -901,8 +936,7 @@
goto skip;
ret = fsck_chk_node_blk(sbi, inode,
le32_to_cpu(node_blk->in.nid[i]), NULL,
- ftype, TYPE_INDIRECT_NODE, blk_cnt, child,
- i_ext);
+ ftype, TYPE_INDIRECT_NODE, blk_cnt, child);
if (!ret)
*blk_cnt = *blk_cnt + 1;
else if (ret == -EINVAL) {
@@ -1295,7 +1329,7 @@
blk_cnt = 1;
ret = fsck_chk_node_blk(sbi,
NULL, le32_to_cpu(dentry[i].ino), name,
- ftype, TYPE_INODE, &blk_cnt, NULL, NULL);
+ ftype, TYPE_INODE, &blk_cnt, NULL);
if (ret && config.fix_on) {
int j;
@@ -1461,7 +1495,7 @@
blk_cnt = 1;
ret = fsck_chk_node_blk(sbi, NULL, ino, NULL,
F2FS_FT_ORPHAN, TYPE_INODE, &blk_cnt,
- NULL, NULL);
+ NULL);
if (!ret)
new_blk->ino[new_entry_count++] =
orphan_blk->ino[j];
diff --git a/fsck/fsck.h b/fsck/fsck.h
index b92a1e0..45e4366 100644
--- a/fsck/fsck.h
+++ b/fsck/fsck.h
@@ -13,13 +13,22 @@
#include "f2fs.h"
+#define FSCK_UNMATCHED_EXTENT 0x00000001
+
/* fsck.c */
struct orphan_info {
u32 nr_inodes;
u32 *ino_list;
};
+struct extent_info {
+ u32 fofs; /* start offset in a file */
+ u32 blk; /* start block address of the extent */
+ u32 len; /* length of the extent */
+};
+
struct child_info {
+ u32 state;
u32 links;
u32 files;
u32 pgofs;
@@ -27,13 +36,8 @@
u8 dir_level;
u32 p_ino; /*parent ino*/
u32 pp_ino; /*parent parent ino*/
-};
-
-struct extent_info {
- struct f2fs_extent ext;
- char *map;
- int len;
- int fail;
+ struct extent_info ei;
+ u32 last_blk;
};
struct f2fs_fsck {
@@ -99,18 +103,16 @@
extern void fsck_chk_orphan_node(struct f2fs_sb_info *);
extern int fsck_chk_node_blk(struct f2fs_sb_info *, struct f2fs_inode *, u32,
u8 *, enum FILE_TYPE, enum NODE_TYPE, u32 *,
- struct child_info *, struct extent_info *);
+ struct child_info *);
extern void fsck_chk_inode_blk(struct f2fs_sb_info *, u32, enum FILE_TYPE,
struct f2fs_node *, u32 *, struct node_info *);
extern int fsck_chk_dnode_blk(struct f2fs_sb_info *, struct f2fs_inode *,
u32, enum FILE_TYPE, struct f2fs_node *, u32 *,
- struct child_info *, struct node_info *, struct extent_info *);
+ struct child_info *, struct node_info *);
extern int fsck_chk_idnode_blk(struct f2fs_sb_info *, struct f2fs_inode *,
- enum FILE_TYPE, struct f2fs_node *, u32 *, struct child_info *,
- struct extent_info *);
+ enum FILE_TYPE, struct f2fs_node *, u32 *, struct child_info *);
extern int fsck_chk_didnode_blk(struct f2fs_sb_info *, struct f2fs_inode *,
- enum FILE_TYPE, struct f2fs_node *, u32 *, struct child_info *,
- struct extent_info *);
+ enum FILE_TYPE, struct f2fs_node *, u32 *, struct child_info *);
extern int fsck_chk_data_blk(struct f2fs_sb_info *sbi, u32, struct child_info *,
int, enum FILE_TYPE, u32, u16, u8, int);
extern int fsck_chk_dentry_blk(struct f2fs_sb_info *, u32, struct child_info *,
diff --git a/fsck/main.c b/fsck/main.c
index 54dbb2d..0e23c81 100644
--- a/fsck/main.c
+++ b/fsck/main.c
@@ -218,7 +218,7 @@
/* Traverse all block recursively from root inode */
blk_cnt = 1;
fsck_chk_node_blk(sbi, NULL, sbi->root_ino_num, (u8 *)"/",
- F2FS_FT_DIR, TYPE_INODE, &blk_cnt, NULL, NULL);
+ F2FS_FT_DIR, TYPE_INODE, &blk_cnt, NULL);
fsck_verify(sbi);
fsck_free(sbi);
}
