Commit 963932a9 authored by Yunlei He's avatar Yunlei He Committed by Jaegeuk Kim

f2fs: combine huge num of discard rb tree consistence checks

Came across a hungtask caused by huge number of rb tree traversing
during adding discard addrs in cp. This patch combine these consistence
checks and move it to discard thread.
Signed-off-by: default avatarYunlei He <heyunlei@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent dad48e73
...@@ -838,7 +838,6 @@ static void __punch_discard_cmd(struct f2fs_sb_info *sbi, ...@@ -838,7 +838,6 @@ static void __punch_discard_cmd(struct f2fs_sb_info *sbi,
dc->len = blkaddr - dc->lstart; dc->len = blkaddr - dc->lstart;
dcc->undiscard_blks += dc->len; dcc->undiscard_blks += dc->len;
__relocate_discard_cmd(dcc, dc); __relocate_discard_cmd(dcc, dc);
f2fs_bug_on(sbi, !__check_rb_tree_consistence(sbi, &dcc->root));
modified = true; modified = true;
} }
...@@ -848,16 +847,12 @@ static void __punch_discard_cmd(struct f2fs_sb_info *sbi, ...@@ -848,16 +847,12 @@ static void __punch_discard_cmd(struct f2fs_sb_info *sbi,
di.start + blkaddr + 1 - di.lstart, di.start + blkaddr + 1 - di.lstart,
di.lstart + di.len - 1 - blkaddr, di.lstart + di.len - 1 - blkaddr,
NULL, NULL); NULL, NULL);
f2fs_bug_on(sbi,
!__check_rb_tree_consistence(sbi, &dcc->root));
} else { } else {
dc->lstart++; dc->lstart++;
dc->len--; dc->len--;
dc->start++; dc->start++;
dcc->undiscard_blks += dc->len; dcc->undiscard_blks += dc->len;
__relocate_discard_cmd(dcc, dc); __relocate_discard_cmd(dcc, dc);
f2fs_bug_on(sbi,
!__check_rb_tree_consistence(sbi, &dcc->root));
} }
} }
} }
...@@ -918,8 +913,6 @@ static void __update_discard_tree_range(struct f2fs_sb_info *sbi, ...@@ -918,8 +913,6 @@ static void __update_discard_tree_range(struct f2fs_sb_info *sbi,
prev_dc->di.len += di.len; prev_dc->di.len += di.len;
dcc->undiscard_blks += di.len; dcc->undiscard_blks += di.len;
__relocate_discard_cmd(dcc, prev_dc); __relocate_discard_cmd(dcc, prev_dc);
f2fs_bug_on(sbi,
!__check_rb_tree_consistence(sbi, &dcc->root));
di = prev_dc->di; di = prev_dc->di;
tdc = prev_dc; tdc = prev_dc;
merged = true; merged = true;
...@@ -935,16 +928,12 @@ static void __update_discard_tree_range(struct f2fs_sb_info *sbi, ...@@ -935,16 +928,12 @@ static void __update_discard_tree_range(struct f2fs_sb_info *sbi,
__relocate_discard_cmd(dcc, next_dc); __relocate_discard_cmd(dcc, next_dc);
if (tdc) if (tdc)
__remove_discard_cmd(sbi, tdc); __remove_discard_cmd(sbi, tdc);
f2fs_bug_on(sbi,
!__check_rb_tree_consistence(sbi, &dcc->root));
merged = true; merged = true;
} }
if (!merged) { if (!merged) {
__insert_discard_tree(sbi, bdev, di.lstart, di.start, __insert_discard_tree(sbi, bdev, di.lstart, di.start,
di.len, NULL, NULL); di.len, NULL, NULL);
f2fs_bug_on(sbi,
!__check_rb_tree_consistence(sbi, &dcc->root));
} }
next: next:
prev_dc = next_dc; prev_dc = next_dc;
...@@ -983,6 +972,8 @@ static void __issue_discard_cmd(struct f2fs_sb_info *sbi, bool issue_cond) ...@@ -983,6 +972,8 @@ static void __issue_discard_cmd(struct f2fs_sb_info *sbi, bool issue_cond)
int i, iter = 0; int i, iter = 0;
mutex_lock(&dcc->cmd_lock); mutex_lock(&dcc->cmd_lock);
f2fs_bug_on(sbi,
!__check_rb_tree_consistence(sbi, &dcc->root));
blk_start_plug(&plug); blk_start_plug(&plug);
for (i = MAX_PLIST_NUM - 1; i >= 0; i--) { for (i = MAX_PLIST_NUM - 1; i >= 0; i--) {
pend_list = &dcc->pend_list[i]; pend_list = &dcc->pend_list[i];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment