From: Jaegeuk Kim <jaegeuk@kernel.org>
To: linux-f2fs-devel@lists.sourceforge.net
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Subject: [f2fs-dev] [PATCH] fsck.f2fs: Split build_segment_manager() to speed up auto-fix
Date: Tue, 7 Jul 2020 21:35:33 -0700 [thread overview]
Message-ID: <20200708043533.2168771-1-jaegeuk@kernel.org> (raw)
From: Robin Hsu <robinhsu@google.com>
Speed up fsck in auto-fix mode by splitting
build_segment_manager() into two disjoint parts:
early_build_segment_manager(), and
late_build_segment_manager(),
where in some cases (when !need_fsync_data_record(), or cannot
find_fsync_inode()), late_build_segment_manager() won't be needed in
auto-fix mode. This speeds up a little bit in those cases.
Signed-off-by: Robin Hsu <robinhsu@google.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fsck/f2fs.h | 3 +++
fsck/mount.c | 34 ++++++++++++++++++++++++++++++----
2 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/fsck/f2fs.h b/fsck/f2fs.h
index 2a00d35..76e8272 100644
--- a/fsck/f2fs.h
+++ b/fsck/f2fs.h
@@ -273,6 +273,9 @@ struct f2fs_sb_info {
u32 free_segments;
int cp_backuped; /* backup valid checkpoint */
+
+ /* true if late_build_segment_manger() is called */
+ bool seg_manager_done;
};
static inline struct f2fs_super_block *F2FS_RAW_SUPER(struct f2fs_sb_info *sbi)
diff --git a/fsck/mount.c b/fsck/mount.c
index d0f2eab..e5fe734 100644
--- a/fsck/mount.c
+++ b/fsck/mount.c
@@ -2284,7 +2284,7 @@ static int build_sit_entries(struct f2fs_sb_info *sbi)
return 0;
}
-static int build_segment_manager(struct f2fs_sb_info *sbi)
+static int early_build_segment_manager(struct f2fs_sb_info *sbi)
{
struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi);
struct f2fs_checkpoint *cp = F2FS_CKPT(sbi);
@@ -2306,7 +2306,7 @@ static int build_segment_manager(struct f2fs_sb_info *sbi)
sm_info->main_segments = get_sb(segment_count_main);
sm_info->ssa_blkaddr = get_sb(ssa_blkaddr);
- if (build_sit_info(sbi) || build_curseg(sbi) || build_sit_entries(sbi)) {
+ if (build_sit_info(sbi) || build_curseg(sbi)) {
free(sm_info);
return -ENOMEM;
}
@@ -2314,6 +2314,20 @@ static int build_segment_manager(struct f2fs_sb_info *sbi)
return 0;
}
+static int late_build_segment_manager(struct f2fs_sb_info *sbi)
+{
+ if (sbi->seg_manager_done)
+ return 1; /* this function was already called */
+
+ sbi->seg_manager_done = true;
+ if (build_sit_entries(sbi)) {
+ free (sbi->sm_info);
+ return -ENOMEM;
+ }
+
+ return 0;
+}
+
void build_sit_area_bitmap(struct f2fs_sb_info *sbi)
{
struct f2fs_fsck *fsck = F2FS_FSCK(sbi);
@@ -3387,6 +3401,12 @@ static int record_fsync_data(struct f2fs_sb_info *sbi)
if (ret)
goto out;
+ ret = late_build_segment_manager(sbi);
+ if (ret < 0) {
+ ERR_MSG("late_build_segment_manager failed\n");
+ goto out;
+ }
+
ret = traverse_dnodes(sbi, &inode_list);
out:
destroy_fsync_dnodes(&inode_list);
@@ -3457,8 +3477,8 @@ int f2fs_do_mount(struct f2fs_sb_info *sbi)
sbi->last_valid_block_count = sbi->total_valid_block_count;
sbi->alloc_valid_block_count = 0;
- if (build_segment_manager(sbi)) {
- ERR_MSG("build_segment_manager failed\n");
+ if (early_build_segment_manager(sbi)) {
+ ERR_MSG("early_build_segment_manager failed\n");
return -1;
}
@@ -3475,6 +3495,12 @@ int f2fs_do_mount(struct f2fs_sb_info *sbi)
if (!f2fs_should_proceed(sb, get_cp(ckpt_flags)))
return 1;
+
+ if (late_build_segment_manager(sbi) < 0) {
+ ERR_MSG("late_build_segment_manager failed\n");
+ return -1;
+ }
+
if (f2fs_late_init_nid_bitmap(sbi)) {
ERR_MSG("f2fs_late_init_nid_bitmap failed\n");
return -1;
--
2.27.0.383.g050319c2ae-goog
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
reply other threads:[~2020-07-08 4:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200708043533.2168771-1-jaegeuk@kernel.org \
--to=jaegeuk@kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).