* [PATCH] dump.f2fs: only dump nat inside the specified nid range @ 2018-06-29 10:11 Junling Zheng 2018-07-01 2:22 ` Chao Yu 0 siblings, 1 reply; 10+ messages in thread From: Junling Zheng @ 2018-06-29 10:11 UTC (permalink / raw) To: jaegeuk, yuchao0; +Cc: miaoxie, linux-f2fs-devel Only dump nat info of nids inside the specified range. Signed-off-by: Junling Zheng <zhengjunling@huawei.com> --- fsck/dump.c | 79 ++++++++++++++++++++++++----------------------------- fsck/fsck.h | 2 +- fsck/main.c | 4 +-- 3 files changed, 38 insertions(+), 47 deletions(-) diff --git a/fsck/dump.c b/fsck/dump.c index 9236a43..89cff83 100644 --- a/fsck/dump.c +++ b/fsck/dump.c @@ -31,32 +31,34 @@ const char *seg_type_name[SEG_TYPE_MAX + 1] = { "SEG_TYPE_NONE", }; -void nat_dump(struct f2fs_sb_info *sbi) +void nat_dump(struct f2fs_sb_info *sbi, int start_nat, int end_nat) { - struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi); struct f2fs_nm_info *nm_i = NM_I(sbi); struct f2fs_nat_block *nat_block; struct f2fs_node *node_block; - u32 nr_nat_blks, nid; + u32 nid; pgoff_t block_off; pgoff_t block_addr; char buf[BUF_SZ]; int seg_off; int fd, ret, pack; - unsigned int i; nat_block = (struct f2fs_nat_block *)calloc(BLOCK_SZ, 1); node_block = (struct f2fs_node *)calloc(BLOCK_SZ, 1); ASSERT(nat_block); - - nr_nat_blks = get_sb(segment_count_nat) << - (sbi->log_blocks_per_seg - 1); + ASSERT(node_block); fd = open("dump_nat", O_CREAT|O_WRONLY|O_TRUNC, 0666); ASSERT(fd >= 0); - for (block_off = 0; block_off < nr_nat_blks; pack = 1, block_off++) { + for (nid = start_nat; nid < end_nat; pack = 1, nid++) { + struct f2fs_nat_entry raw_nat; + struct node_info ni; + if(nid == 0 || nid == 1 || nid == 2 ) + continue; + ni.nid = nid; + block_off = nid / NAT_ENTRY_PER_BLOCK; seg_off = block_off >> sbi->log_blocks_per_seg; block_addr = (pgoff_t)(nm_i->nat_blkaddr + (seg_off << sbi->log_blocks_per_seg << 1) + @@ -67,42 +69,11 @@ void nat_dump(struct f2fs_sb_info *sbi) pack = 2; } - ret = dev_read_block(nat_block, block_addr); - ASSERT(ret >= 0); - - nid = block_off * NAT_ENTRY_PER_BLOCK; - for (i = 0; i < NAT_ENTRY_PER_BLOCK; i++) { - struct f2fs_nat_entry raw_nat; - struct node_info ni; - ni.nid = nid + i; - - if(nid + i == 0 || nid + i == 1 || nid + i == 2 ) - continue; - if (lookup_nat_in_journal(sbi, nid + i, - &raw_nat) >= 0) { - node_info_from_raw_nat(&ni, &raw_nat); - ret = dev_read_block(node_block, ni.blk_addr); - ASSERT(ret >= 0); - if (ni.blk_addr != 0x0) { - memset(buf, 0, BUF_SZ); - snprintf(buf, BUF_SZ, - "nid:%5u\tino:%5u\toffset:%5u" - "\tblkaddr:%10u\tpack:%d\n", - ni.nid, ni.ino, - le32_to_cpu(node_block->footer.flag) >> - OFFSET_BIT_SHIFT, - ni.blk_addr, pack); - ret = write(fd, buf, strlen(buf)); - ASSERT(ret >= 0); - } - } else { - node_info_from_raw_nat(&ni, - &nat_block->entries[i]); - if (ni.blk_addr == 0) - continue; - - ret = dev_read_block(node_block, ni.blk_addr); - ASSERT(ret >= 0); + if (lookup_nat_in_journal(sbi, nid, &raw_nat) >= 0) { + node_info_from_raw_nat(&ni, &raw_nat); + ret = dev_read_block(node_block, ni.blk_addr); + ASSERT(ret >= 0); + if (ni.blk_addr != 0x0) { memset(buf, 0, BUF_SZ); snprintf(buf, BUF_SZ, "nid:%5u\tino:%5u\toffset:%5u" @@ -114,6 +85,26 @@ void nat_dump(struct f2fs_sb_info *sbi) ret = write(fd, buf, strlen(buf)); ASSERT(ret >= 0); } + } else { + ret = dev_read_block(nat_block, block_addr); + ASSERT(ret >= 0); + node_info_from_raw_nat(&ni, + &nat_block->entries[nid % NAT_ENTRY_PER_BLOCK]); + if (ni.blk_addr == 0) + continue; + + ret = dev_read_block(node_block, ni.blk_addr); + ASSERT(ret >= 0); + memset(buf, 0, BUF_SZ); + snprintf(buf, BUF_SZ, + "nid:%5u\tino:%5u\toffset:%5u" + "\tblkaddr:%10u\tpack:%d\n", + ni.nid, ni.ino, + le32_to_cpu(node_block->footer.flag) >> + OFFSET_BIT_SHIFT, + ni.blk_addr, pack); + ret = write(fd, buf, strlen(buf)); + ASSERT(ret >= 0); } } diff --git a/fsck/fsck.h b/fsck/fsck.h index 5530aff..0916e30 100644 --- a/fsck/fsck.h +++ b/fsck/fsck.h @@ -206,7 +206,7 @@ struct dump_option { int32_t blk_addr; }; -extern void nat_dump(struct f2fs_sb_info *); +extern void nat_dump(struct f2fs_sb_info *, int, int); extern void sit_dump(struct f2fs_sb_info *, unsigned int, unsigned int); extern void ssa_dump(struct f2fs_sb_info *, int, int); extern void dump_node(struct f2fs_sb_info *, nid_t, int); diff --git a/fsck/main.c b/fsck/main.c index f6d12b0..714e28a 100644 --- a/fsck/main.c +++ b/fsck/main.c @@ -73,7 +73,7 @@ void dump_usage() MSG(0, "[options]:\n"); MSG(0, " -d debug level [default:0]\n"); MSG(0, " -i inode no (hex)\n"); - MSG(0, " -n [NAT dump segno from #1~#2 (decimal), for all 0~-1]\n"); + MSG(0, " -n [NAT dump nid from #1~#2 (decimal), for all 0~-1]\n"); MSG(0, " -s [SIT dump segno from #1~#2 (decimal), for all 0~-1]\n"); MSG(0, " -S sparse_mode\n"); MSG(0, " -a [SSA dump segno from #1~#2 (decimal), for all 0~-1]\n"); @@ -645,7 +645,7 @@ static void do_dump(struct f2fs_sb_info *sbi) if (opt->end_ssa == -1) opt->end_ssa = SM_I(sbi)->main_segments; if (opt->start_nat != -1) - nat_dump(sbi); + nat_dump(sbi, opt->start_nat, opt->end_nat); if (opt->start_sit != -1) sit_dump(sbi, opt->start_sit, opt->end_sit); if (opt->start_ssa != -1) -- 2.18.0 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH] dump.f2fs: only dump nat inside the specified nid range 2018-06-29 10:11 [PATCH] dump.f2fs: only dump nat inside the specified nid range Junling Zheng @ 2018-07-01 2:22 ` Chao Yu 2018-07-02 2:09 ` Junling Zheng 0 siblings, 1 reply; 10+ messages in thread From: Chao Yu @ 2018-07-01 2:22 UTC (permalink / raw) To: Junling Zheng, jaegeuk, yuchao0; +Cc: miaoxie, linux-f2fs-devel Hi Junling, On 2018/6/29 18:11, Junling Zheng wrote: > Only dump nat info of nids inside the specified range. > > Signed-off-by: Junling Zheng <zhengjunling@huawei.com> > --- > fsck/dump.c | 79 ++++++++++++++++++++++++----------------------------- > fsck/fsck.h | 2 +- > fsck/main.c | 4 +-- > 3 files changed, 38 insertions(+), 47 deletions(-) > > diff --git a/fsck/dump.c b/fsck/dump.c > index 9236a43..89cff83 100644 > --- a/fsck/dump.c > +++ b/fsck/dump.c > @@ -31,32 +31,34 @@ const char *seg_type_name[SEG_TYPE_MAX + 1] = { > "SEG_TYPE_NONE", > }; > > -void nat_dump(struct f2fs_sb_info *sbi) > +void nat_dump(struct f2fs_sb_info *sbi, int start_nat, int end_nat) > { > - struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi); > struct f2fs_nm_info *nm_i = NM_I(sbi); > struct f2fs_nat_block *nat_block; > struct f2fs_node *node_block; > - u32 nr_nat_blks, nid; > + u32 nid; > pgoff_t block_off; > pgoff_t block_addr; > char buf[BUF_SZ]; > int seg_off; > int fd, ret, pack; > - unsigned int i; > > nat_block = (struct f2fs_nat_block *)calloc(BLOCK_SZ, 1); move ASSERT(nat_block) here. > node_block = (struct f2fs_node *)calloc(BLOCK_SZ, 1); > ASSERT(nat_block); > - > - nr_nat_blks = get_sb(segment_count_nat) << > - (sbi->log_blocks_per_seg - 1); > + ASSERT(node_block); > > fd = open("dump_nat", O_CREAT|O_WRONLY|O_TRUNC, 0666); > ASSERT(fd >= 0); > > - for (block_off = 0; block_off < nr_nat_blks; pack = 1, block_off++) { > + for (nid = start_nat; nid < end_nat; pack = 1, nid++) { > + struct f2fs_nat_entry raw_nat; > + struct node_info ni; > + if(nid == 0 || nid == 1 || nid == 2 ) minor cleanup if (nid == 0 || nid == F2FS_NODE_INO(sbi) || nid == F2FS_META_INO(sbi)) > + continue; > > + ni.nid = nid; > + block_off = nid / NAT_ENTRY_PER_BLOCK; > seg_off = block_off >> sbi->log_blocks_per_seg; > block_addr = (pgoff_t)(nm_i->nat_blkaddr + > (seg_off << sbi->log_blocks_per_seg << 1) + > @@ -67,42 +69,11 @@ void nat_dump(struct f2fs_sb_info *sbi) > pack = 2; > } > > - ret = dev_read_block(nat_block, block_addr); > - ASSERT(ret >= 0); > - > - nid = block_off * NAT_ENTRY_PER_BLOCK; > - for (i = 0; i < NAT_ENTRY_PER_BLOCK; i++) { > - struct f2fs_nat_entry raw_nat; > - struct node_info ni; > - ni.nid = nid + i; > - > - if(nid + i == 0 || nid + i == 1 || nid + i == 2 ) > - continue; > - if (lookup_nat_in_journal(sbi, nid + i, > - &raw_nat) >= 0) { > - node_info_from_raw_nat(&ni, &raw_nat); > - ret = dev_read_block(node_block, ni.blk_addr); > - ASSERT(ret >= 0); > - if (ni.blk_addr != 0x0) { > - memset(buf, 0, BUF_SZ); > - snprintf(buf, BUF_SZ, > - "nid:%5u\tino:%5u\toffset:%5u" > - "\tblkaddr:%10u\tpack:%d\n", > - ni.nid, ni.ino, > - le32_to_cpu(node_block->footer.flag) >> > - OFFSET_BIT_SHIFT, > - ni.blk_addr, pack); > - ret = write(fd, buf, strlen(buf)); > - ASSERT(ret >= 0); > - } > - } else { > - node_info_from_raw_nat(&ni, > - &nat_block->entries[i]); > - if (ni.blk_addr == 0) > - continue; > - > - ret = dev_read_block(node_block, ni.blk_addr); > - ASSERT(ret >= 0); > + if (lookup_nat_in_journal(sbi, nid, &raw_nat) >= 0) { > + node_info_from_raw_nat(&ni, &raw_nat); > + ret = dev_read_block(node_block, ni.blk_addr); > + ASSERT(ret >= 0); > + if (ni.blk_addr != 0x0) { > memset(buf, 0, BUF_SZ); > snprintf(buf, BUF_SZ, > "nid:%5u\tino:%5u\toffset:%5u" > @@ -114,6 +85,26 @@ void nat_dump(struct f2fs_sb_info *sbi) > ret = write(fd, buf, strlen(buf)); > ASSERT(ret >= 0); > } > + } else { > + ret = dev_read_block(nat_block, block_addr); > + ASSERT(ret >= 0); > + node_info_from_raw_nat(&ni, > + &nat_block->entries[nid % NAT_ENTRY_PER_BLOCK]); > + if (ni.blk_addr == 0) > + continue; > + > + ret = dev_read_block(node_block, ni.blk_addr); > + ASSERT(ret >= 0); > + memset(buf, 0, BUF_SZ); > + snprintf(buf, BUF_SZ, > + "nid:%5u\tino:%5u\toffset:%5u" > + "\tblkaddr:%10u\tpack:%d\n", > + ni.nid, ni.ino, > + le32_to_cpu(node_block->footer.flag) >> > + OFFSET_BIT_SHIFT, > + ni.blk_addr, pack); > + ret = write(fd, buf, strlen(buf)); > + ASSERT(ret >= 0); > } > } > > diff --git a/fsck/fsck.h b/fsck/fsck.h > index 5530aff..0916e30 100644 > --- a/fsck/fsck.h > +++ b/fsck/fsck.h > @@ -206,7 +206,7 @@ struct dump_option { > int32_t blk_addr; > }; > > -extern void nat_dump(struct f2fs_sb_info *); > +extern void nat_dump(struct f2fs_sb_info *, int, int); > extern void sit_dump(struct f2fs_sb_info *, unsigned int, unsigned int); > extern void ssa_dump(struct f2fs_sb_info *, int, int); > extern void dump_node(struct f2fs_sb_info *, nid_t, int); > diff --git a/fsck/main.c b/fsck/main.c > index f6d12b0..714e28a 100644 > --- a/fsck/main.c > +++ b/fsck/main.c > @@ -73,7 +73,7 @@ void dump_usage() > MSG(0, "[options]:\n"); > MSG(0, " -d debug level [default:0]\n"); > MSG(0, " -i inode no (hex)\n"); > - MSG(0, " -n [NAT dump segno from #1~#2 (decimal), for all 0~-1]\n"); Original interface was going to dump NAT entries with segment granularity, how about just keeping old definition of this interface. Although if we can support dumping with smaller granularity will be good, but I don't think there is be such demand. Thanks, > + MSG(0, " -n [NAT dump nid from #1~#2 (decimal), for all 0~-1]\n"); > MSG(0, " -s [SIT dump segno from #1~#2 (decimal), for all 0~-1]\n"); > MSG(0, " -S sparse_mode\n"); > MSG(0, " -a [SSA dump segno from #1~#2 (decimal), for all 0~-1]\n"); > @@ -645,7 +645,7 @@ static void do_dump(struct f2fs_sb_info *sbi) > if (opt->end_ssa == -1) > opt->end_ssa = SM_I(sbi)->main_segments; > if (opt->start_nat != -1) > - nat_dump(sbi); > + nat_dump(sbi, opt->start_nat, opt->end_nat); > if (opt->start_sit != -1) > sit_dump(sbi, opt->start_sit, opt->end_sit); > if (opt->start_ssa != -1) > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] dump.f2fs: only dump nat inside the specified nid range 2018-07-01 2:22 ` Chao Yu @ 2018-07-02 2:09 ` Junling Zheng 2018-07-02 2:43 ` Chao Yu 0 siblings, 1 reply; 10+ messages in thread From: Junling Zheng @ 2018-07-02 2:09 UTC (permalink / raw) To: Chao Yu, jaegeuk, yuchao0; +Cc: miaoxie, linux-f2fs-devel Hi, Chao On 2018/7/1 10:22, Chao Yu wrote: > Hi Junling, > > On 2018/6/29 18:11, Junling Zheng wrote: >> Only dump nat info of nids inside the specified range. >> >> Signed-off-by: Junling Zheng <zhengjunling@huawei.com> >> --- >> fsck/dump.c | 79 ++++++++++++++++++++++++----------------------------- >> fsck/fsck.h | 2 +- >> fsck/main.c | 4 +-- >> 3 files changed, 38 insertions(+), 47 deletions(-) >> >> diff --git a/fsck/dump.c b/fsck/dump.c >> index 9236a43..89cff83 100644 >> --- a/fsck/dump.c >> +++ b/fsck/dump.c >> @@ -31,32 +31,34 @@ const char *seg_type_name[SEG_TYPE_MAX + 1] = { >> "SEG_TYPE_NONE", >> }; >> >> -void nat_dump(struct f2fs_sb_info *sbi) >> +void nat_dump(struct f2fs_sb_info *sbi, int start_nat, int end_nat) >> { >> - struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi); >> struct f2fs_nm_info *nm_i = NM_I(sbi); >> struct f2fs_nat_block *nat_block; >> struct f2fs_node *node_block; >> - u32 nr_nat_blks, nid; >> + u32 nid; >> pgoff_t block_off; >> pgoff_t block_addr; >> char buf[BUF_SZ]; >> int seg_off; >> int fd, ret, pack; >> - unsigned int i; >> >> nat_block = (struct f2fs_nat_block *)calloc(BLOCK_SZ, 1); > > move ASSERT(nat_block) here. > Yeah, right. >> node_block = (struct f2fs_node *)calloc(BLOCK_SZ, 1); >> ASSERT(nat_block); >> - >> - nr_nat_blks = get_sb(segment_count_nat) << >> - (sbi->log_blocks_per_seg - 1); >> + ASSERT(node_block); >> >> fd = open("dump_nat", O_CREAT|O_WRONLY|O_TRUNC, 0666); >> ASSERT(fd >= 0); >> >> - for (block_off = 0; block_off < nr_nat_blks; pack = 1, block_off++) { >> + for (nid = start_nat; nid < end_nat; pack = 1, nid++) { >> + struct f2fs_nat_entry raw_nat; >> + struct node_info ni; >> + if(nid == 0 || nid == 1 || nid == 2 ) > > minor cleanup > > if (nid == 0 || nid == F2FS_NODE_INO(sbi) || nid == F2FS_META_INO(sbi)) > OK. >> + continue; >> >> + ni.nid = nid; >> + block_off = nid / NAT_ENTRY_PER_BLOCK; >> seg_off = block_off >> sbi->log_blocks_per_seg; >> block_addr = (pgoff_t)(nm_i->nat_blkaddr + >> (seg_off << sbi->log_blocks_per_seg << 1) + >> @@ -67,42 +69,11 @@ void nat_dump(struct f2fs_sb_info *sbi) >> pack = 2; >> } >> >> - ret = dev_read_block(nat_block, block_addr); >> - ASSERT(ret >= 0); >> - >> - nid = block_off * NAT_ENTRY_PER_BLOCK; >> - for (i = 0; i < NAT_ENTRY_PER_BLOCK; i++) { >> - struct f2fs_nat_entry raw_nat; >> - struct node_info ni; >> - ni.nid = nid + i; >> - >> - if(nid + i == 0 || nid + i == 1 || nid + i == 2 ) >> - continue; >> - if (lookup_nat_in_journal(sbi, nid + i, >> - &raw_nat) >= 0) { >> - node_info_from_raw_nat(&ni, &raw_nat); >> - ret = dev_read_block(node_block, ni.blk_addr); >> - ASSERT(ret >= 0); >> - if (ni.blk_addr != 0x0) { >> - memset(buf, 0, BUF_SZ); >> - snprintf(buf, BUF_SZ, >> - "nid:%5u\tino:%5u\toffset:%5u" >> - "\tblkaddr:%10u\tpack:%d\n", >> - ni.nid, ni.ino, >> - le32_to_cpu(node_block->footer.flag) >> >> - OFFSET_BIT_SHIFT, >> - ni.blk_addr, pack); >> - ret = write(fd, buf, strlen(buf)); >> - ASSERT(ret >= 0); >> - } >> - } else { >> - node_info_from_raw_nat(&ni, >> - &nat_block->entries[i]); >> - if (ni.blk_addr == 0) >> - continue; >> - >> - ret = dev_read_block(node_block, ni.blk_addr); >> - ASSERT(ret >= 0); >> + if (lookup_nat_in_journal(sbi, nid, &raw_nat) >= 0) { >> + node_info_from_raw_nat(&ni, &raw_nat); >> + ret = dev_read_block(node_block, ni.blk_addr); >> + ASSERT(ret >= 0); >> + if (ni.blk_addr != 0x0) { >> memset(buf, 0, BUF_SZ); >> snprintf(buf, BUF_SZ, >> "nid:%5u\tino:%5u\toffset:%5u" >> @@ -114,6 +85,26 @@ void nat_dump(struct f2fs_sb_info *sbi) >> ret = write(fd, buf, strlen(buf)); >> ASSERT(ret >= 0); >> } >> + } else { >> + ret = dev_read_block(nat_block, block_addr); >> + ASSERT(ret >= 0); >> + node_info_from_raw_nat(&ni, >> + &nat_block->entries[nid % NAT_ENTRY_PER_BLOCK]); >> + if (ni.blk_addr == 0) >> + continue; >> + >> + ret = dev_read_block(node_block, ni.blk_addr); >> + ASSERT(ret >= 0); >> + memset(buf, 0, BUF_SZ); >> + snprintf(buf, BUF_SZ, >> + "nid:%5u\tino:%5u\toffset:%5u" >> + "\tblkaddr:%10u\tpack:%d\n", >> + ni.nid, ni.ino, >> + le32_to_cpu(node_block->footer.flag) >> >> + OFFSET_BIT_SHIFT, >> + ni.blk_addr, pack); >> + ret = write(fd, buf, strlen(buf)); >> + ASSERT(ret >= 0); >> } >> } >> >> diff --git a/fsck/fsck.h b/fsck/fsck.h >> index 5530aff..0916e30 100644 >> --- a/fsck/fsck.h >> +++ b/fsck/fsck.h >> @@ -206,7 +206,7 @@ struct dump_option { >> int32_t blk_addr; >> }; >> >> -extern void nat_dump(struct f2fs_sb_info *); >> +extern void nat_dump(struct f2fs_sb_info *, int, int); >> extern void sit_dump(struct f2fs_sb_info *, unsigned int, unsigned int); >> extern void ssa_dump(struct f2fs_sb_info *, int, int); >> extern void dump_node(struct f2fs_sb_info *, nid_t, int); >> diff --git a/fsck/main.c b/fsck/main.c >> index f6d12b0..714e28a 100644 >> --- a/fsck/main.c >> +++ b/fsck/main.c >> @@ -73,7 +73,7 @@ void dump_usage() >> MSG(0, "[options]:\n"); >> MSG(0, " -d debug level [default:0]\n"); >> MSG(0, " -i inode no (hex)\n"); >> - MSG(0, " -n [NAT dump segno from #1~#2 (decimal), for all 0~-1]\n"); > > Original interface was going to dump NAT entries with segment granularity, how > about just keeping old definition of this interface. Although if we can support > dumping with smaller granularity will be good, but I don't think there is be > such demand. > I don't think "original interface was going to dump NAT entries with segment granularity", because opt->end_nat = NM_I(sbi)->max_nid, which is calculated with node granularity in do_dump, so I prefer to think it's a typo here :) > Thanks, > >> + MSG(0, " -n [NAT dump nid from #1~#2 (decimal), for all 0~-1]\n"); >> MSG(0, " -s [SIT dump segno from #1~#2 (decimal), for all 0~-1]\n"); >> MSG(0, " -S sparse_mode\n"); >> MSG(0, " -a [SSA dump segno from #1~#2 (decimal), for all 0~-1]\n"); >> @@ -645,7 +645,7 @@ static void do_dump(struct f2fs_sb_info *sbi) >> if (opt->end_ssa == -1) >> opt->end_ssa = SM_I(sbi)->main_segments; >> if (opt->start_nat != -1) >> - nat_dump(sbi); >> + nat_dump(sbi, opt->start_nat, opt->end_nat); >> if (opt->start_sit != -1) >> sit_dump(sbi, opt->start_sit, opt->end_sit); >> if (opt->start_ssa != -1) >> > > . > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] dump.f2fs: only dump nat inside the specified nid range 2018-07-02 2:09 ` Junling Zheng @ 2018-07-02 2:43 ` Chao Yu 2018-07-02 3:25 ` Junling Zheng 0 siblings, 1 reply; 10+ messages in thread From: Chao Yu @ 2018-07-02 2:43 UTC (permalink / raw) To: Junling Zheng, Chao Yu, jaegeuk; +Cc: miaoxie, linux-f2fs-devel Hi Junling, On 2018/7/2 10:09, Junling Zheng wrote: > Hi, Chao > > On 2018/7/1 10:22, Chao Yu wrote: >> Hi Junling, >> >> On 2018/6/29 18:11, Junling Zheng wrote: >>> Only dump nat info of nids inside the specified range. >>> >>> Signed-off-by: Junling Zheng <zhengjunling@huawei.com> >>> --- >>> fsck/dump.c | 79 ++++++++++++++++++++++++----------------------------- >>> fsck/fsck.h | 2 +- >>> fsck/main.c | 4 +-- >>> 3 files changed, 38 insertions(+), 47 deletions(-) >>> >>> diff --git a/fsck/dump.c b/fsck/dump.c >>> index 9236a43..89cff83 100644 >>> --- a/fsck/dump.c >>> +++ b/fsck/dump.c >>> @@ -31,32 +31,34 @@ const char *seg_type_name[SEG_TYPE_MAX + 1] = { >>> "SEG_TYPE_NONE", >>> }; >>> >>> -void nat_dump(struct f2fs_sb_info *sbi) >>> +void nat_dump(struct f2fs_sb_info *sbi, int start_nat, int end_nat) >>> { >>> - struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi); >>> struct f2fs_nm_info *nm_i = NM_I(sbi); >>> struct f2fs_nat_block *nat_block; >>> struct f2fs_node *node_block; >>> - u32 nr_nat_blks, nid; >>> + u32 nid; >>> pgoff_t block_off; >>> pgoff_t block_addr; >>> char buf[BUF_SZ]; >>> int seg_off; >>> int fd, ret, pack; >>> - unsigned int i; >>> >>> nat_block = (struct f2fs_nat_block *)calloc(BLOCK_SZ, 1); >> >> move ASSERT(nat_block) here. >> > > Yeah, right. > >>> node_block = (struct f2fs_node *)calloc(BLOCK_SZ, 1); >>> ASSERT(nat_block); >>> - >>> - nr_nat_blks = get_sb(segment_count_nat) << >>> - (sbi->log_blocks_per_seg - 1); >>> + ASSERT(node_block); >>> >>> fd = open("dump_nat", O_CREAT|O_WRONLY|O_TRUNC, 0666); >>> ASSERT(fd >= 0); >>> >>> - for (block_off = 0; block_off < nr_nat_blks; pack = 1, block_off++) { >>> + for (nid = start_nat; nid < end_nat; pack = 1, nid++) { >>> + struct f2fs_nat_entry raw_nat; >>> + struct node_info ni; >>> + if(nid == 0 || nid == 1 || nid == 2 ) >> >> minor cleanup >> >> if (nid == 0 || nid == F2FS_NODE_INO(sbi) || nid == F2FS_META_INO(sbi)) >> > > OK. > >>> + continue; >>> >>> + ni.nid = nid; >>> + block_off = nid / NAT_ENTRY_PER_BLOCK; >>> seg_off = block_off >> sbi->log_blocks_per_seg; >>> block_addr = (pgoff_t)(nm_i->nat_blkaddr + >>> (seg_off << sbi->log_blocks_per_seg << 1) + >>> @@ -67,42 +69,11 @@ void nat_dump(struct f2fs_sb_info *sbi) >>> pack = 2; >>> } >>> >>> - ret = dev_read_block(nat_block, block_addr); >>> - ASSERT(ret >= 0); >>> - >>> - nid = block_off * NAT_ENTRY_PER_BLOCK; >>> - for (i = 0; i < NAT_ENTRY_PER_BLOCK; i++) { >>> - struct f2fs_nat_entry raw_nat; >>> - struct node_info ni; >>> - ni.nid = nid + i; >>> - >>> - if(nid + i == 0 || nid + i == 1 || nid + i == 2 ) >>> - continue; >>> - if (lookup_nat_in_journal(sbi, nid + i, >>> - &raw_nat) >= 0) { >>> - node_info_from_raw_nat(&ni, &raw_nat); >>> - ret = dev_read_block(node_block, ni.blk_addr); >>> - ASSERT(ret >= 0); >>> - if (ni.blk_addr != 0x0) { >>> - memset(buf, 0, BUF_SZ); >>> - snprintf(buf, BUF_SZ, >>> - "nid:%5u\tino:%5u\toffset:%5u" >>> - "\tblkaddr:%10u\tpack:%d\n", >>> - ni.nid, ni.ino, >>> - le32_to_cpu(node_block->footer.flag) >> >>> - OFFSET_BIT_SHIFT, >>> - ni.blk_addr, pack); >>> - ret = write(fd, buf, strlen(buf)); >>> - ASSERT(ret >= 0); >>> - } >>> - } else { >>> - node_info_from_raw_nat(&ni, >>> - &nat_block->entries[i]); >>> - if (ni.blk_addr == 0) >>> - continue; >>> - >>> - ret = dev_read_block(node_block, ni.blk_addr); >>> - ASSERT(ret >= 0); >>> + if (lookup_nat_in_journal(sbi, nid, &raw_nat) >= 0) { >>> + node_info_from_raw_nat(&ni, &raw_nat); >>> + ret = dev_read_block(node_block, ni.blk_addr); >>> + ASSERT(ret >= 0); >>> + if (ni.blk_addr != 0x0) { >>> memset(buf, 0, BUF_SZ); >>> snprintf(buf, BUF_SZ, >>> "nid:%5u\tino:%5u\toffset:%5u" >>> @@ -114,6 +85,26 @@ void nat_dump(struct f2fs_sb_info *sbi) >>> ret = write(fd, buf, strlen(buf)); >>> ASSERT(ret >= 0); >>> } >>> + } else { >>> + ret = dev_read_block(nat_block, block_addr); >>> + ASSERT(ret >= 0); >>> + node_info_from_raw_nat(&ni, >>> + &nat_block->entries[nid % NAT_ENTRY_PER_BLOCK]); >>> + if (ni.blk_addr == 0) >>> + continue; >>> + >>> + ret = dev_read_block(node_block, ni.blk_addr); >>> + ASSERT(ret >= 0); >>> + memset(buf, 0, BUF_SZ); >>> + snprintf(buf, BUF_SZ, >>> + "nid:%5u\tino:%5u\toffset:%5u" >>> + "\tblkaddr:%10u\tpack:%d\n", >>> + ni.nid, ni.ino, >>> + le32_to_cpu(node_block->footer.flag) >> >>> + OFFSET_BIT_SHIFT, >>> + ni.blk_addr, pack); >>> + ret = write(fd, buf, strlen(buf)); >>> + ASSERT(ret >= 0); >>> } >>> } >>> >>> diff --git a/fsck/fsck.h b/fsck/fsck.h >>> index 5530aff..0916e30 100644 >>> --- a/fsck/fsck.h >>> +++ b/fsck/fsck.h >>> @@ -206,7 +206,7 @@ struct dump_option { >>> int32_t blk_addr; >>> }; >>> >>> -extern void nat_dump(struct f2fs_sb_info *); >>> +extern void nat_dump(struct f2fs_sb_info *, int, int); >>> extern void sit_dump(struct f2fs_sb_info *, unsigned int, unsigned int); >>> extern void ssa_dump(struct f2fs_sb_info *, int, int); >>> extern void dump_node(struct f2fs_sb_info *, nid_t, int); >>> diff --git a/fsck/main.c b/fsck/main.c >>> index f6d12b0..714e28a 100644 >>> --- a/fsck/main.c >>> +++ b/fsck/main.c >>> @@ -73,7 +73,7 @@ void dump_usage() >>> MSG(0, "[options]:\n"); >>> MSG(0, " -d debug level [default:0]\n"); >>> MSG(0, " -i inode no (hex)\n"); >>> - MSG(0, " -n [NAT dump segno from #1~#2 (decimal), for all 0~-1]\n"); >> >> Original interface was going to dump NAT entries with segment granularity, how >> about just keeping old definition of this interface. Although if we can support >> dumping with smaller granularity will be good, but I don't think there is be >> such demand. >> > > I don't think "original interface was going to dump NAT entries with segment > granularity", because opt->end_nat = NM_I(sbi)->max_nid, which is calculated > with node granularity in do_dump, so I prefer to think it's a typo here :) Oh, I found that the manual is missed for this functionality... the original functionality is implemented by Yunlei, so, to Yunlei, can you check the inconsistence, and what's the original thought? Thanks, > >> Thanks, >> >>> + MSG(0, " -n [NAT dump nid from #1~#2 (decimal), for all 0~-1]\n"); >>> MSG(0, " -s [SIT dump segno from #1~#2 (decimal), for all 0~-1]\n"); >>> MSG(0, " -S sparse_mode\n"); >>> MSG(0, " -a [SSA dump segno from #1~#2 (decimal), for all 0~-1]\n"); >>> @@ -645,7 +645,7 @@ static void do_dump(struct f2fs_sb_info *sbi) >>> if (opt->end_ssa == -1) >>> opt->end_ssa = SM_I(sbi)->main_segments; >>> if (opt->start_nat != -1) >>> - nat_dump(sbi); >>> + nat_dump(sbi, opt->start_nat, opt->end_nat); >>> if (opt->start_sit != -1) >>> sit_dump(sbi, opt->start_sit, opt->end_sit); >>> if (opt->start_ssa != -1) >>> >> >> . >> > > > > . > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] dump.f2fs: only dump nat inside the specified nid range 2018-07-02 2:43 ` Chao Yu @ 2018-07-02 3:25 ` Junling Zheng 2018-07-02 3:39 ` Chao Yu 2018-07-02 3:59 ` [PATCH v2] " Junling Zheng 0 siblings, 2 replies; 10+ messages in thread From: Junling Zheng @ 2018-07-02 3:25 UTC (permalink / raw) To: Chao Yu, Chao Yu, jaegeuk, He Yunlei; +Cc: miaoxie, linux-f2fs-devel On 2018/7/2 10:43, Chao Yu wrote: > Hi Junling, > > On 2018/7/2 10:09, Junling Zheng wrote: >> Hi, Chao >> >> On 2018/7/1 10:22, Chao Yu wrote: >>> Hi Junling, >>> >>> On 2018/6/29 18:11, Junling Zheng wrote: >>>> Only dump nat info of nids inside the specified range. >>>> >>>> Signed-off-by: Junling Zheng <zhengjunling@huawei.com> >>>> --- >>>> fsck/dump.c | 79 ++++++++++++++++++++++++----------------------------- >>>> fsck/fsck.h | 2 +- >>>> fsck/main.c | 4 +-- >>>> 3 files changed, 38 insertions(+), 47 deletions(-) >>>> >>>> diff --git a/fsck/dump.c b/fsck/dump.c >>>> index 9236a43..89cff83 100644 >>>> --- a/fsck/dump.c >>>> +++ b/fsck/dump.c >>>> @@ -31,32 +31,34 @@ const char *seg_type_name[SEG_TYPE_MAX + 1] = { >>>> "SEG_TYPE_NONE", >>>> }; >>>> >>>> -void nat_dump(struct f2fs_sb_info *sbi) >>>> +void nat_dump(struct f2fs_sb_info *sbi, int start_nat, int end_nat) >>>> { >>>> - struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi); >>>> struct f2fs_nm_info *nm_i = NM_I(sbi); >>>> struct f2fs_nat_block *nat_block; >>>> struct f2fs_node *node_block; >>>> - u32 nr_nat_blks, nid; >>>> + u32 nid; >>>> pgoff_t block_off; >>>> pgoff_t block_addr; >>>> char buf[BUF_SZ]; >>>> int seg_off; >>>> int fd, ret, pack; >>>> - unsigned int i; >>>> >>>> nat_block = (struct f2fs_nat_block *)calloc(BLOCK_SZ, 1); >>> >>> move ASSERT(nat_block) here. >>> >> >> Yeah, right. >> >>>> node_block = (struct f2fs_node *)calloc(BLOCK_SZ, 1); >>>> ASSERT(nat_block); >>>> - >>>> - nr_nat_blks = get_sb(segment_count_nat) << >>>> - (sbi->log_blocks_per_seg - 1); >>>> + ASSERT(node_block); >>>> >>>> fd = open("dump_nat", O_CREAT|O_WRONLY|O_TRUNC, 0666); >>>> ASSERT(fd >= 0); >>>> >>>> - for (block_off = 0; block_off < nr_nat_blks; pack = 1, block_off++) { >>>> + for (nid = start_nat; nid < end_nat; pack = 1, nid++) { >>>> + struct f2fs_nat_entry raw_nat; >>>> + struct node_info ni; >>>> + if(nid == 0 || nid == 1 || nid == 2 ) >>> >>> minor cleanup >>> >>> if (nid == 0 || nid == F2FS_NODE_INO(sbi) || nid == F2FS_META_INO(sbi)) >>> >> >> OK. >> >>>> + continue; >>>> >>>> + ni.nid = nid; >>>> + block_off = nid / NAT_ENTRY_PER_BLOCK; >>>> seg_off = block_off >> sbi->log_blocks_per_seg; >>>> block_addr = (pgoff_t)(nm_i->nat_blkaddr + >>>> (seg_off << sbi->log_blocks_per_seg << 1) + >>>> @@ -67,42 +69,11 @@ void nat_dump(struct f2fs_sb_info *sbi) >>>> pack = 2; >>>> } >>>> >>>> - ret = dev_read_block(nat_block, block_addr); >>>> - ASSERT(ret >= 0); >>>> - >>>> - nid = block_off * NAT_ENTRY_PER_BLOCK; >>>> - for (i = 0; i < NAT_ENTRY_PER_BLOCK; i++) { >>>> - struct f2fs_nat_entry raw_nat; >>>> - struct node_info ni; >>>> - ni.nid = nid + i; >>>> - >>>> - if(nid + i == 0 || nid + i == 1 || nid + i == 2 ) >>>> - continue; >>>> - if (lookup_nat_in_journal(sbi, nid + i, >>>> - &raw_nat) >= 0) { >>>> - node_info_from_raw_nat(&ni, &raw_nat); >>>> - ret = dev_read_block(node_block, ni.blk_addr); >>>> - ASSERT(ret >= 0); >>>> - if (ni.blk_addr != 0x0) { >>>> - memset(buf, 0, BUF_SZ); >>>> - snprintf(buf, BUF_SZ, >>>> - "nid:%5u\tino:%5u\toffset:%5u" >>>> - "\tblkaddr:%10u\tpack:%d\n", >>>> - ni.nid, ni.ino, >>>> - le32_to_cpu(node_block->footer.flag) >> >>>> - OFFSET_BIT_SHIFT, >>>> - ni.blk_addr, pack); >>>> - ret = write(fd, buf, strlen(buf)); >>>> - ASSERT(ret >= 0); >>>> - } >>>> - } else { >>>> - node_info_from_raw_nat(&ni, >>>> - &nat_block->entries[i]); >>>> - if (ni.blk_addr == 0) >>>> - continue; >>>> - >>>> - ret = dev_read_block(node_block, ni.blk_addr); >>>> - ASSERT(ret >= 0); >>>> + if (lookup_nat_in_journal(sbi, nid, &raw_nat) >= 0) { >>>> + node_info_from_raw_nat(&ni, &raw_nat); >>>> + ret = dev_read_block(node_block, ni.blk_addr); >>>> + ASSERT(ret >= 0); >>>> + if (ni.blk_addr != 0x0) { >>>> memset(buf, 0, BUF_SZ); >>>> snprintf(buf, BUF_SZ, >>>> "nid:%5u\tino:%5u\toffset:%5u" >>>> @@ -114,6 +85,26 @@ void nat_dump(struct f2fs_sb_info *sbi) >>>> ret = write(fd, buf, strlen(buf)); >>>> ASSERT(ret >= 0); >>>> } >>>> + } else { >>>> + ret = dev_read_block(nat_block, block_addr); >>>> + ASSERT(ret >= 0); >>>> + node_info_from_raw_nat(&ni, >>>> + &nat_block->entries[nid % NAT_ENTRY_PER_BLOCK]); >>>> + if (ni.blk_addr == 0) >>>> + continue; >>>> + >>>> + ret = dev_read_block(node_block, ni.blk_addr); >>>> + ASSERT(ret >= 0); >>>> + memset(buf, 0, BUF_SZ); >>>> + snprintf(buf, BUF_SZ, >>>> + "nid:%5u\tino:%5u\toffset:%5u" >>>> + "\tblkaddr:%10u\tpack:%d\n", >>>> + ni.nid, ni.ino, >>>> + le32_to_cpu(node_block->footer.flag) >> >>>> + OFFSET_BIT_SHIFT, >>>> + ni.blk_addr, pack); >>>> + ret = write(fd, buf, strlen(buf)); >>>> + ASSERT(ret >= 0); >>>> } >>>> } >>>> >>>> diff --git a/fsck/fsck.h b/fsck/fsck.h >>>> index 5530aff..0916e30 100644 >>>> --- a/fsck/fsck.h >>>> +++ b/fsck/fsck.h >>>> @@ -206,7 +206,7 @@ struct dump_option { >>>> int32_t blk_addr; >>>> }; >>>> >>>> -extern void nat_dump(struct f2fs_sb_info *); >>>> +extern void nat_dump(struct f2fs_sb_info *, int, int); >>>> extern void sit_dump(struct f2fs_sb_info *, unsigned int, unsigned int); >>>> extern void ssa_dump(struct f2fs_sb_info *, int, int); >>>> extern void dump_node(struct f2fs_sb_info *, nid_t, int); >>>> diff --git a/fsck/main.c b/fsck/main.c >>>> index f6d12b0..714e28a 100644 >>>> --- a/fsck/main.c >>>> +++ b/fsck/main.c >>>> @@ -73,7 +73,7 @@ void dump_usage() >>>> MSG(0, "[options]:\n"); >>>> MSG(0, " -d debug level [default:0]\n"); >>>> MSG(0, " -i inode no (hex)\n"); >>>> - MSG(0, " -n [NAT dump segno from #1~#2 (decimal), for all 0~-1]\n"); >>> >>> Original interface was going to dump NAT entries with segment granularity, how >>> about just keeping old definition of this interface. Although if we can support >>> dumping with smaller granularity will be good, but I don't think there is be >>> such demand. >>> >> >> I don't think "original interface was going to dump NAT entries with segment >> granularity", because opt->end_nat = NM_I(sbi)->max_nid, which is calculated >> with node granularity in do_dump, so I prefer to think it's a typo here :) > > Oh, I found that the manual is missed for this functionality... the original > functionality is implemented by Yunlei, so, to Yunlei, can you check the > inconsistence, and what's the original thought? > Yeah, I've confirmed with him. His original thought was to dump nat entries with start nid and end nid, however, his implementation in "fsck.f2fs: modify sit dump && add nat dump" dumped all nids' nat entries. I'll send a patch v2 to adjust the above two points and update the man page of dump.f2fs :) Thanks, Junling > Thanks, > >> >>> Thanks, >>> >>>> + MSG(0, " -n [NAT dump nid from #1~#2 (decimal), for all 0~-1]\n"); >>>> MSG(0, " -s [SIT dump segno from #1~#2 (decimal), for all 0~-1]\n"); >>>> MSG(0, " -S sparse_mode\n"); >>>> MSG(0, " -a [SSA dump segno from #1~#2 (decimal), for all 0~-1]\n"); >>>> @@ -645,7 +645,7 @@ static void do_dump(struct f2fs_sb_info *sbi) >>>> if (opt->end_ssa == -1) >>>> opt->end_ssa = SM_I(sbi)->main_segments; >>>> if (opt->start_nat != -1) >>>> - nat_dump(sbi); >>>> + nat_dump(sbi, opt->start_nat, opt->end_nat); >>>> if (opt->start_sit != -1) >>>> sit_dump(sbi, opt->start_sit, opt->end_sit); >>>> if (opt->start_ssa != -1) >>>> >>> >>> . >>> >> >> >> >> . >> > > > . > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH] dump.f2fs: only dump nat inside the specified nid range 2018-07-02 3:25 ` Junling Zheng @ 2018-07-02 3:39 ` Chao Yu 2018-07-02 3:59 ` [PATCH v2] " Junling Zheng 1 sibling, 0 replies; 10+ messages in thread From: Chao Yu @ 2018-07-02 3:39 UTC (permalink / raw) To: Junling Zheng, Chao Yu, jaegeuk, He Yunlei; +Cc: miaoxie, linux-f2fs-devel On 2018/7/2 11:25, Junling Zheng wrote: > On 2018/7/2 10:43, Chao Yu wrote: >> Hi Junling, >> >> On 2018/7/2 10:09, Junling Zheng wrote: >>> Hi, Chao >>> >>> On 2018/7/1 10:22, Chao Yu wrote: >>>> Hi Junling, >>>> >>>> On 2018/6/29 18:11, Junling Zheng wrote: >>>>> Only dump nat info of nids inside the specified range. >>>>> >>>>> Signed-off-by: Junling Zheng <zhengjunling@huawei.com> >>>>> --- >>>>> fsck/dump.c | 79 ++++++++++++++++++++++++----------------------------- >>>>> fsck/fsck.h | 2 +- >>>>> fsck/main.c | 4 +-- >>>>> 3 files changed, 38 insertions(+), 47 deletions(-) >>>>> >>>>> diff --git a/fsck/dump.c b/fsck/dump.c >>>>> index 9236a43..89cff83 100644 >>>>> --- a/fsck/dump.c >>>>> +++ b/fsck/dump.c >>>>> @@ -31,32 +31,34 @@ const char *seg_type_name[SEG_TYPE_MAX + 1] = { >>>>> "SEG_TYPE_NONE", >>>>> }; >>>>> >>>>> -void nat_dump(struct f2fs_sb_info *sbi) >>>>> +void nat_dump(struct f2fs_sb_info *sbi, int start_nat, int end_nat) >>>>> { >>>>> - struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi); >>>>> struct f2fs_nm_info *nm_i = NM_I(sbi); >>>>> struct f2fs_nat_block *nat_block; >>>>> struct f2fs_node *node_block; >>>>> - u32 nr_nat_blks, nid; >>>>> + u32 nid; >>>>> pgoff_t block_off; >>>>> pgoff_t block_addr; >>>>> char buf[BUF_SZ]; >>>>> int seg_off; >>>>> int fd, ret, pack; >>>>> - unsigned int i; >>>>> >>>>> nat_block = (struct f2fs_nat_block *)calloc(BLOCK_SZ, 1); >>>> >>>> move ASSERT(nat_block) here. >>>> >>> >>> Yeah, right. >>> >>>>> node_block = (struct f2fs_node *)calloc(BLOCK_SZ, 1); >>>>> ASSERT(nat_block); >>>>> - >>>>> - nr_nat_blks = get_sb(segment_count_nat) << >>>>> - (sbi->log_blocks_per_seg - 1); >>>>> + ASSERT(node_block); >>>>> >>>>> fd = open("dump_nat", O_CREAT|O_WRONLY|O_TRUNC, 0666); >>>>> ASSERT(fd >= 0); >>>>> >>>>> - for (block_off = 0; block_off < nr_nat_blks; pack = 1, block_off++) { >>>>> + for (nid = start_nat; nid < end_nat; pack = 1, nid++) { >>>>> + struct f2fs_nat_entry raw_nat; >>>>> + struct node_info ni; >>>>> + if(nid == 0 || nid == 1 || nid == 2 ) >>>> >>>> minor cleanup >>>> >>>> if (nid == 0 || nid == F2FS_NODE_INO(sbi) || nid == F2FS_META_INO(sbi)) >>>> >>> >>> OK. >>> >>>>> + continue; >>>>> >>>>> + ni.nid = nid; >>>>> + block_off = nid / NAT_ENTRY_PER_BLOCK; >>>>> seg_off = block_off >> sbi->log_blocks_per_seg; >>>>> block_addr = (pgoff_t)(nm_i->nat_blkaddr + >>>>> (seg_off << sbi->log_blocks_per_seg << 1) + >>>>> @@ -67,42 +69,11 @@ void nat_dump(struct f2fs_sb_info *sbi) >>>>> pack = 2; >>>>> } >>>>> >>>>> - ret = dev_read_block(nat_block, block_addr); >>>>> - ASSERT(ret >= 0); >>>>> - >>>>> - nid = block_off * NAT_ENTRY_PER_BLOCK; >>>>> - for (i = 0; i < NAT_ENTRY_PER_BLOCK; i++) { >>>>> - struct f2fs_nat_entry raw_nat; >>>>> - struct node_info ni; >>>>> - ni.nid = nid + i; >>>>> - >>>>> - if(nid + i == 0 || nid + i == 1 || nid + i == 2 ) >>>>> - continue; >>>>> - if (lookup_nat_in_journal(sbi, nid + i, >>>>> - &raw_nat) >= 0) { >>>>> - node_info_from_raw_nat(&ni, &raw_nat); >>>>> - ret = dev_read_block(node_block, ni.blk_addr); >>>>> - ASSERT(ret >= 0); >>>>> - if (ni.blk_addr != 0x0) { >>>>> - memset(buf, 0, BUF_SZ); >>>>> - snprintf(buf, BUF_SZ, >>>>> - "nid:%5u\tino:%5u\toffset:%5u" >>>>> - "\tblkaddr:%10u\tpack:%d\n", >>>>> - ni.nid, ni.ino, >>>>> - le32_to_cpu(node_block->footer.flag) >> >>>>> - OFFSET_BIT_SHIFT, >>>>> - ni.blk_addr, pack); >>>>> - ret = write(fd, buf, strlen(buf)); >>>>> - ASSERT(ret >= 0); >>>>> - } >>>>> - } else { >>>>> - node_info_from_raw_nat(&ni, >>>>> - &nat_block->entries[i]); >>>>> - if (ni.blk_addr == 0) >>>>> - continue; >>>>> - >>>>> - ret = dev_read_block(node_block, ni.blk_addr); >>>>> - ASSERT(ret >= 0); >>>>> + if (lookup_nat_in_journal(sbi, nid, &raw_nat) >= 0) { >>>>> + node_info_from_raw_nat(&ni, &raw_nat); >>>>> + ret = dev_read_block(node_block, ni.blk_addr); >>>>> + ASSERT(ret >= 0); >>>>> + if (ni.blk_addr != 0x0) { >>>>> memset(buf, 0, BUF_SZ); >>>>> snprintf(buf, BUF_SZ, >>>>> "nid:%5u\tino:%5u\toffset:%5u" >>>>> @@ -114,6 +85,26 @@ void nat_dump(struct f2fs_sb_info *sbi) >>>>> ret = write(fd, buf, strlen(buf)); >>>>> ASSERT(ret >= 0); >>>>> } >>>>> + } else { >>>>> + ret = dev_read_block(nat_block, block_addr); >>>>> + ASSERT(ret >= 0); >>>>> + node_info_from_raw_nat(&ni, >>>>> + &nat_block->entries[nid % NAT_ENTRY_PER_BLOCK]); >>>>> + if (ni.blk_addr == 0) >>>>> + continue; >>>>> + >>>>> + ret = dev_read_block(node_block, ni.blk_addr); >>>>> + ASSERT(ret >= 0); >>>>> + memset(buf, 0, BUF_SZ); >>>>> + snprintf(buf, BUF_SZ, >>>>> + "nid:%5u\tino:%5u\toffset:%5u" >>>>> + "\tblkaddr:%10u\tpack:%d\n", >>>>> + ni.nid, ni.ino, >>>>> + le32_to_cpu(node_block->footer.flag) >> >>>>> + OFFSET_BIT_SHIFT, >>>>> + ni.blk_addr, pack); >>>>> + ret = write(fd, buf, strlen(buf)); >>>>> + ASSERT(ret >= 0); >>>>> } >>>>> } >>>>> >>>>> diff --git a/fsck/fsck.h b/fsck/fsck.h >>>>> index 5530aff..0916e30 100644 >>>>> --- a/fsck/fsck.h >>>>> +++ b/fsck/fsck.h >>>>> @@ -206,7 +206,7 @@ struct dump_option { >>>>> int32_t blk_addr; >>>>> }; >>>>> >>>>> -extern void nat_dump(struct f2fs_sb_info *); >>>>> +extern void nat_dump(struct f2fs_sb_info *, int, int); >>>>> extern void sit_dump(struct f2fs_sb_info *, unsigned int, unsigned int); >>>>> extern void ssa_dump(struct f2fs_sb_info *, int, int); >>>>> extern void dump_node(struct f2fs_sb_info *, nid_t, int); >>>>> diff --git a/fsck/main.c b/fsck/main.c >>>>> index f6d12b0..714e28a 100644 >>>>> --- a/fsck/main.c >>>>> +++ b/fsck/main.c >>>>> @@ -73,7 +73,7 @@ void dump_usage() >>>>> MSG(0, "[options]:\n"); >>>>> MSG(0, " -d debug level [default:0]\n"); >>>>> MSG(0, " -i inode no (hex)\n"); >>>>> - MSG(0, " -n [NAT dump segno from #1~#2 (decimal), for all 0~-1]\n"); >>>> >>>> Original interface was going to dump NAT entries with segment granularity, how >>>> about just keeping old definition of this interface. Although if we can support >>>> dumping with smaller granularity will be good, but I don't think there is be >>>> such demand. >>>> >>> >>> I don't think "original interface was going to dump NAT entries with segment >>> granularity", because opt->end_nat = NM_I(sbi)->max_nid, which is calculated >>> with node granularity in do_dump, so I prefer to think it's a typo here :) >> >> Oh, I found that the manual is missed for this functionality... the original >> functionality is implemented by Yunlei, so, to Yunlei, can you check the >> inconsistence, and what's the original thought? >> > > Yeah, I've confirmed with him. His original thought was to dump nat entries with > start nid and end nid, however, his implementation in "fsck.f2fs: modify sit dump > && add nat dump" dumped all nids' nat entries. > > I'll send a patch v2 to adjust the above two points and update the man page of > dump.f2fs :) Okay, btw, could you change {start,end}_nid's variable type from int to nid_t? Thanks, > > Thanks, > Junling > >> Thanks, >> >>> >>>> Thanks, >>>> >>>>> + MSG(0, " -n [NAT dump nid from #1~#2 (decimal), for all 0~-1]\n"); >>>>> MSG(0, " -s [SIT dump segno from #1~#2 (decimal), for all 0~-1]\n"); >>>>> MSG(0, " -S sparse_mode\n"); >>>>> MSG(0, " -a [SSA dump segno from #1~#2 (decimal), for all 0~-1]\n"); >>>>> @@ -645,7 +645,7 @@ static void do_dump(struct f2fs_sb_info *sbi) >>>>> if (opt->end_ssa == -1) >>>>> opt->end_ssa = SM_I(sbi)->main_segments; >>>>> if (opt->start_nat != -1) >>>>> - nat_dump(sbi); >>>>> + nat_dump(sbi, opt->start_nat, opt->end_nat); >>>>> if (opt->start_sit != -1) >>>>> sit_dump(sbi, opt->start_sit, opt->end_sit); >>>>> if (opt->start_ssa != -1) >>>>> >>>> >>>> . >>>> >>> >>> >>> >>> . >>> >> >> >> . >> > > > > . > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2] dump.f2fs: only dump nat inside the specified nid range 2018-07-02 3:25 ` Junling Zheng 2018-07-02 3:39 ` Chao Yu @ 2018-07-02 3:59 ` Junling Zheng 2018-07-02 6:12 ` Chao Yu 2018-07-02 9:22 ` [PATCH v3] " Junling Zheng 1 sibling, 2 replies; 10+ messages in thread From: Junling Zheng @ 2018-07-02 3:59 UTC (permalink / raw) To: chao, jaegeuk, heyunlei; +Cc: miaoxie, linux-f2fs-devel Only dump nat info of nids inside the specified range. Signed-off-by: Junling Zheng <zhengjunling@huawei.com> --- v1 -> v2: 1) change {start,end}_nat type into nid_t 2) put ASSERT() sentence close up to malloc 3) use F2FS_NODE_INO and F2FS_META_INO instead of ino 1 and 2 4) update man page of dump.f2fs fsck/dump.c | 82 ++++++++++++++++++++++--------------------------- fsck/fsck.h | 6 ++-- fsck/main.c | 4 +-- man/dump.f2fs.8 | 13 ++++++-- 4 files changed, 52 insertions(+), 53 deletions(-) diff --git a/fsck/dump.c b/fsck/dump.c index 9236a43..942e874 100644 --- a/fsck/dump.c +++ b/fsck/dump.c @@ -31,32 +31,35 @@ const char *seg_type_name[SEG_TYPE_MAX + 1] = { "SEG_TYPE_NONE", }; -void nat_dump(struct f2fs_sb_info *sbi) +void nat_dump(struct f2fs_sb_info *sbi, nid_t start_nat, nid_t end_nat) { - struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi); struct f2fs_nm_info *nm_i = NM_I(sbi); struct f2fs_nat_block *nat_block; struct f2fs_node *node_block; - u32 nr_nat_blks, nid; + nid_t nid; pgoff_t block_off; pgoff_t block_addr; char buf[BUF_SZ]; int seg_off; int fd, ret, pack; - unsigned int i; nat_block = (struct f2fs_nat_block *)calloc(BLOCK_SZ, 1); - node_block = (struct f2fs_node *)calloc(BLOCK_SZ, 1); ASSERT(nat_block); - - nr_nat_blks = get_sb(segment_count_nat) << - (sbi->log_blocks_per_seg - 1); + node_block = (struct f2fs_node *)calloc(BLOCK_SZ, 1); + ASSERT(node_block); fd = open("dump_nat", O_CREAT|O_WRONLY|O_TRUNC, 0666); ASSERT(fd >= 0); - for (block_off = 0; block_off < nr_nat_blks; pack = 1, block_off++) { + for (nid = start_nat; nid < end_nat; pack = 1, nid++) { + struct f2fs_nat_entry raw_nat; + struct node_info ni; + if(nid == 0 || nid == F2FS_NODE_INO(sbi) || + nid == F2FS_META_INO(sbi)) + continue; + ni.nid = nid; + block_off = nid / NAT_ENTRY_PER_BLOCK; seg_off = block_off >> sbi->log_blocks_per_seg; block_addr = (pgoff_t)(nm_i->nat_blkaddr + (seg_off << sbi->log_blocks_per_seg << 1) + @@ -67,42 +70,11 @@ void nat_dump(struct f2fs_sb_info *sbi) pack = 2; } - ret = dev_read_block(nat_block, block_addr); - ASSERT(ret >= 0); - - nid = block_off * NAT_ENTRY_PER_BLOCK; - for (i = 0; i < NAT_ENTRY_PER_BLOCK; i++) { - struct f2fs_nat_entry raw_nat; - struct node_info ni; - ni.nid = nid + i; - - if(nid + i == 0 || nid + i == 1 || nid + i == 2 ) - continue; - if (lookup_nat_in_journal(sbi, nid + i, - &raw_nat) >= 0) { - node_info_from_raw_nat(&ni, &raw_nat); - ret = dev_read_block(node_block, ni.blk_addr); - ASSERT(ret >= 0); - if (ni.blk_addr != 0x0) { - memset(buf, 0, BUF_SZ); - snprintf(buf, BUF_SZ, - "nid:%5u\tino:%5u\toffset:%5u" - "\tblkaddr:%10u\tpack:%d\n", - ni.nid, ni.ino, - le32_to_cpu(node_block->footer.flag) >> - OFFSET_BIT_SHIFT, - ni.blk_addr, pack); - ret = write(fd, buf, strlen(buf)); - ASSERT(ret >= 0); - } - } else { - node_info_from_raw_nat(&ni, - &nat_block->entries[i]); - if (ni.blk_addr == 0) - continue; - - ret = dev_read_block(node_block, ni.blk_addr); - ASSERT(ret >= 0); + if (lookup_nat_in_journal(sbi, nid, &raw_nat) >= 0) { + node_info_from_raw_nat(&ni, &raw_nat); + ret = dev_read_block(node_block, ni.blk_addr); + ASSERT(ret >= 0); + if (ni.blk_addr != 0x0) { memset(buf, 0, BUF_SZ); snprintf(buf, BUF_SZ, "nid:%5u\tino:%5u\toffset:%5u" @@ -114,6 +86,26 @@ void nat_dump(struct f2fs_sb_info *sbi) ret = write(fd, buf, strlen(buf)); ASSERT(ret >= 0); } + } else { + ret = dev_read_block(nat_block, block_addr); + ASSERT(ret >= 0); + node_info_from_raw_nat(&ni, + &nat_block->entries[nid % NAT_ENTRY_PER_BLOCK]); + if (ni.blk_addr == 0) + continue; + + ret = dev_read_block(node_block, ni.blk_addr); + ASSERT(ret >= 0); + memset(buf, 0, BUF_SZ); + snprintf(buf, BUF_SZ, + "nid:%5u\tino:%5u\toffset:%5u" + "\tblkaddr:%10u\tpack:%d\n", + ni.nid, ni.ino, + le32_to_cpu(node_block->footer.flag) >> + OFFSET_BIT_SHIFT, + ni.blk_addr, pack); + ret = write(fd, buf, strlen(buf)); + ASSERT(ret >= 0); } } diff --git a/fsck/fsck.h b/fsck/fsck.h index 5530aff..4cac4e8 100644 --- a/fsck/fsck.h +++ b/fsck/fsck.h @@ -197,8 +197,8 @@ extern void write_nat_bits(struct f2fs_sb_info *, struct f2fs_super_block *, /* dump.c */ struct dump_option { nid_t nid; - int start_nat; - int end_nat; + nid_t start_nat; + nid_t end_nat; int start_sit; int end_sit; int start_ssa; @@ -206,7 +206,7 @@ struct dump_option { int32_t blk_addr; }; -extern void nat_dump(struct f2fs_sb_info *); +extern void nat_dump(struct f2fs_sb_info *, nid_t, nid_t); extern void sit_dump(struct f2fs_sb_info *, unsigned int, unsigned int); extern void ssa_dump(struct f2fs_sb_info *, int, int); extern void dump_node(struct f2fs_sb_info *, nid_t, int); diff --git a/fsck/main.c b/fsck/main.c index f6d12b0..714e28a 100644 --- a/fsck/main.c +++ b/fsck/main.c @@ -73,7 +73,7 @@ void dump_usage() MSG(0, "[options]:\n"); MSG(0, " -d debug level [default:0]\n"); MSG(0, " -i inode no (hex)\n"); - MSG(0, " -n [NAT dump segno from #1~#2 (decimal), for all 0~-1]\n"); + MSG(0, " -n [NAT dump nid from #1~#2 (decimal), for all 0~-1]\n"); MSG(0, " -s [SIT dump segno from #1~#2 (decimal), for all 0~-1]\n"); MSG(0, " -S sparse_mode\n"); MSG(0, " -a [SSA dump segno from #1~#2 (decimal), for all 0~-1]\n"); @@ -645,7 +645,7 @@ static void do_dump(struct f2fs_sb_info *sbi) if (opt->end_ssa == -1) opt->end_ssa = SM_I(sbi)->main_segments; if (opt->start_nat != -1) - nat_dump(sbi); + nat_dump(sbi, opt->start_nat, opt->end_nat); if (opt->start_sit != -1) sit_dump(sbi, opt->start_sit, opt->end_sit); if (opt->start_ssa != -1) diff --git a/man/dump.f2fs.8 b/man/dump.f2fs.8 index 35616e5..eedba85 100644 --- a/man/dump.f2fs.8 +++ b/man/dump.f2fs.8 @@ -10,6 +10,10 @@ dump.f2fs \- retrieve directory and file entries from an F2FS-formated image .I inode number ] [ +.B \-n +.I NAT range +] +[ .B \-s .I SIT range ] @@ -32,9 +36,9 @@ is used to retrieve f2fs metadata (usually in a disk partition). \fIdevice\fP is the special file corresponding to the device (e.g. \fI/dev/sdXX\fP). -Currently, it can retrieve 1) a file given its inode number, 2) SIT entries into -a file, 3) SSA entries into a file, 4) reverse information from the given block -address. +Currently, it can retrieve 1) a file given its inode number, 2) NAT +entries into a file, 3) SIT entries into a file, 4) SSA entries into +a file, 5) reverse information from the given block address. .PP The exit code returned by .B dump.f2fs @@ -44,6 +48,9 @@ is 0 on success and -1 on failure. .BI \-i " inode number" Specify an inode number to dump out. .TP +.BI \-n " NAT range" +Specify a range presented by nids to dump NAT entries. +.TP .BI \-s " SIT range" Specify a range presented by segment numbers to dump SIT entries. .TP -- 2.18.0 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2] dump.f2fs: only dump nat inside the specified nid range 2018-07-02 3:59 ` [PATCH v2] " Junling Zheng @ 2018-07-02 6:12 ` Chao Yu 2018-07-02 9:22 ` [PATCH v3] " Junling Zheng 1 sibling, 0 replies; 10+ messages in thread From: Chao Yu @ 2018-07-02 6:12 UTC (permalink / raw) To: Junling Zheng, chao, jaegeuk, heyunlei; +Cc: miaoxie, linux-f2fs-devel On 2018/7/2 11:59, Junling Zheng wrote: > Only dump nat info of nids inside the specified range. > > Signed-off-by: Junling Zheng <zhengjunling@huawei.com> > --- > v1 -> v2: > 1) change {start,end}_nat type into nid_t > 2) put ASSERT() sentence close up to malloc > 3) use F2FS_NODE_INO and F2FS_META_INO instead of ino 1 and 2 > 4) update man page of dump.f2fs > > fsck/dump.c | 82 ++++++++++++++++++++++--------------------------- > fsck/fsck.h | 6 ++-- > fsck/main.c | 4 +-- > man/dump.f2fs.8 | 13 ++++++-- > 4 files changed, 52 insertions(+), 53 deletions(-) > > diff --git a/fsck/dump.c b/fsck/dump.c > index 9236a43..942e874 100644 > --- a/fsck/dump.c > +++ b/fsck/dump.c > @@ -31,32 +31,35 @@ const char *seg_type_name[SEG_TYPE_MAX + 1] = { > "SEG_TYPE_NONE", > }; > > -void nat_dump(struct f2fs_sb_info *sbi) > +void nat_dump(struct f2fs_sb_info *sbi, nid_t start_nat, nid_t end_nat) > { > - struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi); > struct f2fs_nm_info *nm_i = NM_I(sbi); > struct f2fs_nat_block *nat_block; > struct f2fs_node *node_block; > - u32 nr_nat_blks, nid; > + nid_t nid; > pgoff_t block_off; > pgoff_t block_addr; > char buf[BUF_SZ]; > int seg_off; > int fd, ret, pack; pack = 1; > - unsigned int i; > > nat_block = (struct f2fs_nat_block *)calloc(BLOCK_SZ, 1); > - node_block = (struct f2fs_node *)calloc(BLOCK_SZ, 1); > ASSERT(nat_block); > - > - nr_nat_blks = get_sb(segment_count_nat) << > - (sbi->log_blocks_per_seg - 1); > + node_block = (struct f2fs_node *)calloc(BLOCK_SZ, 1); > + ASSERT(node_block); > > fd = open("dump_nat", O_CREAT|O_WRONLY|O_TRUNC, 0666); > ASSERT(fd >= 0); > > - for (block_off = 0; block_off < nr_nat_blks; pack = 1, block_off++) { > + for (nid = start_nat; nid < end_nat; pack = 1, nid++) { > + struct f2fs_nat_entry raw_nat; > + struct node_info ni; > + if(nid == 0 || nid == F2FS_NODE_INO(sbi) || > + nid == F2FS_META_INO(sbi)) > + continue; > > + ni.nid = nid; > + block_off = nid / NAT_ENTRY_PER_BLOCK; > seg_off = block_off >> sbi->log_blocks_per_seg; > block_addr = (pgoff_t)(nm_i->nat_blkaddr + > (seg_off << sbi->log_blocks_per_seg << 1) + > @@ -67,42 +70,11 @@ void nat_dump(struct f2fs_sb_info *sbi) > pack = 2; Nitpick, How about replacing above codes with existed function current_nat_addr() to avoid calculation bug, and since we need to set @pack, so we can add one parameter to do that? Thanks, > } > > - ret = dev_read_block(nat_block, block_addr); > - ASSERT(ret >= 0); > - > - nid = block_off * NAT_ENTRY_PER_BLOCK; > - for (i = 0; i < NAT_ENTRY_PER_BLOCK; i++) { > - struct f2fs_nat_entry raw_nat; > - struct node_info ni; > - ni.nid = nid + i; > - > - if(nid + i == 0 || nid + i == 1 || nid + i == 2 ) > - continue; > - if (lookup_nat_in_journal(sbi, nid + i, > - &raw_nat) >= 0) { > - node_info_from_raw_nat(&ni, &raw_nat); > - ret = dev_read_block(node_block, ni.blk_addr); > - ASSERT(ret >= 0); > - if (ni.blk_addr != 0x0) { > - memset(buf, 0, BUF_SZ); > - snprintf(buf, BUF_SZ, > - "nid:%5u\tino:%5u\toffset:%5u" > - "\tblkaddr:%10u\tpack:%d\n", > - ni.nid, ni.ino, > - le32_to_cpu(node_block->footer.flag) >> > - OFFSET_BIT_SHIFT, > - ni.blk_addr, pack); > - ret = write(fd, buf, strlen(buf)); > - ASSERT(ret >= 0); > - } > - } else { > - node_info_from_raw_nat(&ni, > - &nat_block->entries[i]); > - if (ni.blk_addr == 0) > - continue; > - > - ret = dev_read_block(node_block, ni.blk_addr); > - ASSERT(ret >= 0); > + if (lookup_nat_in_journal(sbi, nid, &raw_nat) >= 0) { > + node_info_from_raw_nat(&ni, &raw_nat); > + ret = dev_read_block(node_block, ni.blk_addr); > + ASSERT(ret >= 0); > + if (ni.blk_addr != 0x0) { > memset(buf, 0, BUF_SZ); > snprintf(buf, BUF_SZ, > "nid:%5u\tino:%5u\toffset:%5u" > @@ -114,6 +86,26 @@ void nat_dump(struct f2fs_sb_info *sbi) > ret = write(fd, buf, strlen(buf)); > ASSERT(ret >= 0); > } > + } else { > + ret = dev_read_block(nat_block, block_addr); > + ASSERT(ret >= 0); > + node_info_from_raw_nat(&ni, > + &nat_block->entries[nid % NAT_ENTRY_PER_BLOCK]); > + if (ni.blk_addr == 0) > + continue; > + > + ret = dev_read_block(node_block, ni.blk_addr); > + ASSERT(ret >= 0); > + memset(buf, 0, BUF_SZ); > + snprintf(buf, BUF_SZ, > + "nid:%5u\tino:%5u\toffset:%5u" > + "\tblkaddr:%10u\tpack:%d\n", > + ni.nid, ni.ino, > + le32_to_cpu(node_block->footer.flag) >> > + OFFSET_BIT_SHIFT, > + ni.blk_addr, pack); > + ret = write(fd, buf, strlen(buf)); > + ASSERT(ret >= 0); > } > } > > diff --git a/fsck/fsck.h b/fsck/fsck.h > index 5530aff..4cac4e8 100644 > --- a/fsck/fsck.h > +++ b/fsck/fsck.h > @@ -197,8 +197,8 @@ extern void write_nat_bits(struct f2fs_sb_info *, struct f2fs_super_block *, > /* dump.c */ > struct dump_option { > nid_t nid; > - int start_nat; > - int end_nat; > + nid_t start_nat; > + nid_t end_nat; > int start_sit; > int end_sit; > int start_ssa; > @@ -206,7 +206,7 @@ struct dump_option { > int32_t blk_addr; > }; > > -extern void nat_dump(struct f2fs_sb_info *); > +extern void nat_dump(struct f2fs_sb_info *, nid_t, nid_t); > extern void sit_dump(struct f2fs_sb_info *, unsigned int, unsigned int); > extern void ssa_dump(struct f2fs_sb_info *, int, int); > extern void dump_node(struct f2fs_sb_info *, nid_t, int); > diff --git a/fsck/main.c b/fsck/main.c > index f6d12b0..714e28a 100644 > --- a/fsck/main.c > +++ b/fsck/main.c > @@ -73,7 +73,7 @@ void dump_usage() > MSG(0, "[options]:\n"); > MSG(0, " -d debug level [default:0]\n"); > MSG(0, " -i inode no (hex)\n"); > - MSG(0, " -n [NAT dump segno from #1~#2 (decimal), for all 0~-1]\n"); > + MSG(0, " -n [NAT dump nid from #1~#2 (decimal), for all 0~-1]\n"); > MSG(0, " -s [SIT dump segno from #1~#2 (decimal), for all 0~-1]\n"); > MSG(0, " -S sparse_mode\n"); > MSG(0, " -a [SSA dump segno from #1~#2 (decimal), for all 0~-1]\n"); > @@ -645,7 +645,7 @@ static void do_dump(struct f2fs_sb_info *sbi) > if (opt->end_ssa == -1) > opt->end_ssa = SM_I(sbi)->main_segments; > if (opt->start_nat != -1) > - nat_dump(sbi); > + nat_dump(sbi, opt->start_nat, opt->end_nat); > if (opt->start_sit != -1) > sit_dump(sbi, opt->start_sit, opt->end_sit); > if (opt->start_ssa != -1) > diff --git a/man/dump.f2fs.8 b/man/dump.f2fs.8 > index 35616e5..eedba85 100644 > --- a/man/dump.f2fs.8 > +++ b/man/dump.f2fs.8 > @@ -10,6 +10,10 @@ dump.f2fs \- retrieve directory and file entries from an F2FS-formated image > .I inode number > ] > [ > +.B \-n > +.I NAT range > +] > +[ > .B \-s > .I SIT range > ] > @@ -32,9 +36,9 @@ is used to retrieve f2fs metadata (usually in a disk partition). > \fIdevice\fP is the special file corresponding to the device (e.g. > \fI/dev/sdXX\fP). > > -Currently, it can retrieve 1) a file given its inode number, 2) SIT entries into > -a file, 3) SSA entries into a file, 4) reverse information from the given block > -address. > +Currently, it can retrieve 1) a file given its inode number, 2) NAT > +entries into a file, 3) SIT entries into a file, 4) SSA entries into > +a file, 5) reverse information from the given block address. > .PP > The exit code returned by > .B dump.f2fs > @@ -44,6 +48,9 @@ is 0 on success and -1 on failure. > .BI \-i " inode number" > Specify an inode number to dump out. > .TP > +.BI \-n " NAT range" > +Specify a range presented by nids to dump NAT entries. > +.TP > .BI \-s " SIT range" > Specify a range presented by segment numbers to dump SIT entries. > .TP > ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3] dump.f2fs: only dump nat inside the specified nid range 2018-07-02 3:59 ` [PATCH v2] " Junling Zheng 2018-07-02 6:12 ` Chao Yu @ 2018-07-02 9:22 ` Junling Zheng 2018-07-02 11:21 ` Chao Yu 1 sibling, 1 reply; 10+ messages in thread From: Junling Zheng @ 2018-07-02 9:22 UTC (permalink / raw) To: chao, jaegeuk, heyunlei; +Cc: miaoxie, linux-f2fs-devel Only dump nat info of nids inside the specified range. Signed-off-by: Junling Zheng <zhengjunling@huawei.com> --- v2 -> v3: 1) add a parameter to current_nat_addr() to get the correct nat pack 2) use current_nat_addr() to get block_addr and nat pack in nat_dump v1 -> v2: 1) change {start,end}_nat type into nid_t 2) put ASSERT() sentence close up to malloc 3) use F2FS_NODE_INO and F2FS_META_INO instead of ino 1 and 2 4) update man page of dump.f2fs fsck/dump.c | 94 +++++++++++++++++++------------------------------ fsck/fsck.h | 7 ++-- fsck/main.c | 4 +-- fsck/mount.c | 19 ++++++---- man/dump.f2fs.8 | 13 +++++-- 5 files changed, 65 insertions(+), 72 deletions(-) diff --git a/fsck/dump.c b/fsck/dump.c index 9236a43..8cf431c 100644 --- a/fsck/dump.c +++ b/fsck/dump.c @@ -31,78 +31,38 @@ const char *seg_type_name[SEG_TYPE_MAX + 1] = { "SEG_TYPE_NONE", }; -void nat_dump(struct f2fs_sb_info *sbi) +void nat_dump(struct f2fs_sb_info *sbi, nid_t start_nat, nid_t end_nat) { - struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi); - struct f2fs_nm_info *nm_i = NM_I(sbi); struct f2fs_nat_block *nat_block; struct f2fs_node *node_block; - u32 nr_nat_blks, nid; - pgoff_t block_off; + nid_t nid; pgoff_t block_addr; char buf[BUF_SZ]; - int seg_off; int fd, ret, pack; - unsigned int i; nat_block = (struct f2fs_nat_block *)calloc(BLOCK_SZ, 1); - node_block = (struct f2fs_node *)calloc(BLOCK_SZ, 1); ASSERT(nat_block); - - nr_nat_blks = get_sb(segment_count_nat) << - (sbi->log_blocks_per_seg - 1); + node_block = (struct f2fs_node *)calloc(BLOCK_SZ, 1); + ASSERT(node_block); fd = open("dump_nat", O_CREAT|O_WRONLY|O_TRUNC, 0666); ASSERT(fd >= 0); - for (block_off = 0; block_off < nr_nat_blks; pack = 1, block_off++) { - - seg_off = block_off >> sbi->log_blocks_per_seg; - block_addr = (pgoff_t)(nm_i->nat_blkaddr + - (seg_off << sbi->log_blocks_per_seg << 1) + - (block_off & ((1 << sbi->log_blocks_per_seg) - 1))); - - if (f2fs_test_bit(block_off, nm_i->nat_bitmap)) { - block_addr += sbi->blocks_per_seg; - pack = 2; - } - - ret = dev_read_block(nat_block, block_addr); - ASSERT(ret >= 0); + for (nid = start_nat; nid < end_nat; nid++) { + struct f2fs_nat_entry raw_nat; + struct node_info ni; + if(nid == 0 || nid == F2FS_NODE_INO(sbi) || + nid == F2FS_META_INO(sbi)) + continue; - nid = block_off * NAT_ENTRY_PER_BLOCK; - for (i = 0; i < NAT_ENTRY_PER_BLOCK; i++) { - struct f2fs_nat_entry raw_nat; - struct node_info ni; - ni.nid = nid + i; + ni.nid = nid; + block_addr = current_nat_addr(sbi, nid, &pack); - if(nid + i == 0 || nid + i == 1 || nid + i == 2 ) - continue; - if (lookup_nat_in_journal(sbi, nid + i, - &raw_nat) >= 0) { - node_info_from_raw_nat(&ni, &raw_nat); - ret = dev_read_block(node_block, ni.blk_addr); - ASSERT(ret >= 0); - if (ni.blk_addr != 0x0) { - memset(buf, 0, BUF_SZ); - snprintf(buf, BUF_SZ, - "nid:%5u\tino:%5u\toffset:%5u" - "\tblkaddr:%10u\tpack:%d\n", - ni.nid, ni.ino, - le32_to_cpu(node_block->footer.flag) >> - OFFSET_BIT_SHIFT, - ni.blk_addr, pack); - ret = write(fd, buf, strlen(buf)); - ASSERT(ret >= 0); - } - } else { - node_info_from_raw_nat(&ni, - &nat_block->entries[i]); - if (ni.blk_addr == 0) - continue; - - ret = dev_read_block(node_block, ni.blk_addr); - ASSERT(ret >= 0); + if (lookup_nat_in_journal(sbi, nid, &raw_nat) >= 0) { + node_info_from_raw_nat(&ni, &raw_nat); + ret = dev_read_block(node_block, ni.blk_addr); + ASSERT(ret >= 0); + if (ni.blk_addr != 0x0) { memset(buf, 0, BUF_SZ); snprintf(buf, BUF_SZ, "nid:%5u\tino:%5u\toffset:%5u" @@ -114,6 +74,26 @@ void nat_dump(struct f2fs_sb_info *sbi) ret = write(fd, buf, strlen(buf)); ASSERT(ret >= 0); } + } else { + ret = dev_read_block(nat_block, block_addr); + ASSERT(ret >= 0); + node_info_from_raw_nat(&ni, + &nat_block->entries[nid % NAT_ENTRY_PER_BLOCK]); + if (ni.blk_addr == 0) + continue; + + ret = dev_read_block(node_block, ni.blk_addr); + ASSERT(ret >= 0); + memset(buf, 0, BUF_SZ); + snprintf(buf, BUF_SZ, + "nid:%5u\tino:%5u\toffset:%5u" + "\tblkaddr:%10u\tpack:%d\n", + ni.nid, ni.ino, + le32_to_cpu(node_block->footer.flag) >> + OFFSET_BIT_SHIFT, + ni.blk_addr, pack); + ret = write(fd, buf, strlen(buf)); + ASSERT(ret >= 0); } } diff --git a/fsck/fsck.h b/fsck/fsck.h index 5530aff..ef22e3c 100644 --- a/fsck/fsck.h +++ b/fsck/fsck.h @@ -182,6 +182,7 @@ extern void update_data_blkaddr(struct f2fs_sb_info *, nid_t, u16, block_t); extern void update_nat_blkaddr(struct f2fs_sb_info *, nid_t, nid_t, block_t); extern void print_raw_sb_info(struct f2fs_super_block *); +extern pgoff_t current_nat_addr(struct f2fs_sb_info *, nid_t, int *); extern u32 get_free_segments(struct f2fs_sb_info *); extern void get_current_sit_page(struct f2fs_sb_info *, @@ -197,8 +198,8 @@ extern void write_nat_bits(struct f2fs_sb_info *, struct f2fs_super_block *, /* dump.c */ struct dump_option { nid_t nid; - int start_nat; - int end_nat; + nid_t start_nat; + nid_t end_nat; int start_sit; int end_sit; int start_ssa; @@ -206,7 +207,7 @@ struct dump_option { int32_t blk_addr; }; -extern void nat_dump(struct f2fs_sb_info *); +extern void nat_dump(struct f2fs_sb_info *, nid_t, nid_t); extern void sit_dump(struct f2fs_sb_info *, unsigned int, unsigned int); extern void ssa_dump(struct f2fs_sb_info *, int, int); extern void dump_node(struct f2fs_sb_info *, nid_t, int); diff --git a/fsck/main.c b/fsck/main.c index f6d12b0..714e28a 100644 --- a/fsck/main.c +++ b/fsck/main.c @@ -73,7 +73,7 @@ void dump_usage() MSG(0, "[options]:\n"); MSG(0, " -d debug level [default:0]\n"); MSG(0, " -i inode no (hex)\n"); - MSG(0, " -n [NAT dump segno from #1~#2 (decimal), for all 0~-1]\n"); + MSG(0, " -n [NAT dump nid from #1~#2 (decimal), for all 0~-1]\n"); MSG(0, " -s [SIT dump segno from #1~#2 (decimal), for all 0~-1]\n"); MSG(0, " -S sparse_mode\n"); MSG(0, " -a [SSA dump segno from #1~#2 (decimal), for all 0~-1]\n"); @@ -645,7 +645,7 @@ static void do_dump(struct f2fs_sb_info *sbi) if (opt->end_ssa == -1) opt->end_ssa = SM_I(sbi)->main_segments; if (opt->start_nat != -1) - nat_dump(sbi); + nat_dump(sbi, opt->start_nat, opt->end_nat); if (opt->start_sit != -1) sit_dump(sbi, opt->start_sit, opt->end_sit); if (opt->start_ssa != -1) diff --git a/fsck/mount.c b/fsck/mount.c index 0767a8f..3c9607f 100644 --- a/fsck/mount.c +++ b/fsck/mount.c @@ -881,7 +881,7 @@ int sanity_check_ckpt(struct f2fs_sb_info *sbi) return 0; } -static pgoff_t current_nat_addr(struct f2fs_sb_info *sbi, nid_t start) +pgoff_t current_nat_addr(struct f2fs_sb_info *sbi, nid_t start, int *pack) { struct f2fs_nm_info *nm_i = NM_I(sbi); pgoff_t block_off; @@ -894,9 +894,14 @@ static pgoff_t current_nat_addr(struct f2fs_sb_info *sbi, nid_t start) block_addr = (pgoff_t)(nm_i->nat_blkaddr + (seg_off << sbi->log_blocks_per_seg << 1) + (block_off & ((1 << sbi->log_blocks_per_seg) -1))); + if (pack) + *pack = 1; - if (f2fs_test_bit(block_off, nm_i->nat_bitmap)) + if (f2fs_test_bit(block_off, nm_i->nat_bitmap)) { block_addr += sbi->blocks_per_seg; + if (pack) + *pack = 2; + } return block_addr; } @@ -933,7 +938,7 @@ static int f2fs_init_nid_bitmap(struct f2fs_sb_info *sbi) if (!(nid % NAT_ENTRY_PER_BLOCK)) { int ret; - start_blk = current_nat_addr(sbi, nid); + start_blk = current_nat_addr(sbi, nid, NULL); ret = dev_read_block(nat_block, start_blk); ASSERT(ret >= 0); } @@ -1599,7 +1604,7 @@ static void get_nat_entry(struct f2fs_sb_info *sbi, nid_t nid, ASSERT(nat_block); entry_off = nid % NAT_ENTRY_PER_BLOCK; - block_addr = current_nat_addr(sbi, nid); + block_addr = current_nat_addr(sbi, nid, NULL); ret = dev_read_block(nat_block, block_addr); ASSERT(ret >= 0); @@ -1673,7 +1678,7 @@ void update_nat_blkaddr(struct f2fs_sb_info *sbi, nid_t ino, ASSERT(nat_block); entry_off = nid % NAT_ENTRY_PER_BLOCK; - block_addr = current_nat_addr(sbi, nid); + block_addr = current_nat_addr(sbi, nid, NULL); ret = dev_read_block(nat_block, block_addr); ASSERT(ret >= 0); @@ -1922,7 +1927,7 @@ next: nid = le32_to_cpu(nid_in_journal(journal, i)); entry_off = nid % NAT_ENTRY_PER_BLOCK; - block_addr = current_nat_addr(sbi, nid); + block_addr = current_nat_addr(sbi, nid, NULL); ret = dev_read_block(nat_block, block_addr); ASSERT(ret >= 0); @@ -2140,7 +2145,7 @@ void nullify_nat_entry(struct f2fs_sb_info *sbi, u32 nid) ASSERT(nat_block); entry_off = nid % NAT_ENTRY_PER_BLOCK; - block_addr = current_nat_addr(sbi, nid); + block_addr = current_nat_addr(sbi, nid, NULL); ret = dev_read_block(nat_block, block_addr); ASSERT(ret >= 0); diff --git a/man/dump.f2fs.8 b/man/dump.f2fs.8 index 35616e5..eedba85 100644 --- a/man/dump.f2fs.8 +++ b/man/dump.f2fs.8 @@ -10,6 +10,10 @@ dump.f2fs \- retrieve directory and file entries from an F2FS-formated image .I inode number ] [ +.B \-n +.I NAT range +] +[ .B \-s .I SIT range ] @@ -32,9 +36,9 @@ is used to retrieve f2fs metadata (usually in a disk partition). \fIdevice\fP is the special file corresponding to the device (e.g. \fI/dev/sdXX\fP). -Currently, it can retrieve 1) a file given its inode number, 2) SIT entries into -a file, 3) SSA entries into a file, 4) reverse information from the given block -address. +Currently, it can retrieve 1) a file given its inode number, 2) NAT +entries into a file, 3) SIT entries into a file, 4) SSA entries into +a file, 5) reverse information from the given block address. .PP The exit code returned by .B dump.f2fs @@ -44,6 +48,9 @@ is 0 on success and -1 on failure. .BI \-i " inode number" Specify an inode number to dump out. .TP +.BI \-n " NAT range" +Specify a range presented by nids to dump NAT entries. +.TP .BI \-s " SIT range" Specify a range presented by segment numbers to dump SIT entries. .TP -- 2.18.0 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v3] dump.f2fs: only dump nat inside the specified nid range 2018-07-02 9:22 ` [PATCH v3] " Junling Zheng @ 2018-07-02 11:21 ` Chao Yu 0 siblings, 0 replies; 10+ messages in thread From: Chao Yu @ 2018-07-02 11:21 UTC (permalink / raw) To: Junling Zheng, chao, jaegeuk, heyunlei; +Cc: miaoxie, linux-f2fs-devel On 2018/7/2 17:22, Junling Zheng wrote: > Only dump nat info of nids inside the specified range. > > Signed-off-by: Junling Zheng <zhengjunling@huawei.com> Looks good to me. :) Reviewed-by: Chao Yu <yuchao0@huawei.com> Thanks, ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-07-02 11:22 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-06-29 10:11 [PATCH] dump.f2fs: only dump nat inside the specified nid range Junling Zheng 2018-07-01 2:22 ` Chao Yu 2018-07-02 2:09 ` Junling Zheng 2018-07-02 2:43 ` Chao Yu 2018-07-02 3:25 ` Junling Zheng 2018-07-02 3:39 ` Chao Yu 2018-07-02 3:59 ` [PATCH v2] " Junling Zheng 2018-07-02 6:12 ` Chao Yu 2018-07-02 9:22 ` [PATCH v3] " Junling Zheng 2018-07-02 11:21 ` Chao Yu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).